23 files changed, 2108 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-bcma b/Documentation/ABI/testing/sysfs-bus-bcma
new file mode 100644
index 000000000000..06b62badddd1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
@@ -0,0 +1,31 @@
+What:           /sys/bus/bcma/devices/.../manuf
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                Each BCMA core has it's manufacturer id. See
+                include/linux/bcma/bcma.h for possible values.
+
+What:           /sys/bus/bcma/devices/.../id
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                There are a few types of BCMA cores, they can be identified by
+                id field.
+
+What:           /sys/bus/bcma/devices/.../rev
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                BCMA cores of the same type can still slightly differ depending
+                on their revision. Use it for detailed programming.
+
+What:           /sys/bus/bcma/devices/.../class
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                Each BCMA core is identified by few fields, including class it
+                belongs to. See include/linux/bcma/bcma.h for possible values.
diff --git a/MAINTAINERS b/MAINTAINERS
index 9f9104987a73..df5585819a62 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5810,6 +5810,13 @@ S:	Maintained
 F:      drivers/ssb/
 F:      include/linux/ssb/
 
+BROADCOM SPECIFIC AMBA DRIVER (BCMA)
+M:      Rafał Miłecki <zajec5@gmail.com>
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+F:      drivers/bcma/
+F:      include/linux/bcma/
+
 SONY VAIO CONTROL DEVICE DRIVER
 M:      Mattia Dongili <malattia@linux.it>
 L:      platform-driver-x86@vger.kernel.org
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 177c7d156933..aca706751469 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
 
+source "drivers/bcma/Kconfig"
+
 source "drivers/mfd/Kconfig"
 
 source "drivers/regulator/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 3f135b6fb014..a29527f4ded6 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -110,6 +110,7 @@ obj-$(CONFIG_HID)		+= hid/
 obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_OF)                += of/
 obj-$(CONFIG_SSB)               += ssb/
+obj-$(CONFIG_BCMA)              += bcma/
 obj-$(CONFIG_VHOST_NET)         += vhost/
 obj-$(CONFIG_VLYNQ)             += vlynq/
 obj-$(CONFIG_STAGING)           += staging/
diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
new file mode 100644
index 000000000000..353781b5b78b
--- /dev/null
+++ b/drivers/bcma/Kconfig
@@ -0,0 +1,33 @@
+config BCMA_POSSIBLE
+        bool
+        depends on HAS_IOMEM && HAS_DMA
+        default y
+
+menu "Broadcom specific AMBA"
+        depends on BCMA_POSSIBLE
+
+config BCMA
+        tristate "BCMA support"
+        depends on BCMA_POSSIBLE
+        help
+          Bus driver for Broadcom specific Advanced Microcontroller Bus
+          Architecture.
+
+config BCMA_HOST_PCI_POSSIBLE
+        bool
+        depends on BCMA && PCI = y
+        default y
+
+config BCMA_HOST_PCI
+        bool "Support for BCMA on PCI-host bus"
+        depends on BCMA_HOST_PCI_POSSIBLE
+
+config BCMA_DEBUG
+        bool "BCMA debugging"
+        depends on BCMA
+        help
+          This turns on additional debugging messages.
+
+          If unsure, say N
+
+endmenu
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile
new file mode 100644
index 000000000000..0d56245bcb79
--- /dev/null
+++ b/drivers/bcma/Makefile
@@ -0,0 +1,7 @@
+bcma-y                                  += main.o scan.o core.o
+bcma-y                                  += driver_chipcommon.o driver_chipcommon_pmu.o
+bcma-y                                  += driver_pci.o
+bcma-$(CONFIG_BCMA_HOST_PCI)            += host_pci.o
+obj-$(CONFIG_BCMA)                      += bcma.o
+
+ccflags-$(CONFIG_BCMA_DEBUG)            := -DDEBUG
diff --git a/drivers/bcma/README b/drivers/bcma/README
new file mode 100644
index 000000000000..f7e7ce46c603
--- /dev/null
+++ b/drivers/bcma/README
@@ -0,0 +1,19 @@
+Broadcom introduced new bus as replacement for older SSB. It is based on AMBA,
+however from programming point of view there is nothing AMBA specific we use.
+
+Standard AMBA drivers are platform specific, have hardcoded addresses and use
+AMBA standard fields like CID and PID.
+
+In case of Broadcom's cards every device consists of:
+1) Broadcom specific AMBA device. It is put on AMBA bus, but can not be treated
+   as standard AMBA device. Reading it's CID or PID can cause machine lockup.
+2) AMBA standard devices called ports or wrappers. They have CIDs (AMBA_CID)
+   and PIDs (0x103BB369), but we do not use that info for anything. One of that
+   devices is used for managing Broadcom specific core.
+
+Addresses of AMBA devices are not hardcoded in driver and have to be read from
+EPROM.
+
+In this situation we decided to introduce separated bus. It can contain up to
+16 devices identified by Broadcom specific fields: manufacturer, id, revision
+and class.
diff --git a/drivers/bcma/TODO b/drivers/bcma/TODO
new file mode 100644
index 000000000000..da7aa99fe81c
--- /dev/null
+++ b/drivers/bcma/TODO
@@ -0,0 +1,3 @@
+- Interrupts
+- Defines for PCI core driver
+- Create kernel Documentation (use info from README)
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
new file mode 100644
index 000000000000..2f72e9c585fd
--- /dev/null
+++ b/drivers/bcma/bcma_private.h
@@ -0,0 +1,28 @@
+#ifndef LINUX_BCMA_PRIVATE_H_
+#define LINUX_BCMA_PRIVATE_H_
+
+#ifndef pr_fmt
+#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
+#endif
+
+#include <linux/bcma/bcma.h>
+#include <linux/delay.h>
+
+#define BCMA_CORE_SIZE          0x1000
+
+struct bcma_bus;
+
+/* main.c */
+extern int bcma_bus_register(struct bcma_bus *bus);
+extern void bcma_bus_unregister(struct bcma_bus *bus);
+
+/* scan.c */
+int bcma_bus_scan(struct bcma_bus *bus);
+
+#ifdef CONFIG_BCMA_HOST_PCI
+/* host_pci.c */
+extern int __init bcma_host_pci_init(void);