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

Commit e7f274dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc 

Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:

 - dove
    - move devicetree code from mach-dove/ to mach-mvebu/ :-)

* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: move DT Dove to MVEBU

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d4324ce3 00e8ec2f

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += \ 
	berlin2cd-google-chromecast.dtb

dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \

	da850-evm.dtb

dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \

	dove-cubox.dtb \

	dove-d2plug.dtb \

	dove-d3plug.dtb \

arch/arm/mach-dove/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -20,18 +20,6 @@ config MACH_CM_A510 
	  Say 'Y' here if you want your kernel to support the

	  CompuLab CM-A510 Board.



config MACH_DOVE_DT

	bool "Marvell Dove Flattened Device Tree"

	select DOVE_CLK

	select ORION_IRQCHIP

	select ORION_TIMER

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select USE_OF

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Dove using flattened device tree.



endmenu



endif

arch/arm/mach-dove/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ obj-y += common.o 
obj-$(CONFIG_DOVE_LEGACY)	+= irq.o mpp.o

obj-$(CONFIG_PCI)		+= pcie.o

obj-$(CONFIG_MACH_DOVE_DB)	+= dove-db-setup.o

obj-$(CONFIG_MACH_DOVE_DT)	+= board-dt.o

obj-$(CONFIG_MACH_CM_A510)	+= cm-a510.o

arch/arm/mach-mvebu/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -69,6 +69,18 @@ config MACH_ARMADA_XP 
	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada XP SoC with device tree.



config MACH_DOVE

	bool "Marvell Dove boards" if ARCH_MULTI_V7

	select CACHE_L2X0

	select CPU_PJ4

	select DOVE_CLK

	select ORION_IRQCHIP

	select ORION_TIMER

	select PINCTRL_DOVE

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Dove using flattened device tree.



config MACH_KIRKWOOD

	bool "Marvell Kirkwood boards" if ARCH_MULTI_V5

	select ARCH_HAS_CPUFREQ

arch/arm/mach-mvebu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a 


obj-y				 += system-controller.o mvebu-soc-id.o

obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o

obj-$(CONFIG_MACH_DOVE)		 += dove.o

obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o

obj-$(CONFIG_SMP)                += platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o