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

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



The I2C's, MMC0 and MMC1 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 a45207ce

arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp152: pmic@30 {
@@ -89,8 +87,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */

arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp152: pmic@30 {
@@ -98,8 +96,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -107,8 +103,6 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_vmmc1>;

	bus-width = <4>;

	non-removable;

arch/arm/boot/dts/sun5i-a10s-mk802.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp152: pmic@30 {
@@ -86,8 +84,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -95,8 +91,6 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	non-removable;

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

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



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	axp152: pmic@30 {
@@ -130,8 +128,6 @@ 
#include "axp152.dtsi"



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";



	at24@50 {
@@ -143,8 +139,6 @@ 
};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "okay";

};
@@ -197,8 +191,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -206,8 +198,6 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */

arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts

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



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -85,8 +83,6 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	non-removable;

CRA Git | Maintained and supported by SUSTech CRA and CCSE