From 0ee7261c9212dbaf72d510e37f6c5b849d1847f0 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Fri, 14 Sep 2012 14:50:34 +0530 Subject: [PATCH] drivers: bus: Move the OMAP interconnect driver to drivers/bus/ OMAP interconnect drivers are used for the interconnect error handling. Since they are bus driver, lets move it to newly created drivers/bus. Tested-by: Lokesh Vutla Signed-off-by: Santosh Shilimkar Acked-by: Tony Lindgren Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/Kconfig | 2 ++ arch/arm/mach-omap2/Makefile | 5 ----- drivers/bus/Kconfig | 6 ++++++ drivers/bus/Makefile | 3 +++ {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c | 0 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h | 0 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c | 0 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h | 0 8 files changed, 11 insertions(+), 5 deletions(-) rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c (100%) rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h (100%) rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c (100%) rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h (100%) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index dd2db025f778..7d3c8ab3eca4 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 + 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 similarity index 100% rename from arch/arm/mach-omap2/omap_l3_noc.c rename to drivers/bus/omap_l3_noc.c diff --git a/arch/arm/mach-omap2/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h similarity index 100% rename from arch/arm/mach-omap2/omap_l3_noc.h rename to drivers/bus/omap_l3_noc.h diff --git a/arch/arm/mach-omap2/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c similarity index 100% rename from arch/arm/mach-omap2/omap_l3_smx.c rename to drivers/bus/omap_l3_smx.c diff --git a/arch/arm/mach-omap2/omap_l3_smx.h b/drivers/bus/omap_l3_smx.h similarity index 100% rename from arch/arm/mach-omap2/omap_l3_smx.h rename to drivers/bus/omap_l3_smx.h -- 2.20.1