tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: sun6i: 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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

Maxime Ripard 1f8bed29 403fa08b

+10 -44
-8
arch/arm/boot/dts/sun6i-a31-colombus.dts
··· 88 88 }; 89 89 90 90 &i2c0 { 91 - pinctrl-names = "default"; 92 - pinctrl-0 = <&i2c0_pins>; 93 91 status = "fail"; 94 92 }; 95 93 96 94 &i2c1 { 97 - pinctrl-names = "default"; 98 - pinctrl-0 = <&i2c1_pins>; 99 95 status = "okay"; 100 96 }; 101 97 102 98 &i2c2 { 103 - pinctrl-names = "default"; 104 - pinctrl-0 = <&i2c2_pins>; 105 99 status = "okay"; 106 100 107 101 mma8452: mma8452@1d { ··· 107 113 }; 108 114 109 115 &mmc0 { 110 - pinctrl-names = "default"; 111 - pinctrl-0 = <&mmc0_pins>; 112 116 vmmc-supply = <&reg_vcc3v0>; 113 117 bus-width = <4>; 114 118 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
-10
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
··· 184 184 }; 185 185 186 186 &i2c0 { 187 - pinctrl-names = "default"; 188 - pinctrl-0 = <&i2c0_pins>; 189 187 /* pull-ups and devices require AXP221 DLDO3 */ 190 188 status = "failed"; 191 189 }; 192 190 193 191 &i2c1 { 194 - pinctrl-names = "default"; 195 - pinctrl-0 = <&i2c1_pins>; 196 192 status = "okay"; 197 193 }; 198 194 199 195 &i2c2 { 200 - pinctrl-names = "default"; 201 - pinctrl-0 = <&i2c2_pins>; 202 196 status = "okay"; 203 197 204 198 pcf8563: rtc@51 { ··· 208 214 }; 209 215 210 216 &mmc0 { 211 - pinctrl-names = "default"; 212 - pinctrl-0 = <&mmc0_pins>; 213 217 vmmc-supply = <&reg_dcdc1>; 214 218 bus-width = <4>; 215 219 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ ··· 215 223 }; 216 224 217 225 &mmc1 { 218 - pinctrl-names = "default"; 219 - pinctrl-0 = <&mmc1_pins>; 220 226 vmmc-supply = <&reg_aldo1>; 221 227 mmc-pwrseq = <&wifi_pwrseq>; 222 228 bus-width = <4>;
-2
arch/arm/boot/dts/sun6i-a31-i7.dts
··· 143 143 }; 144 144 145 145 &mmc0 { 146 - pinctrl-names = "default"; 147 - pinctrl-0 = <&mmc0_pins>; 148 146 vmmc-supply = <&reg_vcc3v3>; 149 147 bus-width = <4>; 150 148 cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
-2
arch/arm/boot/dts/sun6i-a31-m9.dts
··· 101 101 }; 102 102 103 103 &mmc0 { 104 - pinctrl-names = "default"; 105 - pinctrl-0 = <&mmc0_pins>; 106 104 vmmc-supply = <&reg_dcdc1>; 107 105 bus-width = <4>; 108 106 cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
-2
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
··· 101 101 }; 102 102 103 103 &mmc0 { 104 - pinctrl-names = "default"; 105 - pinctrl-0 = <&mmc0_pins>; 106 104 vmmc-supply = <&reg_dcdc1>; 107 105 bus-width = <4>; 108 106 cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
+10
arch/arm/boot/dts/sun6i-a31.dtsi
··· 388 388 resets = <&ccu RST_AHB1_MMC0>; 389 389 reset-names = "ahb"; 390 390 interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; 391 + pinctrl-names = "default"; 392 + pinctrl-0 = <&mmc0_pins>; 391 393 status = "disabled"; 392 394 #address-cells = <1>; 393 395 #size-cells = <0>; ··· 409 407 resets = <&ccu RST_AHB1_MMC1>; 410 408 reset-names = "ahb"; 411 409 interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; 410 + pinctrl-names = "default"; 411 + pinctrl-0 = <&mmc1_pins>; 412 412 status = "disabled"; 413 413 #address-cells = <1>; 414 414 #size-cells = <0>; ··· 882 878 interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; 883 879 clocks = <&ccu CLK_APB2_I2C0>; 884 880 resets = <&ccu RST_APB2_I2C0>; 881 + pinctrl-names = "default"; 882 + pinctrl-0 = <&i2c0_pins>; 885 883 status = "disabled"; 886 884 #address-cells = <1>; 887 885 #size-cells = <0>; ··· 895 889 interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; 896 890 clocks = <&ccu CLK_APB2_I2C1>; 897 891 resets = <&ccu RST_APB2_I2C1>; 892 + pinctrl-names = "default"; 893 + pinctrl-0 = <&i2c1_pins>; 898 894 status = "disabled"; 899 895 #address-cells = <1>; 900 896 #size-cells = <0>; ··· 908 900 interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; 909 901 clocks = <&ccu CLK_APB2_I2C2>; 910 902 resets = <&ccu RST_APB2_I2C2>; 903 + pinctrl-names = "default"; 904 + pinctrl-0 = <&i2c2_pins>; 911 905 status = "disabled"; 912 906 #address-cells = <1>; 913 907 #size-cells = <0>;
-2
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
··· 54 54 }; 55 55 56 56 &i2c1 { 57 - pinctrl-names = "default"; 58 - pinctrl-0 = <&i2c1_pins>; 59 57 status = "okay"; 60 58 61 59 ft5406ee8: touchscreen@38 {
-8
arch/arm/boot/dts/sun6i-a31s-primo81.dts
··· 90 90 91 91 &i2c0 { 92 92 /* pull-ups and device VDDIO use AXP221 DLDO3 */ 93 - pinctrl-names = "default"; 94 - pinctrl-0 = <&i2c0_pins>; 95 93 status = "failed"; 96 94 }; 97 95 98 96 &i2c1 { 99 - pinctrl-names = "default"; 100 - pinctrl-0 = <&i2c1_pins>; 101 97 status = "okay"; 102 98 103 99 ctp@5d { ··· 106 110 }; 107 111 108 112 &i2c2 { 109 - pinctrl-names = "default"; 110 - pinctrl-0 = <&i2c2_pins>; 111 113 status = "okay"; 112 114 113 115 accelerometer@1c { ··· 139 145 }; 140 146 141 147 &mmc0 { 142 - pinctrl-names = "default"; 143 - pinctrl-0 = <&mmc0_pins>; 144 148 vmmc-supply = <&reg_dcdc1>; 145 149 bus-width = <4>; 146 150 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
-2
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
··· 161 161 }; 162 162 163 163 &mmc0 { 164 - pinctrl-names = "default"; 165 - pinctrl-0 = <&mmc0_pins>; 166 164 vmmc-supply = <&reg_dcdc1>; 167 165 bus-width = <4>; 168 166 cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
-2
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
··· 112 112 }; 113 113 114 114 &mmc0 { 115 - pinctrl-names = "default"; 116 - pinctrl-0 = <&mmc0_pins>; 117 115 vmmc-supply = <&reg_dcdc1>; 118 116 bus-width = <4>; 119 117 cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
-6
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
··· 62 62 }; 63 63 64 64 &i2c1 { 65 - pinctrl-names = "default"; 66 - pinctrl-0 = <&i2c1_pins>; 67 65 status = "okay"; 68 66 }; 69 67 70 68 &i2c2 { 71 - pinctrl-names = "default"; 72 - pinctrl-0 = <&i2c2_pins>; 73 69 status = "okay"; 74 70 }; 75 71 ··· 86 90 }; 87 91 88 92 &mmc0 { 89 - pinctrl-names = "default"; 90 - pinctrl-0 = <&mmc0_pins>; 91 93 vmmc-supply = <&reg_vcc3v0>; 92 94 bus-width = <4>; 93 95 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */