| From 0431d7f6ef6fb03776ad5a604e2bc2bc6caa6923 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 11 Dec 2013 15:13:52 +0100 |
| Subject: ARM: shmobile: lager-reference: Enable multiplaform kernel support |
| |
| Enable multiplaform ARM architecture support for the Lager reference |
| board. Common clock framework initialization will be handled by the |
| rcar_gen2_init_timer() call, we just need to remove the legacy clock |
| code initialization. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 0ef3cde4d906041a497bfc585568a45ae84b4a8f) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 1 + |
| arch/arm/mach-shmobile/Kconfig | 8 ++++++++ |
| arch/arm/mach-shmobile/Makefile | 1 + |
| arch/arm/mach-shmobile/board-lager-reference.c | 2 ++ |
| 4 files changed, 12 insertions(+) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 0eadc1af789b..bf100833943f 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -178,6 +178,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ |
| sh7372-mackerel.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ |
| r7s72100-genmai-reference.dtb \ |
| + r8a7790-lager-reference.dtb \ |
| r8a7791-koelsch-reference.dtb |
| dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ |
| socfpga_vt.dtb |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index cd89d6348e0e..e7033a858429 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -28,6 +28,10 @@ config ARCH_EMEV2 |
| config ARCH_R7S72100 |
| bool "RZ/A1H (R7S72100)" |
| |
| +config ARCH_R8A7790 |
| + bool "R-Car H2 (R8A77900)" |
| + select RENESAS_IRQC |
| + |
| config ARCH_R8A7791 |
| bool "R-Car M2 (R8A77910)" |
| select RENESAS_IRQC |
| @@ -47,6 +51,10 @@ config MACH_KZM9D |
| depends on ARCH_EMEV2 |
| select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| |
| +config MACH_LAGER |
| + bool "Lager board" |
| + depends on ARCH_R8A7790 |
| + |
| comment "Renesas ARM SoCs System Configuration" |
| endif |
| |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 1c131046dec6..9daa9c16e681 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -59,6 +59,7 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI |
| obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o |
| obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o |
| obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o |
| +obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o |
| else |
| obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o |
| obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o |
| diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c |
| index 51a3bcc704e5..fc43f7ce6577 100644 |
| --- a/arch/arm/mach-shmobile/board-lager-reference.c |
| +++ b/arch/arm/mach-shmobile/board-lager-reference.c |
| @@ -27,7 +27,9 @@ |
| |
| static void __init lager_add_standard_devices(void) |
| { |
| +#ifndef CONFIG_COMMON_CLK |
| r8a7790_clock_init(); |
| +#endif |
| r8a7790_add_dt_devices(); |
| of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| } |
| -- |
| 1.8.5.rc3 |
| |