diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 16:54:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 16:54:29 +0200 |
| commit | 25696b4b3541d5f7641b61e6abfda765426834b8 (patch) | |
| tree | 49de34c86f67d08b8ee84fba8f05a3e7040d4cac | |
| parent | Merge tag 'tegra-for-3.7-drivers-i2c' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | drivers: bus: Move the OMAP interconnect driver to drivers/bus/ (diff) | |
| download | linux-25696b4b3541d5f7641b61e6abfda765426834b8.tar.xz linux-25696b4b3541d5f7641b61e6abfda765426834b8.zip | |
Merge branch 'drivers/ocp2scp' into next/drivers
Merge patch from Santosh Shilimkar <santosh.shilimkar@ti.com>:
* drivers/ocp2scp:
drivers: bus: Move the OMAP interconnect driver to drivers/bus/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 | ||||
| -rw-r--r-- | drivers/bus/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/bus/Makefile | 3 | ||||
| -rw-r--r-- | drivers/bus/omap_l3_noc.c (renamed from arch/arm/mach-omap2/omap_l3_noc.c) | 0 | ||||
| -rw-r--r-- | drivers/bus/omap_l3_noc.h (renamed from arch/arm/mach-omap2/omap_l3_noc.h) | 0 | ||||
| -rw-r--r-- | drivers/bus/omap_l3_smx.c (renamed from arch/arm/mach-omap2/omap_l3_smx.c) | 0 | ||||
| -rw-r--r-- | drivers/bus/omap_l3_smx.h (renamed from arch/arm/mach-omap2/omap_l3_smx.h) | 0 |
8 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index fcd4e85c4ddc..728b05eb2964 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -44,6 +44,7 @@ config ARCH_OMAP3 select ARM_CPU_SUSPEND if PM select MULTI_IRQ_HANDLER select SOC_HAS_OMAP2_SDRC + select OMAP_INTERCONNECT config ARCH_OMAP4 bool "TI OMAP4" @@ -63,6 +64,7 @@ config ARCH_OMAP4 select USB_ARCH_HAS_EHCI if USB_SUPPORT select ARM_CPU_SUSPEND if PM select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP + select OMAP_INTERCONNECT config SOC_OMAP5 bool "TI OMAP5" diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index f6a24b3f9c4f..7fed980acb93 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -199,11 +199,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o # EMU peripherals obj-$(CONFIG_OMAP3_EMU) += emu.o -# L3 interconnect -obj-$(CONFIG_ARCH_OMAP3) += omap_l3_smx.o -obj-$(CONFIG_ARCH_OMAP4) += omap_l3_noc.o -obj-$(CONFIG_SOC_OMAP5) += omap_l3_noc.o - obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o mailbox_mach-objs := mailbox.o diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 6270415107d0..bbec35d21fe5 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -12,4 +12,10 @@ config OMAP_OCP2SCP OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via OCP2SCP. +config OMAP_INTERCONNECT + tristate "OMAP INTERCONNECT DRIVER" + depends on ARCH_OMAP2PLUS + + help + Driver to enable OMAP interconnect error handling driver. endmenu diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 0ec50bc43d7c..45d997c85453 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -3,3 +3,6 @@ # obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o + +# Interconnect bus driver for OMAP SoCs. +obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c index d15225ff5c49..d15225ff5c49 100644 --- a/arch/arm/mach-omap2/omap_l3_noc.c +++ b/drivers/bus/omap_l3_noc.c diff --git a/arch/arm/mach-omap2/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h index a6ce34dc4814..a6ce34dc4814 100644 --- a/arch/arm/mach-omap2/omap_l3_noc.h +++ b/drivers/bus/omap_l3_noc.h diff --git a/arch/arm/mach-omap2/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c index acc216491b8a..acc216491b8a 100644 --- a/arch/arm/mach-omap2/omap_l3_smx.c +++ b/drivers/bus/omap_l3_smx.c diff --git a/arch/arm/mach-omap2/omap_l3_smx.h b/drivers/bus/omap_l3_smx.h index 4f3cebca4179..4f3cebca4179 100644 --- a/arch/arm/mach-omap2/omap_l3_smx.h +++ b/drivers/bus/omap_l3_smx.h |