Commit ec16a8e7 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers

The I2C's and MMC0 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 fbb1f83c
...@@ -169,6 +169,8 @@ mmc0: mmc@1c0f000 { ...@@ -169,6 +169,8 @@ mmc0: mmc@1c0f000 {
resets = <&ccu RST_BUS_MMC0>; resets = <&ccu RST_BUS_MMC0>;
reset-names = "ahb"; reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 60 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>;
...@@ -499,6 +501,8 @@ i2c0: i2c@1c2ac00 { ...@@ -499,6 +501,8 @@ i2c0: i2c@1c2ac00 {
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C0>; clocks = <&ccu CLK_BUS_I2C0>;
resets = <&ccu RST_BUS_I2C0>; resets = <&ccu RST_BUS_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -510,6 +514,8 @@ i2c1: i2c@1c2b000 { ...@@ -510,6 +514,8 @@ i2c1: i2c@1c2b000 {
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C1>; clocks = <&ccu CLK_BUS_I2C1>;
resets = <&ccu RST_BUS_I2C1>; resets = <&ccu RST_BUS_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -521,6 +527,8 @@ i2c2: i2c@1c2b400 { ...@@ -521,6 +527,8 @@ i2c2: i2c@1c2b400 {
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C2>; clocks = <&ccu CLK_BUS_I2C2>;
resets = <&ccu RST_BUS_I2C2>; resets = <&ccu RST_BUS_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -65,14 +65,10 @@ chosen { ...@@ -65,14 +65,10 @@ chosen {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
...@@ -103,8 +99,6 @@ button-600 { ...@@ -103,8 +99,6 @@ button-600 {
}; };
&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 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
......
...@@ -82,8 +82,6 @@ &ehci0 { ...@@ -82,8 +82,6 @@ &ehci0 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
......
...@@ -140,8 +140,6 @@ button-600 { ...@@ -140,8 +140,6 @@ button-600 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
......
...@@ -126,28 +126,20 @@ &ehci0 { ...@@ -126,28 +126,20 @@ &ehci0 {
/* This is the i2c bus exposed on the DSI connector for the touch panel */ /* This is the i2c bus exposed on the DSI connector for the touch panel */
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled"; status = "disabled";
}; };
/* This is the i2c bus exposed on the GPIO header */ /* This is the i2c bus exposed on the GPIO header */
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled"; status = "disabled";
}; };
/* This is the i2c bus exposed on the CSI connector to control the sensor */ /* This is the i2c bus exposed on the CSI connector to control the sensor */
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled"; status = "disabled";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
......
...@@ -95,8 +95,6 @@ &ehci0 { ...@@ -95,8 +95,6 @@ &ehci0 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
/* /*
...@@ -126,8 +124,6 @@ button-390 { ...@@ -126,8 +124,6 @@ button-390 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>; bus-width = <4>;
......
...@@ -80,8 +80,6 @@ touchscreen: touchscreen@40 { ...@@ -80,8 +80,6 @@ touchscreen: touchscreen@40 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
......
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