Skip to content

Commit 41ec98d

Browse files
committed
Merge tag 'sunxi-fixes-for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
A couple of fixes for GPIO polarity and regulators on the A64 olinuxino. * tag 'sunxi-fixes-for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: sun8i: a83t: Correct USB3503 GPIOs polarity arm64: dts: allwinner: a64: olinuxino: Fix SDIO supply regulator arm64: dts: allwinner: a64: olinuxino: Fix eMMC supply regulator Link: https://lore.kernel.org/r/582f4fda-38af-43e8-af58-957aee5b9dd8.lettre@localhost Signed-off-by: Olof Johansson <[email protected]>
2 parents 3f2b594 + 1c22601 commit 41ec98d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
initial-mode = <1>; /* initialize in HUB mode */
102102
disabled-ports = <1>;
103103
intn-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
104-
reset-gpios = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */
104+
reset-gpios = <&pio 4 16 GPIO_ACTIVE_LOW>; /* PE16 */
105105
connect-gpios = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */
106106
refclk-frequency = <19200000>;
107107
};

arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
pinctrl-names = "default";
1616
pinctrl-0 = <&mmc2_pins>;
1717
vmmc-supply = <&reg_dcdc1>;
18-
vqmmc-supply = <&reg_dcdc1>;
18+
vqmmc-supply = <&reg_eldo1>;
1919
bus-width = <8>;
2020
non-removable;
2121
cap-mmc-hw-reset;

arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
&mmc1 {
141141
pinctrl-names = "default";
142142
pinctrl-0 = <&mmc1_pins>;
143-
vmmc-supply = <&reg_aldo2>;
143+
vmmc-supply = <&reg_dcdc1>;
144144
vqmmc-supply = <&reg_dldo4>;
145145
mmc-pwrseq = <&wifi_pwrseq>;
146146
bus-width = <4>;

0 commit comments

Comments
 (0)