openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2017-10-05 10:43:28 +02:00
parent e53bd7618d
commit bca0d7d9ff
21 changed files with 12 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/sun4i-a10-a1000.dts
View File

@ -125,8 +125,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -136,8 +134,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -166,8 +162,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

6
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
View File

@ -68,8 +68,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -79,8 +77,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -108,8 +104,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

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

@ -65,8 +65,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -80,14 +78,10 @@ axp209: pmic@34 {
};
&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 @@ button-1200 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

8
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
View File

@ -99,8 +99,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -110,8 +108,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -121,8 +117,6 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
@ -141,8 +135,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

8
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
View File

@ -99,8 +99,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -112,15 +110,11 @@ axp209: pmic@34 {
#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 @@ button-800 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

6
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
View File

@ -89,8 +89,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -102,8 +100,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
@ -143,8 +139,6 @@ button-1142 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */

4
arch/arm/boot/dts/sun4i-a10-hackberry.dts
View File

@ -80,8 +80,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy0>;
status = "okay";
};
@ -106,8 +104,6 @@ phy0: ethernet-phy@0 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

4
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
View File

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

8
arch/arm/boot/dts/sun4i-a10-inet1.dts
View File

@ -86,8 +86,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -99,8 +97,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
@ -113,8 +109,6 @@ bma250@18 {
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5x: touchscreen@38 {
@ -156,8 +150,6 @@ button-1200 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

8
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
View File

@ -72,8 +72,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -85,14 +83,10 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5406ee8: touchscreen@38 {
@ -146,8 +140,6 @@ button-1200 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

8
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
View File

@ -222,8 +222,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -235,8 +233,6 @@ axp209: pmic@34 {
#include "axp209.dtsi"
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
@ -249,8 +245,6 @@ bma250@18 {
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5406ee8: touchscreen@38 {
@ -304,8 +298,6 @@ button-1200 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

6
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
View File

@ -94,8 +94,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -105,8 +103,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -135,8 +131,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

10
arch/arm/boot/dts/sun4i-a10-marsboard.dts
View File

@ -105,27 +105,19 @@ &emac_sram {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
&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";
};
@ -138,8 +130,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

4
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
View File

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

2
arch/arm/boot/dts/sun4i-a10-mk802.dts
View File

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

4
arch/arm/boot/dts/sun4i-a10-mk802ii.dts
View File

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

8
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
View File

@ -98,8 +98,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -109,8 +107,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -124,8 +120,6 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom@50 {
@ -144,8 +138,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

6
arch/arm/boot/dts/sun4i-a10-pcduino.dts
View File

@ -112,8 +112,6 @@ &ehci1 {
};
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@ -123,8 +121,6 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -142,8 +138,6 @@ phy1: ethernet-phy@1 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

8
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
View File

@ -83,8 +83,6 @@ &ehci0 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@ -96,15 +94,11 @@ axp209: pmic@34 {
#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";
pixcir_ts@5c {
@ -142,8 +136,6 @@ button-800 {
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

12
arch/arm/boot/dts/sun4i-a10.dtsi
View File

@ -266,6 +266,8 @@ spi1: spi@1c06000 {
dmas = <&dma SUN4I_DMA_DEDICATED 9>,
<&dma SUN4I_DMA_DEDICATED 8>;
dma-names = "rx", "tx";
pinctrl-names = "default";
pinctrl-0 = <&spi1_pins>, <&spi1_cs0_pin>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@ -277,6 +279,8 @@ emac: ethernet@1c0b000 {
interrupts = <55>;
clocks = <&ccu CLK_AHB_EMAC>;
allwinner,sram = <&emac_sram 1>;
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
status = "disabled";
};
@ -294,6 +298,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>;
@ -812,6 +818,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>;
@ -822,6 +830,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>;
@ -832,6 +842,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>;

4
arch/arm/boot/dts/sunxi-itead-core-common.dtsi
View File

@ -65,8 +65,6 @@ &ehci1 {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay";
axp209: pmic@34 {
@ -75,8 +73,6 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay";
};