Commit 41ec98de authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-5.5' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 3f2b5941 1c226017

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
		initial-mode = <1>; /* initialize in HUB mode */

		disabled-ports = <1>;

		intn-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

		reset-gpios = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */

		reset-gpios = <&pio 4 16 GPIO_ACTIVE_LOW>; /* PE16 */

		connect-gpios = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */

		refclk-frequency = <19200000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_eldo1>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

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

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ 
&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_aldo2>;

	vmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_dldo4>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE