Unverified Commit 6ba2e45d authored by Clément Péron's avatar Clément Péron Committed by Maxime Ripard
Browse files

arm64: dts: allwinner: h6: move MMC pinctrl to dtsi 



There is only one pinmuxing available for each MMC controller.

Move the pinctrl to the SOC

Signed-off-by: default avatarClément Péron <peron.clem@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent fcf041fb

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_cldo1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts

+0 −4
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_cldo1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	bus-width = <4>;
@@ -113,8 +111,6 @@ 
};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&reg_cldo1>;

	vqmmc-supply = <&reg_bldo2>;

	non-removable;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ 
			resets = <&ccu RST_BUS_MMC0>;

			reset-names = "ahb";

			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&mmc0_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -306,6 +308,8 @@ 
			resets = <&ccu RST_BUS_MMC2>;

			reset-names = "ahb";

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&mmc2_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE