Skip to content

L
linux
Commit 1eb3927c authored by Maxime Ripard's avatar Maxime Ripard
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 94 deletions
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View file @ 1eb3927c
......@@ -75,8 +75,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -89,8 +87,6 @@ axp152: pmic@30 {
};
&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
View file @ 1eb3927c
......@@ -84,8 +84,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -98,8 +96,6 @@ axp152: pmic@30 {
};
&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 @@ &mmc0 {
};
&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
View file @ 1eb3927c
......@@ -72,8 +72,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -86,8 +84,6 @@ axp152: pmic@30 {
};
&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 @@ &mmc0 {
};
&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
View file @ 1eb3927c
......@@ -117,8 +117,6 @@ hdmi_out_con: endpoint {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -130,8 +128,6 @@ axp152: pmic@30 {
#include "axp152.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
at24@50 {
......@@ -143,8 +139,6 @@ at24@50 {
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -197,8 +191,6 @@ phy1: ethernet-phy@1 {
};
&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 @@ &mmc0 {
};
&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
View file @ 1eb3927c
......@@ -76,8 +76,6 @@ &ehci0 {
};
&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 @@ &mmc0 {
};
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
non-removable;
......
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View file @ 1eb3927c
......@@ -100,8 +100,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -122,8 +120,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
......
arch/arm/boot/dts/sun5i-a10s.dtsi
View file @ 1eb3927c
......@@ -119,6 +119,11 @@ &ccu {
compatible = "allwinner,sun5i-a10s-ccu";
};
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
};
&pio {
compatible = "allwinner,sun5i-a10s-pinctrl";
......
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ 1eb3927c
......@@ -78,8 +78,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -91,8 +89,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc@51 {
......@@ -121,8 +117,6 @@ button-400 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ 1eb3927c
......@@ -69,8 +69,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -80,8 +78,6 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc@51 {
......@@ -91,8 +87,6 @@ pcf8563: rtc@51 {
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -116,8 +110,6 @@ button-400 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
View file @ 1eb3927c
......@@ -94,8 +94,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -109,14 +107,10 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
......@@ -133,8 +127,6 @@ button-984 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
broken-cd;
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ 1eb3927c
......@@ -77,26 +77,18 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ 1eb3927c
......@@ -123,8 +123,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -138,14 +136,10 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -190,8 +184,6 @@ button-987 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
View file @ 1eb3927c
......@@ -92,8 +92,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -112,8 +110,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
......@@ -124,8 +120,6 @@ &i2s0 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
......
arch/arm/boot/dts/sun5i-gr8-evb.dts
View file @ 1eb3927c
......@@ -123,8 +123,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -143,8 +141,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
wm8978: codec@1a {
......@@ -160,8 +156,6 @@ pcf8563: rtc@51 {
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -232,8 +226,6 @@ button-1400 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......
arch/arm/boot/dts/sun5i-r8-chip.dts
View file @ 1eb3927c
......@@ -107,8 +107,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -135,14 +133,10 @@ &battery_power_supply {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
xio: gpio@38 {
......@@ -164,8 +158,6 @@ &mmc0_pins {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
......
arch/arm/boot/dts/sun5i.dtsi
View file @ 1eb3927c
......@@ -326,6 +326,8 @@ mmc0: mmc@1c0f000 {
clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>;
clock-names = "ahb", "mmc";
interrupts = <32>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
......@@ -678,6 +680,8 @@ i2c0: i2c@1c2ac00 {
reg = <0x01c2ac00 0x400>;
interrupts = <7>;
clocks = <&ccu CLK_APB1_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
......@@ -688,6 +692,8 @@ i2c1: i2c@1c2b000 {
reg = <0x01c2b000 0x400>;
interrupts = <8>;
clocks = <&ccu CLK_APB1_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
......@@ -698,6 +704,8 @@ i2c2: i2c@1c2b400 {
reg = <0x01c2b400 0x400>;
interrupts = <9>;
clocks = <&ccu CLK_APB1_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#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