xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
Maxime Ripard
2018-11-20 22:03:28 +01:00
parent 4d9a06979b
commit 7dab9adb7d
28 changed files with 14 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,8 +150,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -174,8 +172,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -185,8 +181,6 @@
&mmc3 { &mmc3 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;

6
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View File

@@ -152,8 +152,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -164,8 +162,6 @@
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -176,8 +172,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */

8
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View File

@@ -120,8 +120,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -136,8 +134,6 @@
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -148,8 +144,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -157,8 +151,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;

6
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View File

@@ -135,8 +135,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -147,8 +145,6 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
@@ -159,8 +155,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

9
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View File

@@ -168,8 +168,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -181,13 +179,10 @@
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -198,8 +193,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -207,8 +200,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;

12
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View File

@@ -116,8 +116,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -131,20 +129,14 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&i2c3 { &i2c3 {
pinctrl-names = "default";
pinctrl-0 = <&i2c3_pins>;
status = "okay"; status = "okay";
}; };
@@ -155,8 +147,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -164,8 +154,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_mmc3_vdd>; vmmc-supply = <&reg_mmc3_vdd>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;

6
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View File

@@ -126,8 +126,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -148,8 +146,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -157,8 +153,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vmmc3>; vmmc-supply = <&reg_vmmc3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;

6
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View File

@@ -85,8 +85,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -97,14 +95,10 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */ cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */

2
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
View File

@@ -120,8 +120,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

6
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View File

@@ -195,8 +195,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -207,8 +205,6 @@
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -219,8 +215,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */

6
arch/arm/boot/dts/sun7i-a20-m3.dts
View File

@@ -92,8 +92,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -114,8 +112,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -123,8 +119,6 @@
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;

8
arch/arm/boot/dts/sun7i-a20-mk808c.dts
View File

@@ -106,8 +106,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -121,20 +119,14 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

2
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
View File

@@ -21,8 +21,6 @@
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View File

@@ -131,8 +131,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -143,14 +141,10 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -209,8 +203,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -218,8 +210,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */ cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */

2
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
View File

@@ -20,8 +20,6 @@
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
View File

@@ -130,8 +130,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -143,8 +141,6 @@
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
@@ -156,8 +152,6 @@
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -168,8 +162,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
@@ -177,8 +169,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&rtl_pwrseq>; mmc-pwrseq = <&rtl_pwrseq>;
bus-width = <4>; bus-width = <4>;

6
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View File

@@ -126,8 +126,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -142,8 +140,6 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
@@ -154,8 +150,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
View File

@@ -54,8 +54,6 @@
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
vqmmc-supply = <&reg_vcc3v3>; vqmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;

6
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View File

@@ -131,8 +131,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -143,8 +141,6 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
@@ -159,8 +155,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

2
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
View File

@@ -54,8 +54,6 @@
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;

10
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View File

@@ -138,8 +138,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -150,8 +148,6 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
@@ -162,8 +158,6 @@
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
@@ -222,8 +216,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -231,8 +223,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */

6
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View File

@@ -141,8 +141,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -161,8 +159,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -170,8 +166,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */

4
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View File

@@ -107,8 +107,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -127,8 +125,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */

4
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View File

@@ -134,8 +134,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -152,8 +150,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

4
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View File

@@ -132,8 +132,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -152,8 +150,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

8
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
View File

@@ -89,8 +89,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -103,14 +101,10 @@
#include "axp209.dtsi" #include "axp209.dtsi"
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
gt911: touchscreen@5d { gt911: touchscreen@5d {
@@ -144,8 +138,6 @@
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */

10
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
View File

@@ -91,8 +91,6 @@
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
@@ -103,22 +101,16 @@
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -126,8 +118,6 @@
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;

14
arch/arm/boot/dts/sun7i-a20.dtsi
View File

@@ -514,6 +514,8 @@
"output", "output",
"sample"; "sample";
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -548,6 +550,8 @@
"output", "output",
"sample"; "sample";
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -565,6 +569,8 @@
"output", "output",
"sample"; "sample";
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -1218,6 +1224,8 @@
reg = <0x01c2ac00 0x400>; reg = <0x01c2ac00 0x400>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C0>; clocks = <&ccu CLK_APB1_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -1229,6 +1237,8 @@
reg = <0x01c2b000 0x400>; reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C1>; clocks = <&ccu CLK_APB1_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -1240,6 +1250,8 @@
reg = <0x01c2b400 0x400>; reg = <0x01c2b400 0x400>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C2>; clocks = <&ccu CLK_APB1_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -1251,6 +1263,8 @@
reg = <0x01c2b800 0x400>; reg = <0x01c2b800 0x400>;
interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C3>; clocks = <&ccu CLK_APB1_I2C3>;
pinctrl-names = "default";
pinctrl-0 = <&i2c3_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;