aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-06 20:15:48 -0400
committerOlof Johansson <olof@lixom.net>2014-07-06 20:16:16 -0400
commit21760aedabc795a6758bf15fafcd59fe0799cd9f (patch)
treed63b61d178d8a11a085fc3a6497137d85f45b34c /arch/arm/mach-shmobile/Makefile
parent5bf521b813776e983bfc1ef21898391e51773c1d (diff)
parentc1a0f9932b66b2298163c31f8ac3f2844476e1c2 (diff)
Merge tag 'renesas-r8a7779-multiplatform-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17" from Simon Horman: Move r8a7779 SoC and its Marzen board to use common clocks, multiplatform and initialise SCIF (serial) devices using DT. * tag 'renesas-r8a7779-multiplatform-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (32 commits) ARM: shmobile: marzen: Do not use workaround for scif devices ARM: shmobile: marzen: Initialise SCIF devices using DT ARM: shmobile: marzen: Remove early_printk from command line ARM: shmobile: r8a7779: Add scif nodes to dtsi ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay() ARM: shmobile: marzen-reference: Use DT CPU Frequency ARM: shmobile: r8a7779: Use DT CPU Frequency in common case ARM: shmobile: r8a7779: Add Maximum CPU Frequency to DTS ARM: shmobile: marzen-reference: Remove legacy clock support ARM: shmobile: Remove Marzen reference DTS ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB ARM: shmobile: Remove non-multiplatform Marzen reference support ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and TMU ARM: shmobile: marzen-reference: Initialize CPG device ARM: shmobile: r8a7779: Initial multiplatform support ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c ARM: shmobile: r8a7779: Add helper to read mode pins ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
-rw-r--r--arch/arm/mach-shmobile/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 1b966da2c81c..d4fd9a98242e 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -60,6 +60,7 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI
60obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o 60obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o
61obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o 61obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o
62obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o 62obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
63obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
63else 64else
64obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o 65obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
65obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o 66obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
@@ -68,7 +69,6 @@ obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
68obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o 69obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
69obj-$(CONFIG_MACH_GENMAI) += board-genmai.o 70obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
70obj-$(CONFIG_MACH_MARZEN) += board-marzen.o 71obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
71obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
72obj-$(CONFIG_MACH_LAGER) += board-lager.o 72obj-$(CONFIG_MACH_LAGER) += board-lager.o
73obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o 73obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
74obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o 74obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o