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

Commit bca0d7d9 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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



The I2C's, MMC0 and EMAC 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.

Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent e53bd761

arch/arm/boot/dts/sun4i-a10-a1000.dts

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



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins>;

	phy = <&phy1>;

	status = "okay";

};
@@ -136,8 +134,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



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



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

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



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins>;

	phy = <&phy1>;

	status = "okay";

};
@@ -79,8 +77,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -108,8 +104,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -80,14 +78,10 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";



	ft5306de4: touchscreen@38 {
@@ -127,8 +121,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

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



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins>;

	phy = <&phy1>;

	status = "okay";

};
@@ -110,8 +108,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -121,8 +117,6 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};
@@ -141,8 +135,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp209: pmic@34 {
@@ -112,15 +110,11 @@ 
#include "axp209.dtsi"



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	/* pull-ups and devices require AXP209 LDO3 */

	status = "failed";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";



	ft5406ee8: touchscreen@38 {
@@ -154,8 +148,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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