Unverified Commit 1f8bed29 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun6i: Provide default muxing for relevant controllers 



The I2C and MMC controllers have only one muxing option in the SoC. In such a
case, we can just move the muxing into the DTSI, and remove it from
the DTS.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 403fa08b

arch/arm/boot/dts/sun6i-a31-colombus.dts

+0 −8
Original line number Diff line number Diff line
@@ -88,20 +88,14 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "fail";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";



	mma8452: mma8452@1d {
@@ -113,8 +107,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <4>;

	cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+0 −10
Original line number Diff line number Diff line
@@ -184,21 +184,15 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	/* pull-ups and devices require AXP221 DLDO3 */

	status = "failed";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";



	pcf8563: rtc@51 {
@@ -214,8 +208,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -223,8 +215,6 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_aldo1>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

arch/arm/boot/dts/sun6i-a31-i7.dts

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



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */

arch/arm/boot/dts/sun6i-a31-m9.dts

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



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */

arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts

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



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE