Merge tag 'sunxi-h3-h5-for-5.3-201906210812' of...

Merge tag 'sunxi-h3-h5-for-5.3-201906210812' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

This time we only have a single patch for our command branch between
arm and arm64, a fix for the array syntax raised by our DT schemas.

* tag 'sunxi-h3-h5-for-5.3-201906210812' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sunxi: h3/h5: Fix GPIO regulator state array
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts

@@ -59,8 +59,7 @@ reg_vdd_cpux: vdd-cpux-regulator {
 		gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */
 		enable-active-high;
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 
 	wifi_pwrseq: wifi_pwrseq {

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

@@ -102,8 +102,7 @@ reg_vdd_cpux: vdd-cpux-regulator {
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
 		enable-active-high;
 		gpios-states = <1>;
-		states = <1100000 0
-			  1300000 1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 
 	wifi_pwrseq: wifi_pwrseq {

arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

@@ -109,8 +109,7 @@ reg_vdd_cpux: vdd-cpux-regulator {
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
 		enable-active-high;
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 };
 

arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi

@@ -21,8 +21,7 @@ reg_vdd_cpux: vdd-cpux {
 		regulator-ramp-delay = <50>; /* 4ms */
 		gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 };
 

arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts

@@ -55,8 +55,7 @@ vdd_cpux: gpio-regulator {
 		regulator-ramp-delay = <50>; /* 4ms */
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 };
 

arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts

@@ -104,8 +104,7 @@ vdd_cpux: gpio-regulator {
 		regulator-ramp-delay = <50>; /* 4ms */
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 
 	wifi_pwrseq: wifi_pwrseq {