Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33dc586 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge tag 'tags/drivers_for_v3.10' into mvebu/soc 

mvebu drivers for v3.10

 - mvebu: mbus driver for kirkwood, dove, orion5x, mv78xx, and armada 370/xp
parents 02ac5b3f 8d7297b4

drivers/bus/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


menu "Bus devices"



config MVEBU_MBUS

	bool

	depends on PLAT_ORION

	help

	  Driver needed for the MBus configuration on Marvell EBU SoCs

	  (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).



config OMAP_OCP2SCP

	tristate "OMAP OCP2SCP DRIVER"

	depends on ARCH_OMAP2PLUS

drivers/bus/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for the bus drivers.

#



obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o

obj-$(CONFIG_OMAP_OCP2SCP)	+= omap-ocp2scp.o



# Interconnect bus driver for OMAP SoCs.