From 05104c266ae9a1673d92a068e2eeb0059db8c075 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 2 Jul 2014 18:23:37 +0200 Subject: ARM: shmobile: r7s72100: genmai: Remove legacy board file The genmai board now boots using DT and multiplatform kernel with the same feature set as the legacy board. Remove the legacy board file and the board Kconfig option. Signed-off-by: Laurent Pinchart Acked-by: Wolfram Sang Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Kconfig | 9 --------- 1 file changed, 9 deletions(-) (limited to 'arch/arm/mach-shmobile/Kconfig') diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index e15dff790dbb..169bda468675 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -43,10 +43,6 @@ config ARCH_R8A7791 comment "Renesas ARM SoCs Board Type" -config MACH_GENMAI - bool "Genmai board" - depends on ARCH_R7S72100 - config MACH_KOELSCH bool "Koelsch board" depends on ARCH_R8A7791 @@ -232,11 +228,6 @@ config MACH_BOCKW_REFERENCE This is intended to aid developers -config MACH_GENMAI - bool "Genmai board" - depends on ARCH_R7S72100 - select USE_OF - config MACH_MARZEN bool "MARZEN board" depends on ARCH_R8A7779 -- cgit v1.2.1 From ad8c3af8b75ff26c5c887f2101da653bdcd53a38 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 2 Jul 2014 18:23:38 +0200 Subject: ARM: shmobile: r7s72100: Remove legacy board support There's no legacy board anymore, genmai now boots with multiplatform support only. Remove the leftovers. Makefile.boot portion pointed out by Paul Bolle. Signed-off-by: Laurent Pinchart Acked-by: Wolfram Sang Cc: Paul Bolle [horms+renesas@verge.net.au: squashed in patch containing Makefile.boot change] Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Kconfig | 8 -------- 1 file changed, 8 deletions(-) (limited to 'arch/arm/mach-shmobile/Kconfig') diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 169bda468675..5814754c1240 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -145,14 +145,6 @@ config ARCH_R8A7791 select SYS_SUPPORTS_SH_CMT select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE -config ARCH_R7S72100 - bool "RZ/A1H (R7S72100)" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - select CPU_V7 - select SH_CLK_CPG - select SYS_SUPPORTS_SH_MTU2 - comment "Renesas ARM SoCs Board Type" config MACH_APE6EVM -- cgit v1.2.1 From c41215b781efbfa22ffc9dc474c2981c130c153d Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Mon, 25 Aug 2014 12:36:53 +0900 Subject: ARM: shmobile: r8a7740: Multiplatform support Enable r8a7740 Multiplatform support for the generic r8a7740 machine vector. No board support is enabled, and the board code for Armadillo 800 EVA DT Reference is left by itself. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm/mach-shmobile/Kconfig') diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index e15dff790dbb..498162fb757e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -26,6 +26,11 @@ config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select SYS_SUPPORTS_SH_MTU2 +config ARCH_R8A7740 + bool "R-Mobile A1 (R8A77400)" + select ARCH_RMOBILE + select RENESAS_INTC_IRQPIN + config ARCH_R8A7779 bool "R-Car H1 (R8A77790)" select RENESAS_INTC_IRQPIN -- cgit v1.2.1 From 52031d41be060e9a7f6d113728109aed4758f7ae Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Thu, 28 Aug 2014 12:35:18 +0900 Subject: ARM: shmobile: armadillo800eva reference: Remove C board code Now when the r8a7740 generic multiplatform case has the same features as the DT reference board code then get rid of the Armadillo800EVA DT reference C board code. DT Reference code in the future shall make use of the r8a7740 Multiplatform support code with the generic SoC machine vector. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Kconfig | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'arch/arm/mach-shmobile/Kconfig') diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 498162fb757e..723bcc501c54 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -200,21 +200,6 @@ config MACH_ARMADILLO800EVA select SND_SOC_WM8978 if SND_SIMPLE_CARD select USE_OF -config MACH_ARMADILLO800EVA_REFERENCE - bool "Armadillo-800 EVA board - Reference Device Tree Implementation" - depends on ARCH_R8A7740 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SH_ETH - select SND_SOC_WM8978 if SND_SIMPLE_CARD - select USE_OF - ---help--- - Use reference implementation of Armadillo800 EVA board support - which makes greater use of device tree at the expense - of not supporting a number of devices. - - This is intended to aid developers - config MACH_BOCKW bool "BOCK-W platform" depends on ARCH_R8A7778 -- cgit v1.2.1 From 5923abb205e05773e0bb16c7ca4c0b41dbeec40e Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Thu, 4 Sep 2014 16:02:28 +0200 Subject: ARM: shmobile: Initial r8a7794 SoC support Initial support for the r8a7794 SoC, based on work by Hisashi Nakamura. Signed-off-by: Ulrich Hecht Acked-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-shmobile/Kconfig') diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index e15dff790dbb..05f4cc07dffb 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -41,6 +41,10 @@ config ARCH_R8A7791 select RENESAS_IRQC select SYS_SUPPORTS_SH_CMT +config ARCH_R8A7794 + bool "R-Car E2 (R8A77940)" + select ARCH_RCAR_GEN2 + comment "Renesas ARM SoCs Board Type" config MACH_GENMAI -- cgit v1.2.1