Skip to content

L
linux
Commit 7dab9adb authored by Maxime Ripard's avatar Maxime Ripard
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 167 deletions
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
View file @ 7dab9adb
...@@ -150,8 +150,6 @@ hdmi_out_con: endpoint { ...@@ -150,8 +150,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -174,8 +172,6 @@ &ir0 { ...@@ -174,8 +172,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -185,8 +181,6 @@ &mmc0 {
&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>;
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ 7dab9adb
...@@ -152,8 +152,6 @@ hdmi_out_con: endpoint { ...@@ -152,8 +152,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -164,8 +162,6 @@ axp209: pmic@34 { ...@@ -164,8 +162,6 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -176,8 +172,6 @@ &ir0 { ...@@ -176,8 +172,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View file @ 7dab9adb
...@@ -120,8 +120,6 @@ phy1: ethernet-phy@1 { ...@@ -120,8 +120,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -136,8 +134,6 @@ axp209: pmic@34 { ...@@ -136,8 +134,6 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -148,8 +144,6 @@ &ir0 { ...@@ -148,8 +144,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -157,8 +151,6 @@ &mmc0 {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ 7dab9adb
...@@ -135,8 +135,6 @@ hdmi_out_con: endpoint { ...@@ -135,8 +135,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -147,8 +145,6 @@ axp209: pmic@34 { ...@@ -147,8 +145,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
...@@ -159,8 +155,6 @@ &ir0 { ...@@ -159,8 +155,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file @ 7dab9adb
...@@ -168,8 +168,6 @@ hdmi_out_con: endpoint { ...@@ -168,8 +168,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -181,13 +179,10 @@ axp209: pmic@34 { ...@@ -181,13 +179,10 @@ axp209: pmic@34 {
&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 @@ &ir0 { ...@@ -198,8 +193,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -207,8 +200,6 @@ &mmc0 {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file @ 7dab9adb
...@@ -116,8 +116,6 @@ phy1: ethernet-phy@1 { ...@@ -116,8 +116,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -131,20 +129,14 @@ axp209: pmic@34 { ...@@ -131,20 +129,14 @@ axp209: pmic@34 {
}; };
&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 @@ &ir0 { ...@@ -155,8 +147,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -164,8 +154,6 @@ &mmc0 {
}; };
&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;
......
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file @ 7dab9adb
...@@ -126,8 +126,6 @@ phy1: ethernet-phy@1 { ...@@ -126,8 +126,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -148,8 +146,6 @@ &ir0 { ...@@ -148,8 +146,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -157,8 +153,6 @@ &mmc0 {
}; };
&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;
......
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View file @ 7dab9adb
...@@ -85,8 +85,6 @@ phy1: ethernet-phy@1 { ...@@ -85,8 +85,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -97,14 +95,10 @@ axp209: pmic@34 { ...@@ -97,14 +95,10 @@ axp209: pmic@34 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
View file @ 7dab9adb
...@@ -120,8 +120,6 @@ &ir0 { ...@@ -120,8 +120,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file @ 7dab9adb
...@@ -195,8 +195,6 @@ hdmi_out_con: endpoint { ...@@ -195,8 +195,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -207,8 +205,6 @@ axp209: pmic@34 { ...@@ -207,8 +205,6 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -219,8 +215,6 @@ &ir0 { ...@@ -219,8 +215,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-m3.dts
View file @ 7dab9adb
...@@ -92,8 +92,6 @@ phy1: ethernet-phy@1 { ...@@ -92,8 +92,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -114,8 +112,6 @@ &ir0 { ...@@ -114,8 +112,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -123,8 +119,6 @@ &mmc0 {
}; };
&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;
......
arch/arm/boot/dts/sun7i-a20-mk808c.dts
View file @ 7dab9adb
...@@ -106,8 +106,6 @@ hdmi_out_con: endpoint { ...@@ -106,8 +106,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -121,20 +119,14 @@ axp209: pmic@34 { ...@@ -121,20 +119,14 @@ axp209: pmic@34 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
View file @ 7dab9adb
...@@ -21,8 +21,6 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -21,8 +21,6 @@ mmc2_pwrseq: mmc2_pwrseq {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View file @ 7dab9adb
...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint { ...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,14 +141,10 @@ axp209: pmic@34 { ...@@ -143,14 +141,10 @@ axp209: pmic@34 {
}; };
&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 @@ button-1400 { ...@@ -209,8 +203,6 @@ button-1400 {
}; };
&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 @@ &mmc0 { ...@@ -218,8 +210,6 @@ &mmc0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
View file @ 7dab9adb
...@@ -20,8 +20,6 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -20,8 +20,6 @@ mmc2_pwrseq: mmc2_pwrseq {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
View file @ 7dab9adb
...@@ -130,8 +130,6 @@ hdmi_out_con: endpoint { ...@@ -130,8 +130,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,8 +141,6 @@ axp209: pmic@34 { ...@@ -143,8 +141,6 @@ axp209: pmic@34 {
/* 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 @@ eeprom: eeprom@50 { ...@@ -156,8 +152,6 @@ eeprom: eeprom@50 {
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -168,8 +162,6 @@ &ir0 { ...@@ -168,8 +162,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -177,8 +169,6 @@ &mmc0 {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file @ 7dab9adb
...@@ -126,8 +126,6 @@ hdmi_out_con: endpoint { ...@@ -126,8 +126,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -142,8 +140,6 @@ axp209: pmic@34 { ...@@ -142,8 +140,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -154,8 +150,6 @@ eeprom: eeprom@50 { ...@@ -154,8 +150,6 @@ eeprom: eeprom@50 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
View file @ 7dab9adb
...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq { ...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file @ 7dab9adb
...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint { ...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,8 +141,6 @@ axp209: pmic@34 { ...@@ -143,8 +141,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -159,8 +155,6 @@ &lradc { ...@@ -159,8 +155,6 @@ &lradc {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
View file @ 7dab9adb
...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq { ...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq {
}; };
&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;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file @ 7dab9adb
...@@ -138,8 +138,6 @@ hdmi_out_con: endpoint { ...@@ -138,8 +138,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -150,8 +148,6 @@ axp209: pmic@34 { ...@@ -150,8 +148,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -162,8 +158,6 @@ eeprom: eeprom@50 { ...@@ -162,8 +158,6 @@ eeprom: eeprom@50 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -222,8 +216,6 @@ button-1398 { ...@@ -222,8 +216,6 @@ button-1398 {
}; };
&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 @@ &mmc0 { ...@@ -231,8 +223,6 @@ &mmc0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ 7dab9adb
...@@ -141,8 +141,6 @@ hdmi_out_con: endpoint { ...@@ -141,8 +141,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -161,8 +159,6 @@ &ir0 { ...@@ -161,8 +159,6 @@ &ir0 {
}; };
&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 @@ &mmc0 { ...@@ -170,8 +166,6 @@ &mmc0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ 7dab9adb
...@@ -107,8 +107,6 @@ phy1: ethernet-phy@1 { ...@@ -107,8 +107,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -127,8 +125,6 @@ &ir0 { ...@@ -127,8 +125,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View file @ 7dab9adb
...@@ -134,8 +134,6 @@ hdmi_out_con: endpoint { ...@@ -134,8 +134,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -152,8 +150,6 @@ &ir0 { ...@@ -152,8 +150,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ 7dab9adb
...@@ -132,8 +132,6 @@ phy1: ethernet-phy@1 { ...@@ -132,8 +132,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -152,8 +150,6 @@ &ir0 { ...@@ -152,8 +150,6 @@ &ir0 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
View file @ 7dab9adb
...@@ -89,8 +89,6 @@ &ehci1 { ...@@ -89,8 +89,6 @@ &ehci1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -103,14 +101,10 @@ axp209: pmic@34 { ...@@ -103,14 +101,10 @@ axp209: pmic@34 {
#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 @@ button-761 { ...@@ -144,8 +138,6 @@ button-761 {
}; };
&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 */
......
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
View file @ 7dab9adb
...@@ -91,8 +91,6 @@ phy1: ethernet-phy@1 { ...@@ -91,8 +91,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -103,22 +101,16 @@ axp209: pmic@34 { ...@@ -103,22 +101,16 @@ axp209: pmic@34 {
}; };
&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 @@ &mmc0 { ...@@ -126,8 +118,6 @@ &mmc0 {
}; };
&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>;
......
arch/arm/boot/dts/sun7i-a20.dtsi
View file @ 7dab9adb
...@@ -514,6 +514,8 @@ mmc0: mmc@1c0f000 { ...@@ -514,6 +514,8 @@ mmc0: mmc@1c0f000 {
"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 @@ mmc2: mmc@1c11000 { ...@@ -548,6 +550,8 @@ mmc2: mmc@1c11000 {
"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 @@ mmc3: mmc@1c12000 { ...@@ -565,6 +569,8 @@ mmc3: mmc@1c12000 {
"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 @@ i2c0: i2c@1c2ac00 { ...@@ -1218,6 +1224,8 @@ i2c0: i2c@1c2ac00 {
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 @@ i2c1: i2c@1c2b000 { ...@@ -1229,6 +1237,8 @@ i2c1: i2c@1c2b000 {
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 @@ i2c2: i2c@1c2b400 { ...@@ -1240,6 +1250,8 @@ i2c2: i2c@1c2b400 {
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 @@ i2c3: i2c@1c2b800 { ...@@ -1251,6 +1263,8 @@ i2c3: i2c@1c2b800 {
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>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7