mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 09:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Olof Johansson
2019-06-25 04:42:05 -07:00
parent 3264c72dcc 9fbbbb7b8d
commit 8fbf1bb715
6 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

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

@@ -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 {

3
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
View File

@@ -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>;
};
};

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

@@ -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>;
};
};

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

@@ -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>;
};
};

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

@@ -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 {