aboutsummaryrefslogtreecommitdiffstats
path: root/patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch')
-rw-r--r--patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch b/patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch
new file mode 100644
index 00000000000000..fbef06eebf4c21
--- /dev/null
+++ b/patches.renesas/0195-ARM-shmobile-Enable-fixed-voltage-regulator-in-shmob.patch
@@ -0,0 +1,33 @@
+From 3ab274297fd2bf39a2b59e4a1338cb38404cb10b Mon Sep 17 00:00:00 2001
+From: Simon Horman <horms+renesas@verge.net.au>
+Date: Wed, 15 Jul 2015 15:42:35 +0900
+Subject: [PATCH 195/326] ARM: shmobile: Enable fixed voltage regulator in
+ shmobile_defconfig
+
+This is selected by MACH_MARZEN which is enabled in shmobile_defconfig,
+however, MACH_MARZEN is going away along with the board code it enables.
+
+Acked-by: Magnus Damm <damm@opensource.se>
+Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+(cherry picked from commit 4055a722d260ca30610fc52238d0aa49ff5bffa9)
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ arch/arm/configs/shmobile_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
+index 8da509327265..89bf31ccfbfa 100644
+--- a/arch/arm/configs/shmobile_defconfig
++++ b/arch/arm/configs/shmobile_defconfig
+@@ -122,6 +122,7 @@ CONFIG_WATCHDOG=y
+ CONFIG_DA9063_WATCHDOG=y
+ CONFIG_MFD_AS3711=y
+ CONFIG_MFD_DA9063=y
++CONFIG_REGULATOR_FIXED_VOLTAGE=y
+ CONFIG_REGULATOR_AS3711=y
+ CONFIG_REGULATOR_DA9210=y
+ CONFIG_REGULATOR_GPIO=y
+--
+2.6.2
+