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

Commit 00e8ec2f authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: mvebu: move DT Dove to MVEBU



With all the DT support preparation done, we are able to move Dove
to MVEBU easily. Legacy non-DT mach-dove is left untouched to rot
for a while before removal.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 0d75ab68
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,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 \
+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
+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
+12 −0
Original line number Diff line number Diff line
@@ -75,6 +75,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
+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
Loading