Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7dab9adb authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun7i: 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 4d9a0697

arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -174,8 +172,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -185,8 +181,6 @@ 
&mmc3 {

	#address-cells = <1>;

	#size-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&mmc3_pwrseq>;

	bus-width = <4>;

arch/arm/boot/dts/sun7i-a20-bananapi.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -164,8 +162,6 @@ 
};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";

};
@@ -176,8 +172,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */

arch/arm/boot/dts/sun7i-a20-bananapro.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -136,8 +134,6 @@ 
};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";

};
@@ -148,8 +144,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -157,8 +151,6 @@ 
};



&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

arch/arm/boot/dts/sun7i-a20-cubieboard2.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -147,8 +145,6 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};
@@ -159,8 +155,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

arch/arm/boot/dts/sun7i-a20-cubietruck.dts

+0 −9
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -181,13 +179,10 @@ 


&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";

};
@@ -198,8 +193,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -207,8 +200,6 @@ 
};



&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&mmc3_pwrseq>;

	bus-width = <4>;