Commit 8fbf1bb7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 3264c72d 9fbbbb7b

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

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ 
		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

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ 
		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

+1 −2
Original line number Diff line number Diff line
@@ -109,8 +109,7 @@ 
		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

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
		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

+1 −2
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ 
		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>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE