4.3-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Chen-Yu Tsai <w...@csie.org>

commit 976d84fce6aa1e5bf92b8d06d69014ac45fd5fad upstream.

The VDD-CPU and VDD-GPU regulators were incorrectly swapped.

Fixes: bab03561224ba ("ARM: dts: sun6i: hummingbird: Add AXP221 regulator
       nodes")

Signed-off-by: Chen-Yu Tsai <w...@csie.org>
Signed-off-by: Maxime Ripard <maxime.rip...@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -184,18 +184,18 @@
                                regulator-name = "vcc-3v0";
                        };
 
-                       vdd_cpu: dcdc2 {
+                       vdd_gpu: dcdc2 {
                                regulator-always-on;
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <1320000>;
-                               regulator-name = "vdd-cpu";
+                               regulator-name = "vdd-gpu";
                        };
 
-                       vdd_gpu: dcdc3 {
+                       vdd_cpu: dcdc3 {
                                regulator-always-on;
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <1320000>;
-                               regulator-name = "vdd-gpu";
+                               regulator-name = "vdd-cpu";
                        };
 
                        vdd_sys_dll: dcdc4 {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to