From f70444980b23f5f52025aa6b7d22233312dea136 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 13 Dec 2014 12:40:45 +0100
Subject: sunxi: axp221: Add Kconfig help and sane defaults for typical ldo
 usage

Some of the ldo-s of the axp221 are used in the same way on most boards, add
comments to the Kconfig help text to reflect this, and give them defaults
matching their typical usage.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 4c9cff6..1b6cdbf 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -11,9 +11,6 @@ CONFIG_FDTFILE="sun6i-a31s-cs908.dtb"
 +S:CONFIG_AXP221_DLDO1_VOLT=3300
 # Wifi power
 +S:CONFIG_AXP221_ALDO1_VOLT=3300
-# HDMI power ?
-+S:CONFIG_AXP221_ALDO2_VOLT=1800
-+S:CONFIG_AXP221_ALDO3_VOLT=3000
 # No Vbus gpio for either usb
 +S:CONFIG_USB1_VBUS_PIN=""
 +S:CONFIG_USB2_VBUS_PIN=""
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index b8c5400..f42ae52 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -9,8 +9,5 @@ CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
 +S:CONFIG_DRAM_ZQ=251
 # Wifi power
 +S:CONFIG_AXP221_ALDO1_VOLT=3300
-# HDMI power ?
-+S:CONFIG_AXP221_ALDO2_VOLT=1800
-+S:CONFIG_AXP221_ALDO3_VOLT=3000
 # No Vbus gpio for usb1
 +S:CONFIG_USB1_VBUS_PIN=""
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index b60d579..93820ab 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -9,10 +9,6 @@ CONFIG_FDTFILE="sun6i-a31-hummingbird.dtb"
 +S:CONFIG_DRAM_ZQ=251
 # Wifi power
 +S:CONFIG_AXP221_ALDO1_VOLT=3300
-# PM-CPUS GPIO power
-+S:CONFIG_AXP221_ALDO2_VOLT=1800
-# SoC IR, PLL and Analog power (must be 3.0V)
-+S:CONFIG_AXP221_ALDO3_VOLT=3000
 # Vbus gpio for usb1
 +S:CONFIG_USB1_VBUS_PIN="PH24"
 # No Vbus gpio for usb2
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index a598254..445cc57 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -13,9 +13,6 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb"
 +S:CONFIG_AXP221_DLDO4_VOLT=3300
 # Wifi power
 +S:CONFIG_AXP221_ALDO1_VOLT=3300
-# HDMI power ?
-+S:CONFIG_AXP221_ALDO2_VOLT=1800
-+S:CONFIG_AXP221_ALDO3_VOLT=3000
 # Vbus gpio for usb1
 +S:CONFIG_USB1_VBUS_PIN="PC27"
 # No Vbus gpio for usb2
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 7373a79..af66887 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -12,7 +12,9 @@ config AXP221_DLDO1_VOLT
 	default -1
 	---help---
 	Set the voltage (mV) to program the axp221 dldo1 at, set to -1 to
-	disable dldo1.
+	disable dldo1. On sun6i (A31) boards with ethernet this is often used
+	to power the ethernet phy. On sun8i (A23) boards this is often used to
+	power the wifi.
 
 config AXP221_DLDO4_VOLT
 	int "axp221 dldo4 voltage"
@@ -28,20 +30,26 @@ config AXP221_ALDO1_VOLT
 	default -1
 	---help---
 	Set the voltage (mV) to program the axp221 aldo1 at, set to -1 to
-	disable aldo1.
+	disable aldo1. On sun6i (A31) boards which have a wifi module this is
+	often used to power the wifi module.
 
 config AXP221_ALDO2_VOLT
 	int "axp221 aldo2 voltage"
 	depends on AXP221_POWER
-	default -1
+	default 1800 if MACH_SUN6I
+	default 2500 if MACH_SUN8I
 	---help---
 	Set the voltage (mV) to program the axp221 aldo2 at, set to -1 to
-	disable aldo2.
+	disable aldo2. On sun6i (A31) boards this is typically connected to
+	VCC-PM, which powers the port M gpios, and should be set to 1.8V.
+	On sun8i (A23) this is typically connected to VDD-DLL and must be
+	set to 2.5V.
 
 config AXP221_ALDO3_VOLT
 	int "axp221 aldo3 voltage"
 	depends on AXP221_POWER
-	default -1
+	default 3000
 	---help---
 	Set the voltage (mV) to program the axp221 aldo3 at, set to -1 to
-	disable aldo3.
+	disable aldo3. This is typically connected to VCC-PLL and AVCC and
+	must be set to 3V.
-- 
cgit v0.10.2