aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-07-05 09:17:42 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-06 14:24:23 -0400
commit34767f8dccc326026f97cd63f759dd36bd83502d (patch)
treeba3f81da42e7cdc08159460618e05b59eaeabcfd /arch/arm/mach-shmobile
parent21503a86db5015b74cceb54c41ed8862107ddaec (diff)
ARM: mach-shmobile: 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> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index df33909205e2..8854019651c0 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -58,6 +58,7 @@ config MACH_G4EVM
58 bool "G4EVM board" 58 bool "G4EVM board"
59 depends on ARCH_SH7377 59 depends on ARCH_SH7377
60 select ARCH_REQUIRE_GPIOLIB 60 select ARCH_REQUIRE_GPIOLIB
61 select REGULATOR_FIXED_VOLTAGE if REGULATOR
61 62
62config MACH_AP4EVB 63config MACH_AP4EVB
63 bool "AP4EVB board" 64 bool "AP4EVB board"
@@ -65,6 +66,7 @@ config MACH_AP4EVB
65 select ARCH_REQUIRE_GPIOLIB 66 select ARCH_REQUIRE_GPIOLIB
66 select SH_LCD_MIPI_DSI 67 select SH_LCD_MIPI_DSI
67 select SND_SOC_AK4642 if SND_SIMPLE_CARD 68 select SND_SOC_AK4642 if SND_SIMPLE_CARD
69 select REGULATOR_FIXED_VOLTAGE if REGULATOR
68 70
69choice 71choice
70 prompt "AP4EVB LCD panel selection" 72 prompt "AP4EVB LCD panel selection"
@@ -83,6 +85,7 @@ config MACH_AG5EVM
83 bool "AG5EVM board" 85 bool "AG5EVM board"
84 select ARCH_REQUIRE_GPIOLIB 86 select ARCH_REQUIRE_GPIOLIB
85 select SH_LCD_MIPI_DSI 87 select SH_LCD_MIPI_DSI
88 select REGULATOR_FIXED_VOLTAGE if REGULATOR
86 depends on ARCH_SH73A0 89 depends on ARCH_SH73A0
87 90
88config MACH_MACKEREL 91config MACH_MACKEREL
@@ -90,15 +93,18 @@ config MACH_MACKEREL
90 depends on ARCH_SH7372 93 depends on ARCH_SH7372
91 select ARCH_REQUIRE_GPIOLIB 94 select ARCH_REQUIRE_GPIOLIB
92 select SND_SOC_AK4642 if SND_SIMPLE_CARD 95 select SND_SOC_AK4642 if SND_SIMPLE_CARD
96 select REGULATOR_FIXED_VOLTAGE if REGULATOR
93 97
94config MACH_KOTA2 98config MACH_KOTA2
95 bool "KOTA2 board" 99 bool "KOTA2 board"
96 select ARCH_REQUIRE_GPIOLIB 100 select ARCH_REQUIRE_GPIOLIB
101 select REGULATOR_FIXED_VOLTAGE if REGULATOR
97 depends on ARCH_SH73A0 102 depends on ARCH_SH73A0
98 103
99config MACH_BONITO 104config MACH_BONITO
100 bool "bonito board" 105 bool "bonito board"
101 select ARCH_REQUIRE_GPIOLIB 106 select ARCH_REQUIRE_GPIOLIB
107 select REGULATOR_FIXED_VOLTAGE if REGULATOR
102 depends on ARCH_R8A7740 108 depends on ARCH_R8A7740
103 109
104config MACH_ARMADILLO800EVA 110config MACH_ARMADILLO800EVA
@@ -106,22 +112,26 @@ config MACH_ARMADILLO800EVA
106 depends on ARCH_R8A7740 112 depends on ARCH_R8A7740
107 select ARCH_REQUIRE_GPIOLIB 113 select ARCH_REQUIRE_GPIOLIB
108 select USE_OF 114 select USE_OF
115 select REGULATOR_FIXED_VOLTAGE if REGULATOR
109 116
110config MACH_MARZEN 117config MACH_MARZEN
111 bool "MARZEN board" 118 bool "MARZEN board"
112 depends on ARCH_R8A7779 119 depends on ARCH_R8A7779
113 select ARCH_REQUIRE_GPIOLIB 120 select ARCH_REQUIRE_GPIOLIB
121 select REGULATOR_FIXED_VOLTAGE if REGULATOR
114 122
115config MACH_KZM9D 123config MACH_KZM9D
116 bool "KZM9D board" 124 bool "KZM9D board"
117 depends on ARCH_EMEV2 125 depends on ARCH_EMEV2
118 select USE_OF 126 select USE_OF
127 select REGULATOR_FIXED_VOLTAGE if REGULATOR
119 128
120config MACH_KZM9G 129config MACH_KZM9G
121 bool "KZM-A9-GT board" 130 bool "KZM-A9-GT board"
122 depends on ARCH_SH73A0 131 depends on ARCH_SH73A0
123 select ARCH_REQUIRE_GPIOLIB 132 select ARCH_REQUIRE_GPIOLIB
124 select USE_OF 133 select USE_OF
134 select REGULATOR_FIXED_VOLTAGE if REGULATOR
125 135
126comment "SH-Mobile System Configuration" 136comment "SH-Mobile System Configuration"
127 137