Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

sh: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB

This replaces:

- "select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB" as this can
  now be selected directly.

- "select ARCH_WANT_OPTIONAL_GPIOLIB" with no dependency: GPIOLIB
  is now selectable by everyone, so we need not declare our
  intent to select it.

When ordering the symbols the following rationale was used:
if the selects were in alphabetical order, I moved select GPIOLIB
to be in alphabetical order, but if the selects were not
maintained in alphabetical order, I just replaced
"select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB".

Cc: Michael Büsch <m@bues.ch>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij 9 years ago
parent
86c55af4a4
commit
fdcfdfa1b5
4 changed files with 13 additions and 23 deletions
Unified View Show Diff Stats
  1. 1 10
      arch/sh/Kconfig
  2. 8 9
      arch/sh/boards/Kconfig
  3. 1 1
      arch/sh/boards/mach-highlander/Kconfig
  4. 3 3
      arch/sh/boards/mach-rsk/Kconfig

+ 1 - 10
arch/sh/Kconfig
View File 

@@ -264,7 +264,6 @@ config CPU_SUBTYPE_SH7203
 
 	select CPU_HAS_FPU
 
 	select CPU_HAS_FPU
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_MTU2
 
 	select SYS_SUPPORTS_SH_MTU2
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 
 
 config CPU_SUBTYPE_SH7206
 
 config CPU_SUBTYPE_SH7206
 
@@ -353,7 +352,6 @@ config CPU_SUBTYPE_SH7720
 
 	select CPU_SH3
 
 	select CPU_SH3
 
 	select CPU_HAS_DSP
 
 	select CPU_HAS_DSP
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_CMT
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select USB_OHCI_SH if USB_OHCI_HCD
 
 	select USB_OHCI_SH if USB_OHCI_HCD
 
 	select PINCTRL
 
 	select PINCTRL
 
 	help
 
 	help
 
@@ -419,7 +417,6 @@ config CPU_SUBTYPE_SH7723
 
 	select ARCH_SHMOBILE
 
 	select ARCH_SHMOBILE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_CMT
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 	help
 
 	help
 
 	  Select SH7723 if you have an SH-MobileR2 CPU.
 
 	  Select SH7723 if you have an SH-MobileR2 CPU.
 
@@ -431,7 +428,6 @@ config CPU_SUBTYPE_SH7724
 
 	select ARCH_SHMOBILE
 
 	select ARCH_SHMOBILE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_CMT
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 	help
 
 	help
 
 	  Select SH7724 if you have an SH-MobileR2R CPU.
 
 	  Select SH7724 if you have an SH-MobileR2R CPU.
 
@@ -440,7 +436,6 @@ config CPU_SUBTYPE_SH7734
 
 	bool "Support SH7734 processor"
 
 	bool "Support SH7734 processor"
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
 	select CPU_SHX2
 
 	select CPU_SHX2
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 	help
 
 	help
 
 	  Select SH7734 if you have a SH4A SH7734 CPU.
 
 	  Select SH7734 if you have a SH4A SH7734 CPU.
 
@@ -449,7 +444,6 @@ config CPU_SUBTYPE_SH7757
 
 	bool "Support SH7757 processor"
 
 	bool "Support SH7757 processor"
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
 	select CPU_SHX2
 
 	select CPU_SHX2
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 	help
 
 	help
 
 	  Select SH7757 if you have a SH4A SH7757 CPU.
 
 	  Select SH7757 if you have a SH4A SH7757 CPU.
 
@@ -475,7 +469,6 @@ config CPU_SUBTYPE_SH7785
 
 	select CPU_SHX2
 
 	select CPU_SHX2
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_NUMA
 
 	select SYS_SUPPORTS_NUMA
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 
 
 config CPU_SUBTYPE_SH7786
 
 config CPU_SUBTYPE_SH7786
 
@@ -484,7 +477,6 @@ config CPU_SUBTYPE_SH7786
 
 	select CPU_SHX3
 
 	select CPU_SHX3
 
 	select CPU_HAS_PTEAEX
 
 	select CPU_HAS_PTEAEX
 
 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 
 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select USB_OHCI_SH if USB_OHCI_HCD
 
 	select USB_OHCI_SH if USB_OHCI_HCD
 
 	select USB_EHCI_SH if USB_EHCI_HCD
 
 	select USB_EHCI_SH if USB_EHCI_HCD
 
 	select PINCTRL
 
 	select PINCTRL
 
@@ -494,7 +486,7 @@ config CPU_SUBTYPE_SHX3
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
 	select CPU_SHX3
 
 	select CPU_SHX3
 
 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 
 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 
 
 # SH4AL-DSP Processor Support
 
 # SH4AL-DSP Processor Support
 
@@ -513,7 +505,6 @@ config CPU_SUBTYPE_SH7722
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_NUMA
 
 	select SYS_SUPPORTS_NUMA
 
 	select SYS_SUPPORTS_SH_CMT
 
 	select SYS_SUPPORTS_SH_CMT
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 
 
 config CPU_SUBTYPE_SH7366
 
 config CPU_SUBTYPE_SH7366

+ 8 - 9
arch/sh/boards/Kconfig
View File 

@@ -70,7 +70,7 @@ config SH_7724_SOLUTION_ENGINE
 
 	bool "SolutionEngine7724"
 
 	bool "SolutionEngine7724"
 
 	select SOLUTION_ENGINE
 
 	select SOLUTION_ENGINE
 
 	depends on CPU_SUBTYPE_SH7724
 
 	depends on CPU_SUBTYPE_SH7724
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
@@ -174,7 +174,6 @@ config SH_SDK7786
 
 	depends on CPU_SUBTYPE_SH7786
 
 	depends on CPU_SUBTYPE_SH7786
 
 	select SYS_SUPPORTS_PCI
 
 	select SYS_SUPPORTS_PCI
 
 	select NO_IOPORT_MAP if !PCI
 
 	select NO_IOPORT_MAP if !PCI
 
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 
 	select HAVE_SRAM_POOL
 
 	select HAVE_SRAM_POOL
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
@@ -190,7 +189,7 @@ config SH_HIGHLANDER
 
 config SH_SH7757LCR
 
 config SH_SH7757LCR
 
 	bool "SH7757LCR"
 
 	bool "SH7757LCR"
 
 	depends on CPU_SUBTYPE_SH7757
 
 	depends on CPU_SUBTYPE_SH7757
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 
 
 config SH_SH7785LCR
 
 config SH_SH7785LCR
 
@@ -217,14 +216,14 @@ config SH_SH7785LCR_PT
 
 config SH_URQUELL
 
 config SH_URQUELL
 
 	bool "Urquell"
 
 	bool "Urquell"
 
 	depends on CPU_SUBTYPE_SH7786
 
 	depends on CPU_SUBTYPE_SH7786
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select SYS_SUPPORTS_PCI
 
 	select SYS_SUPPORTS_PCI
 
 	select NO_IOPORT_MAP if !PCI
 
 	select NO_IOPORT_MAP if !PCI
 
 
 
 config SH_MIGOR
 
 config SH_MIGOR
 
 	bool "Migo-R"
 
 	bool "Migo-R"
 
 	depends on CPU_SUBTYPE_SH7722
 
 	depends on CPU_SUBTYPE_SH7722
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
 	  Select Migo-R if configuring for the SH7722 Migo-R platform
 
 	  Select Migo-R if configuring for the SH7722 Migo-R platform
 
@@ -233,7 +232,7 @@ config SH_MIGOR
 
 config SH_AP325RXA
 
 config SH_AP325RXA
 
 	bool "AP-325RXA"
 
 	bool "AP-325RXA"
 
 	depends on CPU_SUBTYPE_SH7723
 
 	depends on CPU_SUBTYPE_SH7723
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
 	  Renesas "AP-325RXA" support.
 
 	  Renesas "AP-325RXA" support.
 
@@ -242,7 +241,7 @@ config SH_AP325RXA
 
 config SH_KFR2R09
 
 config SH_KFR2R09
 
 	bool "KFR2R09"
 
 	bool "KFR2R09"
 
 	depends on CPU_SUBTYPE_SH7724
 
 	depends on CPU_SUBTYPE_SH7724
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
 	  "Kit For R2R for 2009" support.
 
 	  "Kit For R2R for 2009" support.
 
@@ -250,7 +249,7 @@ config SH_KFR2R09
 
 config SH_ECOVEC
 
 config SH_ECOVEC
 
 	bool "EcoVec"
 
 	bool "EcoVec"
 
 	depends on CPU_SUBTYPE_SH7724
 
 	depends on CPU_SUBTYPE_SH7724
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select SND_SOC_DA7210 if SND_SIMPLE_CARD
 
 	select SND_SOC_DA7210 if SND_SIMPLE_CARD
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
@@ -327,7 +326,7 @@ config SH_X3PROTO
 
 config SH_MAGIC_PANEL_R2
 
 config SH_MAGIC_PANEL_R2
 
 	bool "Magic Panel R2"
 
 	bool "Magic Panel R2"
 
 	depends on CPU_SUBTYPE_SH7720
 
 	depends on CPU_SUBTYPE_SH7720
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 	help
 
 	help
 
 	  Select Magic Panel R2 if configuring for Magic Panel R2.
 
 	  Select Magic Panel R2 if configuring for Magic Panel R2.

+ 1 - 1
arch/sh/boards/mach-highlander/Kconfig
View File 

@@ -18,7 +18,7 @@ config SH_R7780MP
 
 config SH_R7785RP
 
 config SH_R7785RP
 
 	bool "R7785RP board support"
 
 	bool "R7785RP board support"
 
 	depends on CPU_SUBTYPE_SH7785
 
 	depends on CPU_SUBTYPE_SH7785
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 
 
 endchoice
 
 endchoice

+ 3 - 3
arch/sh/boards/mach-rsk/Kconfig
View File 

@@ -10,17 +10,17 @@ config SH_RSK7201
 
 
 
 config SH_RSK7203
 
 config SH_RSK7203
 
 	bool "RSK7203"
 
 	bool "RSK7203"
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	depends on CPU_SUBTYPE_SH7203
 
 	depends on CPU_SUBTYPE_SH7203
 
 
 
 config SH_RSK7264
 
 config SH_RSK7264
 
 	bool "RSK2+SH7264"
 
 	bool "RSK2+SH7264"
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	depends on CPU_SUBTYPE_SH7264
 
 	depends on CPU_SUBTYPE_SH7264
 
 
 
 config SH_RSK7269
 
 config SH_RSK7269
 
 	bool "RSK2+SH7269"
 
 	bool "RSK2+SH7269"
 
-	select ARCH_REQUIRE_GPIOLIB
 
+	select GPIOLIB
 
 	depends on CPU_SUBTYPE_SH7269
 
 	depends on CPU_SUBTYPE_SH7269
 
 
 
 endchoice
 
 endchoice