Commit 25696b4b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 2e6185f1 0ee7261c

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-omap2/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/bus/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -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

drivers/bus/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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