| Message ID | 1347614434-15938-1-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Santosh Shilimkar <santosh.shilimkar@ti.com> [120914 02:21]: > OMAP interconnect drivers are used for the interconnect error handling. > Since they are bus driver, lets move it to newly created drivers/bus. > > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Tony Lindgren <tony@atomide.com> > Tested-by: Lokesh Vutla <lokeshvutla@ti.com> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > --- > Patch just moves OMAP interconnect drivers as is to the newly created > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" > tree and test on all OMAP boards. Great, looks like this should not conflict with other omap patches queued, so Arnd should probably take this into the bus branch: Acked-by: Tony Lindgren <tony@atomide.com>
On Monday 17 September 2012, Tony Lindgren wrote: > * Santosh Shilimkar <santosh.shilimkar@ti.com> [120914 02:21]: > > OMAP interconnect drivers are used for the interconnect error handling. > > Since they are bus driver, lets move it to newly created drivers/bus. > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > Cc: Tony Lindgren <tony@atomide.com> > > Tested-by: Lokesh Vutla <lokeshvutla@ti.com> > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > > --- > > Patch just moves OMAP interconnect drivers as is to the newly created > > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" > > tree and test on all OMAP boards. > > Great, looks like this should not conflict with other > omap patches queued, so Arnd should probably take this into > the bus branch: > > Acked-by: Tony Lindgren <tony@atomide.com> Ok, added to the branch. In the future please Cc both Olof and me when submitting patches for inclusion. Olof: I figured it would be easier if I just add this one than relaying it to you. Arnd
On Wed, Sep 19, 2012 at 7:58 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 17 September 2012, Tony Lindgren wrote: >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [120914 02:21]: >> > OMAP interconnect drivers are used for the interconnect error handling. >> > Since they are bus driver, lets move it to newly created drivers/bus. >> > >> > Cc: Arnd Bergmann <arnd@arndb.de> >> > Cc: Tony Lindgren <tony@atomide.com> >> > Tested-by: Lokesh Vutla <lokeshvutla@ti.com> >> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> > --- >> > Patch just moves OMAP interconnect drivers as is to the newly created >> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" >> > tree and test on all OMAP boards. >> >> Great, looks like this should not conflict with other >> omap patches queued, so Arnd should probably take this into >> the bus branch: >> >> Acked-by: Tony Lindgren <tony@atomide.com> > > Ok, added to the branch. In the future please Cc both Olof and me when submitting > patches for inclusion. > > Olof: I figured it would be easier if I just add this one than relaying it to > you. Sounds good, thanks for the heads up. -Olof
On Wed, Sep 19, 2012 at 8:28 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 17 September 2012, Tony Lindgren wrote: >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [120914 02:21]: >> > OMAP interconnect drivers are used for the interconnect error handling. >> > Since they are bus driver, lets move it to newly created drivers/bus. >> > >> > Cc: Arnd Bergmann <arnd@arndb.de> >> > Cc: Tony Lindgren <tony@atomide.com> >> > Tested-by: Lokesh Vutla <lokeshvutla@ti.com> >> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> > --- >> > Patch just moves OMAP interconnect drivers as is to the newly created >> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" >> > tree and test on all OMAP boards. >> >> Great, looks like this should not conflict with other >> omap patches queued, so Arnd should probably take this into >> the bus branch: >> >> Acked-by: Tony Lindgren <tony@atomide.com> > > Ok, added to the branch. In the future please Cc both Olof and me when submitting > patches for inclusion. > Thanks Arnd. Sorry I missed to Cc Olof on the patch. Will take care of this in future. Regards santosh
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index dd2db02..7d3c8ab 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 f6a24b3..7fed980 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 6270415..bbec35d 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 0ec50bc..45d997c 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