add regulators to hi4511.dts initial

2 files changed, 248 insertions, 268 deletions

diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts
index 741eb8073471..f5fe4538a7b6 100644
--- a/arch/arm/boot/dts/hi4511.dts
+++ b/arch/arm/boot/dts/hi4511.dts
@@ -824,398 +824,378 @@
 	};
 
 	regulators {
-		compatible = "hisilicon, hi4511-hi6421", "syscon", "simple-bus";
-		reg = <0xfcc00000 0x00100000>;
-		interrupts = <>;
+		compatible = "hisilicon,hi6421","simple-bus";
+		reg = <0xfcc00000 0x0180>; /* 0x60 << 2 */
 
-		hi_ldo0: ldo0@20 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO0";
+		ldo0: ldo@20 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO0";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x20>;
-/*			hi6421-mode-mask = ;
-			hi6421-enable-mask = ;
-*/
-			hi6421-vset-reg = <0x20>;
-/*			hi6421-vsel-mask = ;
-*/
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
-		};
-
-		hi_ldo1: ldo1@21 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO1";
+			hisilicon,hi6421-ctrl = <0x20 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x20 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
+		};
+
+		ldo1: ldo@21 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO1";
 			regulator-min-microvolt = <1700000>;
 			regulatro-max-microvolt = <2000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x21>;
-			hi6421-vset-reg = <0x21>;
-			hi6421-vset-table = <1700000>, <1800000>,
-					    <1900000>, <2000000>;
+			hisilicon,hi6421-ctrl = <0x21 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x21 0x03>;
+			hisilicon,hi6421-vset-table = <1700000>, <1800000>,
+						      <1900000>, <2000000>;
 		};
 
-		hi_ldo2: ldo2@22 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO2";
+		ldo2: ldo@22 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO2";
 			regulator-min-microvolt = <1050000>;
 			regulatro-max-microvolt = <1400000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x22>;
-			hi6421-vset-reg = <0x22>;
-			hi6421-vset-table = <1050000>, <1100000>,
-					    <1150000>, <1200000>,
-					    <1250000>, <1300000>,
-					    <1350000>, <1400000>;
+			hisilicon,hi6421-ctrl = <0x22 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x22 0x07>;
+			hisilicon,hi6421-vset-table = <1050000>, <1100000>,
+						      <1150000>, <1200000>,
+						      <1250000>, <1300000>,
+						      <1350000>, <1400000>;
 		};
 
-		hi_ldo3: ldo3@23 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO3";
+		ldo3: ldo@23 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO3";
 			regulator-min-microvolt = <1050000>;
 			regulatro-max-microvolt = <1400000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x23>;
-			hi6421-vset-reg = <0x23>;
-			hi6421-vset-table = <1050000>, <1100000>,
-					    <1150000>, <1200000>,
-					    <1250000>, <1300000>,
-					    <1350000>, <1400000>;
+			hisilicon,hi6421-ctrl = <0x23 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x23 0x07>;
+			hisilicon,hi6421-vset-table = <1050000>, <1100000>,
+						      <1150000>, <1200000>,
+						      <1250000>, <1300000>,
+						      <1350000>, <1400000>;
 		};
 
-		hi_ldo4: ldo4@24 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO4";
+		ldo4: ldo@24 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO4";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x24>;
-			hi6421-vset-reg = <0x24>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x24 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x24 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo5: ldo5@25 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO5";
+		ldo5: ldo@25 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO5";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x25>;
-			hi6421-vset-reg = <0x25>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x25 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x25 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo6: ldo6@26 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO6";
+		ldo6: ldo@26 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO6";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x26>;
-			hi6421-vset-reg = <0x26>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x26 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x26 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo7: ldo7@27 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO7";
+		ldo7: ldo@27 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO7";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x27>;
-			hi6421-vset-reg = <0x27>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x27 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x27 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo8: ldo8@28 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO8";
+		ldo8: ldo@28 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO8";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3300000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x28>;
-			hi6421-vset-reg = <0x28>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2600000>,
-					    <2700000>, <2850000>,
-					    <3000000>, <3300000>;
+			hisilicon,hi6421-ctrl = <0x28 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x28 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2600000>,
+						      <2700000>, <2850000>,
+						      <3000000>, <3300000>;
 		};
 
-		hi_ldo9: ldo9@29 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO9";
+		ldo9: ldo@29 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO9";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x29>;
-			hi6421-vset-reg = <0x29>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x29 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x29 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo10: ldo10@2a {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO10";
+		ldo10: ldo@2a {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO10";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2a>;
-			hi6421-vset-reg = <0x2a>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2a 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2a 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo11: ldo11@2b {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO11";
+		ldo11: ldo@2b {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO11";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2b>;
-			hi6421-vset-reg = <0x2b>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2b 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2b 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo12: ldo12@2c {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO12";
+		ldo12: ldo@2c {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO12";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2c>;
-			hi6421-vset-reg = <0x2c>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2c 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2c 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo13: ldo13@2d {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO13";
+		ldo13: ldo@2d {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO13";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2d>;
-			hi6421-vset-reg = <0x2d>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2d 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2d 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo14: ldo14@2e {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO14";
+		ldo14: ldo@2e {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO14";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2e>;
-			hi6421-vset-reg = <0x2e>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2e 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2e 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo15: ldo15@2f {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO15";
+		ldo15: ldo@2f {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO15";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2f>;
-			hi6421-vset-reg = <0x2f>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2600000>,
-					    <2700000>, <2850000>,
-					    <3000000>, <3300000>;
+			hisilicon,hi6421-ctrl = <0x2f 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2f 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2600000>,
+						      <2700000>, <2850000>,
+						      <3000000>, <3300000>;
 		};
 
-		hi_ldo16: ldo16@30 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO16";
+		ldo16: ldo@30 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO16";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x30>;
-			hi6421-vset-reg = <0x30>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x30 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x30 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo17: ldo17@31 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO17";
+		ldo17: ldo@31 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO17";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x31>;
-			hi6421-vset-reg = <0x31>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x31 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x31 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo18: ldo18@32 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO18";
+		ldo18: ldo@32 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO18";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x32>;
-			hi6421-vset-reg = <0x32>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x32 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x32 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo19: ldo19@33 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO19";
+		ldo19: ldo@33 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO19";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x2a>;
-			hi6421-vset-reg = <0x2a>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x2a 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x2a 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldo20: ldo20@34 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDO20";
+		ldo20: ldo@34 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDO20";
 			regulator-min-microvolt = <1500000>;
 			regulatro-max-microvolt = <3000000>;
-			hi6421-ctrl-reg = <0x34>;
-			hi6421-vset-reg = <0x34>;
-			hi6421-vset-table = <1500000>, <1800000>,
-					    <2400000>, <2500000>,
-					    <2600000>, <2700000>,
-					    <2850000>, <3000000>;
+			hisilicon,hi6421-ctrl = <0x34 0x10 0x20>;
+			hisilicon,hi6421-vset = <0x34 0x07>;
+			hisilicon,hi6421-vset-table = <1500000>, <1800000>,
+						      <2400000>, <2500000>,
+						      <2600000>, <2700000>,
+						      <2850000>, <3000000>;
 		};
 
-		hi_ldoaudio: ldoaudio@36 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_LDOAUDIO";
+		ldoaudio: ldo@36 {
+			compatible = "hisilicon,hi6421-ldo";
+			regulator-name = "LDOAUDIO";
 			regulator-min-microvolt = <2800000>;
 			regulatro-max-microvolt = <3300000>;
-			hi6421-ctrl-reg = <0x36>;
-			hi6421-vset-reg = <0x36>;
-			hi6421-vset-table = <2800000>, <2850000>,
-					    <2900000>, <2950000>,
-					    <3000000>, <3100000>,
-					    <3200000>, <3300000>;
+			hisilicon,hi6421-ctrl = <0x36 0x01 0x02>;
+			hisilicon,hi6421-vset = <0x36 0x70>;
+			hisilicon,hi6421-vset-table = <2800000>, <2850000>,
+						      <2900000>, <2950000>,
+						      <3000000>, <3100000>,
+						      <3200000>, <3300000>;
 		};
 
-		hi_buck0: buck0@0c {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK0";
+		buck0: buck@0c {
+			compatible = "hisilicon,hi6421-buck012";
+			regulator-name = "BUCK0";
 			regulator-min-microvolt = <700000>;
 			regulatro-max-microvolt = <1600000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x0c>;
-			hi6421-vset-reg = <0x0d>;
-			hi6421-vset-stage = <128>;
+			regulator-always-on;
+			hisilicon,hi6421-ctrl = <0x0c 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x0d 0x7f>;
+			hisilicon,hi6421-vset-stage = <128>;
 		};
 
-		hi_buck1: buck1@0e {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK1";
+		buck1: buck@0e {
+			compatible = "hisilicon,hi6421-buck012";
+			regulator-name = "BUCK1";
 			regulator-min-microvolt = <700000>;
 			regulatro-max-microvolt = <1600000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x0e>;
-			hi6421-vset-reg = <0x0f>;
-			hi6421-vset-stage = <128>;
+			regulator-always-on;
+			hisilicon,hi6421-ctrl = <0x0e 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x0f 0x7f>;
+			hisilicon,hi6421-vset-stage = <128>;
 		};
 
-		hi_buck2: buck1@10 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK2";
+		buck2: buck@10 {
+			compatible = "hisilicon,hi6421-buck012";
+			regulator-name = "BUCK2";
 			regulator-min-microvolt = <700000>;
 			regulatro-max-microvolt = <1600000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x10>;
-			hi6421-vset-reg = <0x11>;
-			hi6421-vset-stage = <128>;
+			hisilicon,hi6421-ctrl = <0x10 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x11 0x7f>;
+			hisilicon,hi6421-vset-stage = <128>;
 		};
 
-		hi_buck3: buck3@12 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK3";
+		buck3: buck@12 {
+			compatible = "hisilicon,hi6421-buck345";
+			regulator-name = "BUCK3";
 			regulator-min-microvolt = <950000>;
 			regulatro-max-microvolt = <1200000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x12>;
-			hi6421-vset-reg = <0x13>;
-			hi6421-vset-table = <950000>, <1050000>,
-					    <1100000>, <1170000>,
-					    <1134000>, <1150000>,
-					    <1167000>, <1200000>;
+			hisilicon,hi6421-ctrl = <0x12 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x13 0x07>;
+			hisilicon,hi6421-vset-table = <950000>, <1050000>,
+						      <1100000>, <1170000>,
+						      <1134000>, <1150000>,
+						      <1167000>, <1200000>;
 		};
 
-		hi_buck4: buck4@14 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK4";
+		buck4: buck@14 {
+			compatible = "hisilicon,hi6421-buck345";
+			regulator-name = "BUCK4";
 			regulator-min-microvolt = <1150000>;
 			regulatro-max-microvolt = <2000000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x14>;
-			hi6421-vset-reg = <0x15>;
-			hi6421-vset-table = <1150000>, <1200000>,
-					    <1250000>, <1350000>,
-					    <1700000>, <1800000>,
-					    <1900000>, <2000000>;
+			hisilicon,hi6421-ctrl = <0x14 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x15 0x07>;
+			hisilicon,hi6421-vset-table = <1150000>, <1200000>,
+						      <1250000>, <1350000>,
+						      <1700000>, <1800000>,
+						      <1900000>, <2000000>;
 		};
 
-		hi_buck5: buck5@16 {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_BUCK5";
+		buck5: buck@16 {
+			compatible = "hisilicon,hi6421-buck345";
+			regulator-name = "BUCK5";
 			regulator-min-microvolt = <1150000>;
 			regulatro-max-microvolt = <1900000>;
 			regulator-boot-on;
-			hi6421-ctrl-reg = <0x16>;
-			hi6421-vset-reg = <0x17>;
-			hi6421-vset-table = <1150000>, <1200000>,
-					    <1250000>, <1350000>,
-					    <1600000>, <1700000>,
-					    <1800000>, <1900000>;
-		};
-
-		hi_usb_chg_bump: usb_chg_bump@4e {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_USB_CHG_BUMP";
-			regulator-min-microvolt = <5000000>;
-			regulatro-max-microvolt = <5000000>;
-			hi6421-ctrl-reg = <0x4e>;
-		};
-
-		hi_hdmi_chg_bump: hdmi_chg_bump@4e {
-			compatible = "hisilicon,hi6421-regulator";
-			regulator-name = "HI6421_HDMI_CHG_BUMP";
-			regulator-min-microvolt = <5000000>;
-			regulatro-max-microvolt = <5000000>;
-			hi6421-ctrl-reg = <0x4e>;
+			hisilicon,hi6421-ctrl = <0x16 0x01 0x10>;
+			hisilicon,hi6421-vset = <0x17 0x07>;
+			hisilicon,hi6421-vset-table = <1150000>, <1200000>,
+						      <1250000>, <1350000>,
+						      <1600000>, <1700000>,
+						      <1800000>, <1900000>;
 		};
 	}; /* end of regulators */
 };
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index b80891b43816..8109565ee8b3 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -383,7 +383,7 @@ static int of_platform_bus_create(struct device_node *bus,
 		return 0;
 
 	for_each_child_of_node(bus, child) {
-		pr_debug("   create child: %s\n", child->full_name);
+		printk("   create child: %s\n", child->full_name);
 		rc = of_platform_bus_create(child, matches, lookup, &dev->dev, strict);
 		if (rc) {
 			of_node_put(child);