ARM: shmobile: Consolidate GPIOLIB Kconfig bits
Magnus Damm
maintainerPATCH 1/6 ARM: shmobile: Consolidate GPIOLIB Kconfig bits
From: Magnus Damm <[email protected]>
Consolidate ARCH_WANT_OPTIONAL_GPIOLIB under ARCH_SHMOBILE so it can be shared by Legacy and Multiplatform.
---
arch/arm/mach-shmobile/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/arm/mach-shmobile/Kconfig +1 -8
@@ -1,5 +1,6 @@ config ARCH_SHMOBILE bool + select ARCH_WANT_OPTIONAL_GPIOLIB menuconfig ARCH_SHMOBILE_MULTI bool "Renesas ARM SoCs" if ARCH_MULTI_V7
@@ -67,7 +68,6 @@ comment "Renesas ARM SoCs System Type" config ARCH_SH7372 bool "SH-Mobile AP4 (SH7372)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_CPU_SUSPEND if PM || CPU_IDLE select CPU_V7 select SH_CLK_CPG
@@ -76,7 +76,6 @@ config ARCH_SH7372 config ARCH_SH73A0 bool "SH-Mobile AG5 (R8A73A00)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select I2C
@@ -87,7 +86,6 @@ config ARCH_SH73A0 config ARCH_R8A73A4 bool "R-Mobile APE6 (R8A73A40)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select SH_CLK_CPG
@@ -97,7 +95,6 @@ config ARCH_R8A73A4 config ARCH_R8A7740 bool "R-Mobile A1 (R8A77400)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select SH_CLK_CPG
@@ -107,7 +104,6 @@ config ARCH_R8A7740 config ARCH_R8A7778 bool "R-Car M1A (R8A77781)" - select ARCH_WANT_OPTIONAL_GPIOLIB select CPU_V7 select SH_CLK_CPG select ARM_GIC
@@ -116,7 +112,6 @@ config ARCH_R8A7778 config ARCH_R8A7779 bool "R-Car H1 (R8A77790)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select SH_CLK_CPG
@@ -125,7 +120,6 @@ config ARCH_R8A7779 config ARCH_R8A7790 bool "R-Car H2 (R8A77900)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select MIGHT_HAVE_PCI
@@ -136,7 +130,6 @@ config ARCH_R8A7790 config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 select MIGHT_HAVE_PCI
Hi Magnus,
Quoted 12 lines · Magnus Damm
Consolidate
ARCH_WANT_OPTIONAL_GPIOLIBunderARCH_SHMOBILEso it can be shared by Legacy and Multiplatform.Signed-off-by Magnus Damm <[email protected]>---
arch/arm/mach-shmobile/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 line 3
Quoted 3 lines
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 renamed from arch/arm/mach-shmobile/Kconfig +1
-0@@ -1,5 +1,6 @@ config ARCH_SHMOBILE bool + select ARCH_WANT_OPTIONAL_GPIOLIB
This is already selected by ARCH_MULTIPLATFORM, so perhaps it's best to just move it ARCH_SHMOBILE_LEGACY instead?
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 line 5
Quoted 2 lines
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 renamed from arch/arm/mach-shmobile/Kconfig +0
-0menuconfig ARCH_SHMOBILE_MULTI bool "Renesas ARM SoCs" if ARCH_MULTI_V7
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Magnus Damm
maintainerHi Geert,
Quoted 12 lines · Geert Uytterhoeven
Hi Magnus,
Quoted 9 lines · Magnus Damm
Consolidate
ARCH_WANT_OPTIONAL_GPIOLIBunderARCH_SHMOBILEso it can be shared by Legacy and Multiplatform.Signed-off-by Magnus Damm <[email protected]>---
arch/arm/mach-shmobile/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
Quoted 12 lines
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 line 3
Quoted 6 lines
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 renamed from arch/arm/mach-shmobile/Kconfig +1
-0@@ -1,5 +1,6 @@ config ARCH_SHMOBILE bool + select ARCH_WANT_OPTIONAL_GPIOLIBThis is already selected by
ARCH_MULTIPLATFORM, so perhaps it's best to just move itARCH_SHMOBILE_LEGACYinstead?Quoted 2 lines
arch/arm/mach-shmobile/Kconfig 2014-08-19 21:46:43.000000000 +0900 renamed from arch/arm/mach-shmobile/Kconfig +0
-0menuconfig ARCH_SHMOBILE_MULTI bool "Renesas ARM SoCs" if ARCH_MULTI_V7
Uhm, yeah we seem to have some redundancy. Historically with the legacy code we always started with OPTIONAL_GPIOLIB for SoCs then let boards opt-in on REQUIRE_GPIOLIB if they actually depend on programming the PFC/GPIO for normal operation. With Multiplatform it becomes a more of a system-wide selection, so OPTIONAL indeed seems something mainly useful for the Legacy case.
To make things more complicated, there are probably more bits under ARCH_SHMOBILE_LEGACY that wants to be consolidated. Also ARM building blocks like Cortex-A7, A8, A9, A15 could share common definitions, but those look like common ARM architecture things to me.
I somehow feel reluctant of poking around in arch/arm/Kconfig and potentially cause conflicts. But I guess that's the only way.
Cheers,
/ magnus