aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-07-05 09:18:50 -0400
committerPaul Mundt <lethal@linux-sh.org>2012-07-06 03:25:25 -0400
commit89d71486b293565aa345e1b722647cb29ade465c (patch)
tree3df56a810538efaa3bac98a318ae7bac8be40953
parentd4c191dfb9190880644c1542a21c9deda5c76151 (diff)
sh: select the fixed regulator driver on several boards
On systems, using regulators to supply power to devices, if the REGULATOR Kconfig option is disabled, regulator API stubs will be used, which often suffices to bring a default configuration up. If REGULATOR is enabled but respective regulator drivers are inactive, the real regulator API calls will be used, which in the absence of drivers will fail to provide services. This patch prevents such a problem on sh-mobile boards by forcing REGULATOR_FIXED_VOLTAGE on if REGULATOR is selected. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boards/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 1f56b35d3248..6047f9436990 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -55,6 +55,7 @@ config SH_7724_SOLUTION_ENGINE
55 depends on CPU_SUBTYPE_SH7724 55 depends on CPU_SUBTYPE_SH7724
56 select ARCH_REQUIRE_GPIOLIB 56 select ARCH_REQUIRE_GPIOLIB
57 select SND_SOC_AK4642 if SND_SIMPLE_CARD 57 select SND_SOC_AK4642 if SND_SIMPLE_CARD
58 select REGULATOR_FIXED_VOLTAGE if REGULATOR
58 help 59 help
59 Select 7724 SolutionEngine if configuring for a Hitachi SH7724 60 Select 7724 SolutionEngine if configuring for a Hitachi SH7724
60 evaluation board. 61 evaluation board.
@@ -136,6 +137,7 @@ config SH_RSK
136 bool "Renesas Starter Kit" 137 bool "Renesas Starter Kit"
137 depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \ 138 depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \
138 CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269 139 CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269
140 select REGULATOR_FIXED_VOLTAGE if REGULATOR
139 help 141 help
140 Select this option if configuring for any of the RSK+ MCU 142 Select this option if configuring for any of the RSK+ MCU
141 evaluation platforms. 143 evaluation platforms.
@@ -155,6 +157,7 @@ config SH_SDK7786
155 select NO_IOPORT if !PCI 157 select NO_IOPORT if !PCI
156 select ARCH_WANT_OPTIONAL_GPIOLIB 158 select ARCH_WANT_OPTIONAL_GPIOLIB
157 select HAVE_SRAM_POOL 159 select HAVE_SRAM_POOL
160 select REGULATOR_FIXED_VOLTAGE if REGULATOR
158 help 161 help
159 Select SDK7786 if configuring for a Renesas Technology Europe 162 Select SDK7786 if configuring for a Renesas Technology Europe
160 SH7786-65nm board. 163 SH7786-65nm board.
@@ -169,6 +172,7 @@ config SH_SH7757LCR
169 bool "SH7757LCR" 172 bool "SH7757LCR"
170 depends on CPU_SUBTYPE_SH7757 173 depends on CPU_SUBTYPE_SH7757
171 select ARCH_REQUIRE_GPIOLIB 174 select ARCH_REQUIRE_GPIOLIB
175 select REGULATOR_FIXED_VOLTAGE if REGULATOR
172 176
173config SH_SH7785LCR 177config SH_SH7785LCR
174 bool "SH7785LCR" 178 bool "SH7785LCR"
@@ -202,6 +206,7 @@ config SH_MIGOR
202 bool "Migo-R" 206 bool "Migo-R"
203 depends on CPU_SUBTYPE_SH7722 207 depends on CPU_SUBTYPE_SH7722
204 select ARCH_REQUIRE_GPIOLIB 208 select ARCH_REQUIRE_GPIOLIB
209 select REGULATOR_FIXED_VOLTAGE if REGULATOR
205 help 210 help
206 Select Migo-R if configuring for the SH7722 Migo-R platform 211 Select Migo-R if configuring for the SH7722 Migo-R platform
207 by Renesas System Solutions Asia Pte. Ltd. 212 by Renesas System Solutions Asia Pte. Ltd.
@@ -210,6 +215,7 @@ config SH_AP325RXA
210 bool "AP-325RXA" 215 bool "AP-325RXA"
211 depends on CPU_SUBTYPE_SH7723 216 depends on CPU_SUBTYPE_SH7723
212 select ARCH_REQUIRE_GPIOLIB 217 select ARCH_REQUIRE_GPIOLIB
218 select REGULATOR_FIXED_VOLTAGE if REGULATOR
213 help 219 help
214 Renesas "AP-325RXA" support. 220 Renesas "AP-325RXA" support.
215 Compatible with ALGO SYSTEM CO.,LTD. "AP-320A" 221 Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
@@ -218,6 +224,7 @@ config SH_KFR2R09
218 bool "KFR2R09" 224 bool "KFR2R09"
219 depends on CPU_SUBTYPE_SH7724 225 depends on CPU_SUBTYPE_SH7724
220 select ARCH_REQUIRE_GPIOLIB 226 select ARCH_REQUIRE_GPIOLIB
227 select REGULATOR_FIXED_VOLTAGE if REGULATOR
221 help 228 help
222 "Kit For R2R for 2009" support. 229 "Kit For R2R for 2009" support.
223 230
@@ -226,6 +233,7 @@ config SH_ECOVEC
226 depends on CPU_SUBTYPE_SH7724 233 depends on CPU_SUBTYPE_SH7724
227 select ARCH_REQUIRE_GPIOLIB 234 select ARCH_REQUIRE_GPIOLIB
228 select SND_SOC_DA7210 if SND_SIMPLE_CARD 235 select SND_SOC_DA7210 if SND_SIMPLE_CARD
236 select REGULATOR_FIXED_VOLTAGE if REGULATOR
229 help 237 help
230 Renesas "R0P7724LC0011/21RL (EcoVec)" support. 238 Renesas "R0P7724LC0011/21RL (EcoVec)" support.
231 239
@@ -300,6 +308,7 @@ config SH_MAGIC_PANEL_R2
300 bool "Magic Panel R2" 308 bool "Magic Panel R2"
301 depends on CPU_SUBTYPE_SH7720 309 depends on CPU_SUBTYPE_SH7720
302 select ARCH_REQUIRE_GPIOLIB 310 select ARCH_REQUIRE_GPIOLIB
311 select REGULATOR_FIXED_VOLTAGE if REGULATOR
303 help 312 help
304 Select Magic Panel R2 if configuring for Magic Panel R2. 313 Select Magic Panel R2 if configuring for Magic Panel R2.
305 314
@@ -311,6 +320,7 @@ config SH_CAYMAN
311config SH_POLARIS 320config SH_POLARIS
312 bool "SMSC Polaris" 321 bool "SMSC Polaris"
313 select CPU_HAS_IPR_IRQ 322 select CPU_HAS_IPR_IRQ
323 select REGULATOR_FIXED_VOLTAGE if REGULATOR
314 depends on CPU_SUBTYPE_SH7709 324 depends on CPU_SUBTYPE_SH7709
315 help 325 help
316 Select if configuring for an SMSC Polaris development board 326 Select if configuring for an SMSC Polaris development board
@@ -318,6 +328,7 @@ config SH_POLARIS
318config SH_SH2007 328config SH_SH2007
319 bool "SH-2007 board" 329 bool "SH-2007 board"
320 select NO_IOPORT 330 select NO_IOPORT
331 select REGULATOR_FIXED_VOLTAGE if REGULATOR
321 depends on CPU_SUBTYPE_SH7780 332 depends on CPU_SUBTYPE_SH7780
322 help 333 help
323 SH-2007 is a single-board computer based around SH7780 chip 334 SH-2007 is a single-board computer based around SH7780 chip
@@ -329,6 +340,7 @@ config SH_SH2007
329config SH_APSH4A3A 340config SH_APSH4A3A
330 bool "AP-SH4A-3A" 341 bool "AP-SH4A-3A"
331 select SH_ALPHA_BOARD 342 select SH_ALPHA_BOARD
343 select REGULATOR_FIXED_VOLTAGE if REGULATOR
332 depends on CPU_SUBTYPE_SH7785 344 depends on CPU_SUBTYPE_SH7785
333 help 345 help
334 Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A. 346 Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A.
@@ -337,6 +349,7 @@ config SH_APSH4AD0A
337 bool "AP-SH4AD-0A" 349 bool "AP-SH4AD-0A"
338 select SH_ALPHA_BOARD 350 select SH_ALPHA_BOARD
339 select SYS_SUPPORTS_PCI 351 select SYS_SUPPORTS_PCI
352 select REGULATOR_FIXED_VOLTAGE if REGULATOR
340 depends on CPU_SUBTYPE_SH7786 353 depends on CPU_SUBTYPE_SH7786
341 help 354 help
342 Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A. 355 Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.