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: sun7i: Change pinctrl nodes to avoid warning

All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.

In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

Maxime Ripard 85a8c520 c8fd1584

+240 -240
+7 -7
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
··· 128 128 129 129 &gmac { 130 130 pinctrl-names = "default"; 131 - pinctrl-0 = <&gmac_pins_rgmii_a>; 131 + pinctrl-0 = <&gmac_rgmii_pins>; 132 132 phy = <&phy1>; 133 133 phy-mode = "rgmii"; 134 134 phy-supply = <&reg_gmac_3v3>; ··· 151 151 152 152 &i2c0 { 153 153 pinctrl-names = "default"; 154 - pinctrl-0 = <&i2c0_pins_a>; 154 + pinctrl-0 = <&i2c0_pins>; 155 155 status = "okay"; 156 156 157 157 axp209: pmic@34 { ··· 169 169 170 170 &ir0 { 171 171 pinctrl-names = "default"; 172 - pinctrl-0 = <&ir0_rx_pins_a>; 172 + pinctrl-0 = <&ir0_rx_pin>; 173 173 status = "okay"; 174 174 }; 175 175 176 176 &mmc0 { 177 177 pinctrl-names = "default"; 178 - pinctrl-0 = <&mmc0_pins_a>; 178 + pinctrl-0 = <&mmc0_pins>; 179 179 vmmc-supply = <&reg_vcc3v3>; 180 180 bus-width = <4>; 181 181 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 186 186 #address-cells = <1>; 187 187 #size-cells = <0>; 188 188 pinctrl-names = "default"; 189 - pinctrl-0 = <&mmc3_pins_a>; 189 + pinctrl-0 = <&mmc3_pins>; 190 190 vmmc-supply = <&reg_vcc3v3>; 191 191 mmc-pwrseq = <&mmc3_pwrseq>; 192 192 bus-width = <4>; ··· 203 203 }; 204 204 }; 205 205 206 - &mmc3_pins_a { 206 + &mmc3_pins { 207 207 /* AP6210 requires pull-up */ 208 208 bias-pull-up; 209 209 }; ··· 251 251 252 252 &uart0 { 253 253 pinctrl-names = "default"; 254 - pinctrl-0 = <&uart0_pins_a>; 254 + pinctrl-0 = <&uart0_pb_pins>; 255 255 status = "okay"; 256 256 }; 257 257
+11 -11
arch/arm/boot/dts/sun7i-a20-bananapi.dts
··· 130 130 131 131 &gmac { 132 132 pinctrl-names = "default"; 133 - pinctrl-0 = <&gmac_pins_rgmii_a>; 133 + pinctrl-0 = <&gmac_rgmii_pins>; 134 134 phy = <&phy1>; 135 135 phy-mode = "rgmii"; 136 136 phy-supply = <&reg_gmac_3v3>; ··· 153 153 154 154 &i2c0 { 155 155 pinctrl-names = "default"; 156 - pinctrl-0 = <&i2c0_pins_a>; 156 + pinctrl-0 = <&i2c0_pins>; 157 157 status = "okay"; 158 158 159 159 axp209: pmic@34 { ··· 165 165 166 166 &i2c2 { 167 167 pinctrl-names = "default"; 168 - pinctrl-0 = <&i2c2_pins_a>; 168 + pinctrl-0 = <&i2c2_pins>; 169 169 status = "okay"; 170 170 }; 171 171 172 172 &ir0 { 173 173 pinctrl-names = "default"; 174 - pinctrl-0 = <&ir0_rx_pins_a>; 174 + pinctrl-0 = <&ir0_rx_pin>; 175 175 status = "okay"; 176 176 }; 177 177 178 178 &mmc0 { 179 179 pinctrl-names = "default"; 180 - pinctrl-0 = <&mmc0_pins_a>; 180 + pinctrl-0 = <&mmc0_pins>; 181 181 vmmc-supply = <&reg_vcc3v3>; 182 182 bus-width = <4>; 183 183 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 296 296 297 297 &spi0 { 298 298 pinctrl-names = "default"; 299 - pinctrl-0 = <&spi0_pins_a>, 300 - <&spi0_cs0_pins_a>, 301 - <&spi0_cs1_pins_a>; 299 + pinctrl-0 = <&spi0_pi_pins>, 300 + <&spi0_cs0_pi_pin>, 301 + <&spi0_cs1_pi_pin>; 302 302 status = "okay"; 303 303 }; 304 304 305 305 &uart0 { 306 306 pinctrl-names = "default"; 307 - pinctrl-0 = <&uart0_pins_a>; 307 + pinctrl-0 = <&uart0_pb_pins>; 308 308 status = "okay"; 309 309 }; 310 310 311 311 &uart3 { 312 312 pinctrl-names = "default"; 313 - pinctrl-0 = <&uart3_pins_b>; 313 + pinctrl-0 = <&uart3_ph_pins>; 314 314 status = "okay"; 315 315 }; 316 316 317 317 &uart7 { 318 318 pinctrl-names = "default"; 319 - pinctrl-0 = <&uart7_pins_a>; 319 + pinctrl-0 = <&uart7_pi_pins>; 320 320 status = "okay"; 321 321 }; 322 322
+12 -12
arch/arm/boot/dts/sun7i-a20-bananapro.dts
··· 108 108 109 109 &gmac { 110 110 pinctrl-names = "default"; 111 - pinctrl-0 = <&gmac_pins_rgmii_a>; 111 + pinctrl-0 = <&gmac_rgmii_pins>; 112 112 phy = <&phy1>; 113 113 phy-mode = "rgmii"; 114 114 phy-supply = <&reg_gmac_3v3>; ··· 121 121 122 122 &i2c0 { 123 123 pinctrl-names = "default"; 124 - pinctrl-0 = <&i2c0_pins_a>; 124 + pinctrl-0 = <&i2c0_pins>; 125 125 status = "okay"; 126 126 127 127 axp209: pmic@34 { ··· 137 137 138 138 &i2c2 { 139 139 pinctrl-names = "default"; 140 - pinctrl-0 = <&i2c2_pins_a>; 140 + pinctrl-0 = <&i2c2_pins>; 141 141 status = "okay"; 142 142 }; 143 143 144 144 &ir0 { 145 145 pinctrl-names = "default"; 146 - pinctrl-0 = <&ir0_rx_pins_a>; 146 + pinctrl-0 = <&ir0_rx_pin>; 147 147 status = "okay"; 148 148 }; 149 149 150 150 &mmc0 { 151 151 pinctrl-names = "default"; 152 - pinctrl-0 = <&mmc0_pins_a>; 152 + pinctrl-0 = <&mmc0_pins>; 153 153 vmmc-supply = <&reg_vcc3v3>; 154 154 bus-width = <4>; 155 155 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 158 158 159 159 &mmc3 { 160 160 pinctrl-names = "default"; 161 - pinctrl-0 = <&mmc3_pins_a>; 161 + pinctrl-0 = <&mmc3_pins>; 162 162 vmmc-supply = <&reg_vcc3v3>; 163 163 mmc-pwrseq = <&wifi_pwrseq>; 164 164 bus-width = <4>; ··· 194 194 195 195 &spi0 { 196 196 pinctrl-names = "default"; 197 - pinctrl-0 = <&spi0_pins_a>, 198 - <&spi0_cs0_pins_a>, 199 - <&spi0_cs1_pins_a>; 197 + pinctrl-0 = <&spi0_pi_pins>, 198 + <&spi0_cs0_pi_pin>, 199 + <&spi0_cs1_pi_pin>; 200 200 status = "okay"; 201 201 }; 202 202 203 203 &uart0 { 204 204 pinctrl-names = "default"; 205 - pinctrl-0 = <&uart0_pins_a>; 205 + pinctrl-0 = <&uart0_pb_pins>; 206 206 status = "okay"; 207 207 }; 208 208 209 209 &uart4 { 210 210 pinctrl-names = "default"; 211 - pinctrl-0 = <&uart4_pins_b>; 211 + pinctrl-0 = <&uart4_ph_pins>; 212 212 status = "okay"; 213 213 }; 214 214 215 215 &uart7 { 216 216 pinctrl-names = "default"; 217 - pinctrl-0 = <&uart7_pins_a>; 217 + pinctrl-0 = <&uart7_pi_pins>; 218 218 status = "okay"; 219 219 }; 220 220
+6 -6
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
··· 114 114 115 115 &gmac { 116 116 pinctrl-names = "default"; 117 - pinctrl-0 = <&gmac_pins_mii_a>; 117 + pinctrl-0 = <&gmac_mii_pins>; 118 118 phy = <&phy1>; 119 119 phy-mode = "mii"; 120 120 status = "okay"; ··· 136 136 137 137 &i2c0 { 138 138 pinctrl-names = "default"; 139 - pinctrl-0 = <&i2c0_pins_a>; 139 + pinctrl-0 = <&i2c0_pins>; 140 140 status = "okay"; 141 141 142 142 axp209: pmic@34 { ··· 148 148 149 149 &i2c1 { 150 150 pinctrl-names = "default"; 151 - pinctrl-0 = <&i2c1_pins_a>; 151 + pinctrl-0 = <&i2c1_pins>; 152 152 status = "okay"; 153 153 }; 154 154 155 155 &ir0 { 156 156 pinctrl-names = "default"; 157 - pinctrl-0 = <&ir0_rx_pins_a>; 157 + pinctrl-0 = <&ir0_rx_pin>; 158 158 status = "okay"; 159 159 }; 160 160 161 161 &mmc0 { 162 162 pinctrl-names = "default"; 163 - pinctrl-0 = <&mmc0_pins_a>; 163 + pinctrl-0 = <&mmc0_pins>; 164 164 vmmc-supply = <&reg_vcc3v3>; 165 165 bus-width = <4>; 166 166 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 232 232 233 233 &uart0 { 234 234 pinctrl-names = "default"; 235 - pinctrl-0 = <&uart0_pins_a>; 235 + pinctrl-0 = <&uart0_pb_pins>; 236 236 status = "okay"; 237 237 }; 238 238
+11 -11
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
··· 147 147 148 148 &gmac { 149 149 pinctrl-names = "default"; 150 - pinctrl-0 = <&gmac_pins_rgmii_a>; 150 + pinctrl-0 = <&gmac_rgmii_pins>; 151 151 phy = <&phy1>; 152 152 phy-mode = "rgmii"; 153 153 status = "okay"; ··· 169 169 170 170 &i2c0 { 171 171 pinctrl-names = "default"; 172 - pinctrl-0 = <&i2c0_pins_a>; 172 + pinctrl-0 = <&i2c0_pins>; 173 173 status = "okay"; 174 174 175 175 axp209: pmic@34 { ··· 181 181 182 182 &i2c1 { 183 183 pinctrl-names = "default"; 184 - pinctrl-0 = <&i2c1_pins_a>; 184 + pinctrl-0 = <&i2c1_pins>; 185 185 status = "okay"; 186 186 }; 187 187 188 188 &i2c2 { 189 189 pinctrl-names = "default"; 190 - pinctrl-0 = <&i2c2_pins_a>; 190 + pinctrl-0 = <&i2c2_pins>; 191 191 status = "okay"; 192 192 }; 193 193 194 194 &ir0 { 195 195 pinctrl-names = "default"; 196 - pinctrl-0 = <&ir0_rx_pins_a>; 196 + pinctrl-0 = <&ir0_rx_pin>; 197 197 status = "okay"; 198 198 }; 199 199 200 200 &mmc0 { 201 201 pinctrl-names = "default"; 202 - pinctrl-0 = <&mmc0_pins_a>; 202 + pinctrl-0 = <&mmc0_pins>; 203 203 vmmc-supply = <&reg_vcc3v3>; 204 204 bus-width = <4>; 205 205 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 208 208 209 209 &mmc3 { 210 210 pinctrl-names = "default"; 211 - pinctrl-0 = <&mmc3_pins_a>; 211 + pinctrl-0 = <&mmc3_pins>; 212 212 vmmc-supply = <&reg_vcc3v3>; 213 213 mmc-pwrseq = <&mmc3_pwrseq>; 214 214 bus-width = <4>; ··· 224 224 }; 225 225 }; 226 226 227 - &mmc3_pins_a { 227 + &mmc3_pins { 228 228 /* AP6210 requires pull-up */ 229 229 bias-pull-up; 230 230 }; ··· 243 243 244 244 &pwm { 245 245 pinctrl-names = "default"; 246 - pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>; 246 + pinctrl-0 = <&pwm0_pin>, <&pwm1_pin>; 247 247 status = "okay"; 248 248 }; 249 249 ··· 302 302 303 303 &spdif { 304 304 pinctrl-names = "default"; 305 - pinctrl-0 = <&spdif_tx_pins_a>; 305 + pinctrl-0 = <&spdif_tx_pin>; 306 306 status = "okay"; 307 307 }; 308 308 309 309 &uart0 { 310 310 pinctrl-names = "default"; 311 - pinctrl-0 = <&uart0_pins_a>; 311 + pinctrl-0 = <&uart0_pb_pins>; 312 312 status = "okay"; 313 313 }; 314 314
+16 -16
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
··· 99 99 100 100 &gmac { 101 101 pinctrl-names = "default"; 102 - pinctrl-0 = <&gmac_pins_rgmii_a>; 102 + pinctrl-0 = <&gmac_rgmii_pins>; 103 103 phy = <&phy1>; 104 104 phy-mode = "rgmii"; 105 105 phy-supply = <&reg_gmac_vdd>; ··· 117 117 118 118 &i2c0 { 119 119 pinctrl-names = "default"; 120 - pinctrl-0 = <&i2c0_pins_a>; 120 + pinctrl-0 = <&i2c0_pins>; 121 121 status = "okay"; 122 122 123 123 axp209: pmic@34 { ··· 132 132 133 133 &i2c1 { 134 134 pinctrl-names = "default"; 135 - pinctrl-0 = <&i2c1_pins_a>; 135 + pinctrl-0 = <&i2c1_pins>; 136 136 status = "okay"; 137 137 }; 138 138 139 139 &i2c2 { 140 140 pinctrl-names = "default"; 141 - pinctrl-0 = <&i2c2_pins_a>; 141 + pinctrl-0 = <&i2c2_pins>; 142 142 status = "okay"; 143 143 }; 144 144 145 145 &i2c3 { 146 146 pinctrl-names = "default"; 147 - pinctrl-0 = <&i2c3_pins_a>; 147 + pinctrl-0 = <&i2c3_pins>; 148 148 status = "okay"; 149 149 }; 150 150 151 151 &ir0 { 152 152 pinctrl-names = "default"; 153 - pinctrl-0 = <&ir0_rx_pins_a>; 153 + pinctrl-0 = <&ir0_rx_pin>; 154 154 status = "okay"; 155 155 }; 156 156 157 157 &mmc0 { 158 158 pinctrl-names = "default"; 159 - pinctrl-0 = <&mmc0_pins_a>; 159 + pinctrl-0 = <&mmc0_pins>; 160 160 vmmc-supply = <&reg_vcc3v0>; 161 161 bus-width = <4>; 162 162 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 165 165 166 166 &mmc3 { 167 167 pinctrl-names = "default"; 168 - pinctrl-0 = <&mmc3_pins_a>; 168 + pinctrl-0 = <&mmc3_pins>; 169 169 vmmc-supply = <&reg_mmc3_vdd>; 170 170 bus-width = <4>; 171 171 non-removable; ··· 182 182 183 183 &pwm { 184 184 pinctrl-names = "default"; 185 - pinctrl-0 = <&pwm0_pins_a>; 185 + pinctrl-0 = <&pwm0_pin>; 186 186 status = "okay"; 187 187 }; 188 188 ··· 202 202 203 203 &spi2 { 204 204 pinctrl-names = "default"; 205 - pinctrl-0 = <&spi2_pins_b>, 206 - <&spi2_cs0_pins_b>; 205 + pinctrl-0 = <&spi2_pb_pins>, 206 + <&spi2_cs0_pb_pin>; 207 207 status = "okay"; 208 208 }; 209 209 210 210 &uart0 { 211 211 pinctrl-names = "default"; 212 - pinctrl-0 = <&uart0_pins_a>; 212 + pinctrl-0 = <&uart0_pb_pins>; 213 213 status = "okay"; 214 214 }; 215 215 216 216 &uart2 { 217 217 pinctrl-names = "default"; 218 - pinctrl-0 = <&uart2_pins_a>; 218 + pinctrl-0 = <&uart2_pi_pins>; 219 219 status = "okay"; 220 220 }; 221 221 222 222 &uart3 { 223 223 pinctrl-names = "default"; 224 - pinctrl-0 = <&uart3_pins_a>; 224 + pinctrl-0 = <&uart3_pg_pins>; 225 225 status = "okay"; 226 226 }; 227 227 228 228 &uart4 { 229 229 pinctrl-names = "default"; 230 - pinctrl-0 = <&uart4_pins_a>; 230 + pinctrl-0 = <&uart4_pg_pins>; 231 231 status = "okay"; 232 232 }; 233 233 234 234 &uart5 { 235 235 pinctrl-names = "default"; 236 - pinctrl-0 = <&uart5_pins_a>; 236 + pinctrl-0 = <&uart5_pi_pins>; 237 237 status = "okay"; 238 238 }; 239 239
+7 -7
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
··· 114 114 115 115 &gmac { 116 116 pinctrl-names = "default"; 117 - pinctrl-0 = <&gmac_pins_mii_a>; 117 + pinctrl-0 = <&gmac_mii_pins>; 118 118 phy = <&phy1>; 119 119 phy-mode = "mii"; 120 120 phy-supply = <&reg_gmac_3v3>; ··· 127 127 128 128 &i2c0 { 129 129 pinctrl-names = "default"; 130 - pinctrl-0 = <&i2c0_pins_a>; 130 + pinctrl-0 = <&i2c0_pins>; 131 131 status = "okay"; 132 132 133 133 axp209: pmic@34 { ··· 143 143 144 144 &ir0 { 145 145 pinctrl-names = "default"; 146 - pinctrl-0 = <&ir0_rx_pins_a>; 146 + pinctrl-0 = <&ir0_rx_pin>; 147 147 status = "okay"; 148 148 }; 149 149 150 150 &mmc0 { 151 151 pinctrl-names = "default"; 152 - pinctrl-0 = <&mmc0_pins_a>; 152 + pinctrl-0 = <&mmc0_pins>; 153 153 vmmc-supply = <&reg_vcc3v3>; 154 154 bus-width = <4>; 155 155 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 158 158 159 159 &mmc3 { 160 160 pinctrl-names = "default"; 161 - pinctrl-0 = <&mmc3_pins_a>; 161 + pinctrl-0 = <&mmc3_pins>; 162 162 vmmc-supply = <&reg_vmmc3>; 163 163 bus-width = <4>; 164 164 non-removable; ··· 173 173 }; 174 174 }; 175 175 176 - &mmc3_pins_a { 176 + &mmc3_pins { 177 177 /* AP6210 / AP6330 requires pull-up */ 178 178 bias-pull-up; 179 179 }; ··· 196 196 197 197 &uart0 { 198 198 pinctrl-names = "default"; 199 - pinctrl-0 = <&uart0_pins_a>; 199 + pinctrl-0 = <&uart0_pb_pins>; 200 200 status = "okay"; 201 201 }; 202 202
+5 -5
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
··· 74 74 75 75 &gmac { 76 76 pinctrl-names = "default"; 77 - pinctrl-0 = <&gmac_pins_mii_a>; 77 + pinctrl-0 = <&gmac_mii_pins>; 78 78 phy = <&phy1>; 79 79 phy-mode = "mii"; 80 80 status = "okay"; ··· 86 86 87 87 &i2c0 { 88 88 pinctrl-names = "default"; 89 - pinctrl-0 = <&i2c0_pins_a>; 89 + pinctrl-0 = <&i2c0_pins>; 90 90 status = "okay"; 91 91 92 92 axp209: pmic@34 { ··· 98 98 99 99 &i2c1 { 100 100 pinctrl-names = "default"; 101 - pinctrl-0 = <&i2c1_pins_a>; 101 + pinctrl-0 = <&i2c1_pins>; 102 102 status = "okay"; 103 103 }; 104 104 105 105 &mmc0 { 106 106 pinctrl-names = "default"; 107 - pinctrl-0 = <&mmc0_pins_a>; 107 + pinctrl-0 = <&mmc0_pins>; 108 108 vmmc-supply = <&reg_vcc3v3>; 109 109 bus-width = <4>; 110 110 cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */ ··· 156 156 157 157 &uart0 { 158 158 pinctrl-names = "default"; 159 - pinctrl-0 = <&uart0_pins_a>; 159 + pinctrl-0 = <&uart0_pb_pins>; 160 160 status = "okay"; 161 161 }; 162 162
+4 -4
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
··· 96 96 97 97 &gmac { 98 98 pinctrl-names = "default"; 99 - pinctrl-0 = <&gmac_pins_mii_a>; 99 + pinctrl-0 = <&gmac_mii_pins>; 100 100 phy = <&phy1>; 101 101 phy-mode = "mii"; 102 102 status = "okay"; ··· 115 115 116 116 &ir0 { 117 117 pinctrl-names = "default"; 118 - pinctrl-0 = <&ir0_rx_pins_a>; 118 + pinctrl-0 = <&ir0_rx_pin>; 119 119 status = "okay"; 120 120 }; 121 121 122 122 &mmc0 { 123 123 pinctrl-names = "default"; 124 - pinctrl-0 = <&mmc0_pins_a>; 124 + pinctrl-0 = <&mmc0_pins>; 125 125 vmmc-supply = <&reg_vcc3v3>; 126 126 bus-width = <4>; 127 127 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 142 142 143 143 &spdif { 144 144 pinctrl-names = "default"; 145 - pinctrl-0 = <&spdif_tx_pins_a>; 145 + pinctrl-0 = <&spdif_tx_pin>; 146 146 status = "okay"; 147 147 };
+11 -11
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
··· 119 119 120 120 &gmac { 121 121 pinctrl-names = "default"; 122 - pinctrl-0 = <&gmac_pins_rgmii_a>; 122 + pinctrl-0 = <&gmac_rgmii_pins>; 123 123 phy-mode = "rgmii"; 124 124 phy-supply = <&reg_gmac_3v3>; 125 125 status = "okay"; ··· 196 196 197 197 &i2c0 { 198 198 pinctrl-names = "default"; 199 - pinctrl-0 = <&i2c0_pins_a>; 199 + pinctrl-0 = <&i2c0_pins>; 200 200 status = "okay"; 201 201 202 202 axp209: pmic@34 { ··· 208 208 209 209 &i2c2 { 210 210 pinctrl-names = "default"; 211 - pinctrl-0 = <&i2c2_pins_a>; 211 + pinctrl-0 = <&i2c2_pins>; 212 212 status = "okay"; 213 213 }; 214 214 215 215 &ir0 { 216 216 pinctrl-names = "default"; 217 - pinctrl-0 = <&ir0_rx_pins_a>; 217 + pinctrl-0 = <&ir0_rx_pin>; 218 218 status = "okay"; 219 219 }; 220 220 221 221 &mmc0 { 222 222 pinctrl-names = "default"; 223 - pinctrl-0 = <&mmc0_pins_a>; 223 + pinctrl-0 = <&mmc0_pins>; 224 224 vmmc-supply = <&reg_vcc3v3>; 225 225 bus-width = <4>; 226 226 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 294 294 295 295 &spi0 { 296 296 pinctrl-names = "default"; 297 - pinctrl-0 = <&spi0_pins_a>, 298 - <&spi0_cs0_pins_a>, 299 - <&spi0_cs1_pins_a>; 297 + pinctrl-0 = <&spi0_pi_pins>, 298 + <&spi0_cs0_pi_pin>, 299 + <&spi0_cs1_pi_pin>; 300 300 status = "okay"; 301 301 }; 302 302 303 303 &uart0 { 304 304 pinctrl-names = "default"; 305 - pinctrl-0 = <&uart0_pins_a>; 305 + pinctrl-0 = <&uart0_pb_pins>; 306 306 status = "okay"; 307 307 }; 308 308 309 309 &uart3 { 310 310 pinctrl-names = "default"; 311 - pinctrl-0 = <&uart3_pins_b>; 311 + pinctrl-0 = <&uart3_ph_pins>; 312 312 status = "okay"; 313 313 }; 314 314 315 315 &uart7 { 316 316 pinctrl-names = "default"; 317 - pinctrl-0 = <&uart7_pins_a>; 317 + pinctrl-0 = <&uart7_pi_pins>; 318 318 status = "okay"; 319 319 }; 320 320
+6 -6
arch/arm/boot/dts/sun7i-a20-m3.dts
··· 81 81 82 82 &gmac { 83 83 pinctrl-names = "default"; 84 - pinctrl-0 = <&gmac_pins_mii_a>; 84 + pinctrl-0 = <&gmac_mii_pins>; 85 85 phy = <&phy1>; 86 86 phy-mode = "mii"; 87 87 status = "okay"; ··· 93 93 94 94 &i2c0 { 95 95 pinctrl-names = "default"; 96 - pinctrl-0 = <&i2c0_pins_a>; 96 + pinctrl-0 = <&i2c0_pins>; 97 97 status = "okay"; 98 98 99 99 axp209: pmic@34 { ··· 109 109 110 110 &ir0 { 111 111 pinctrl-names = "default"; 112 - pinctrl-0 = <&ir0_rx_pins_a>; 112 + pinctrl-0 = <&ir0_rx_pin>; 113 113 status = "okay"; 114 114 }; 115 115 116 116 &mmc0 { 117 117 pinctrl-names = "default"; 118 - pinctrl-0 = <&mmc0_pins_a>; 118 + pinctrl-0 = <&mmc0_pins>; 119 119 vmmc-supply = <&reg_vcc3v3>; 120 120 bus-width = <4>; 121 121 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 124 124 125 125 &mmc2 { 126 126 pinctrl-names = "default"; 127 - pinctrl-0 = <&mmc2_pins_a>; 127 + pinctrl-0 = <&mmc2_pins>; 128 128 vmmc-supply = <&reg_vcc3v3>; 129 129 bus-width = <4>; 130 130 non-removable; ··· 149 149 150 150 &uart0 { 151 151 pinctrl-names = "default"; 152 - pinctrl-0 = <&uart0_pins_a>; 152 + pinctrl-0 = <&uart0_pb_pins>; 153 153 status = "okay"; 154 154 }; 155 155
+6 -6
arch/arm/boot/dts/sun7i-a20-mk808c.dts
··· 107 107 108 108 &i2c0 { 109 109 pinctrl-names = "default"; 110 - pinctrl-0 = <&i2c0_pins_a>; 110 + pinctrl-0 = <&i2c0_pins>; 111 111 status = "okay"; 112 112 113 113 axp209: pmic@34 { ··· 122 122 123 123 &i2c1 { 124 124 pinctrl-names = "default"; 125 - pinctrl-0 = <&i2c1_pins_a>; 125 + pinctrl-0 = <&i2c1_pins>; 126 126 status = "okay"; 127 127 }; 128 128 129 129 &i2c2 { 130 130 pinctrl-names = "default"; 131 - pinctrl-0 = <&i2c2_pins_a>; 131 + pinctrl-0 = <&i2c2_pins>; 132 132 status = "okay"; 133 133 }; 134 134 135 135 &mmc0 { 136 136 pinctrl-names = "default"; 137 - pinctrl-0 = <&mmc0_pins_a>; 137 + pinctrl-0 = <&mmc0_pins>; 138 138 vmmc-supply = <&reg_vcc3v0>; 139 139 bus-width = <4>; 140 140 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 167 167 168 168 &uart0 { 169 169 pinctrl-names = "default"; 170 - pinctrl-0 = <&uart0_pins_a>; 170 + pinctrl-0 = <&uart0_pb_pins>; 171 171 status = "okay"; 172 172 }; 173 173 174 174 &uart2 { 175 175 pinctrl-names = "default"; 176 - pinctrl-0 = <&uart2_pins_a>; 176 + pinctrl-0 = <&uart2_pi_pins>; 177 177 status = "okay"; 178 178 }; 179 179
+1 -1
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
··· 22 22 23 23 &mmc2 { 24 24 pinctrl-names = "default"; 25 - pinctrl-0 = <&mmc2_pins_a>; 25 + pinctrl-0 = <&mmc2_pins>; 26 26 vmmc-supply = <&reg_vcc3v3>; 27 27 mmc-pwrseq = <&mmc2_pwrseq>; 28 28 bus-width = <4>;
+13 -13
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
··· 110 110 111 111 &gmac { 112 112 pinctrl-names = "default"; 113 - pinctrl-0 = <&gmac_pins_rgmii_a>; 113 + pinctrl-0 = <&gmac_rgmii_pins>; 114 114 phy = <&phy1>; 115 115 phy-mode = "rgmii"; 116 116 status = "okay"; ··· 132 132 133 133 &i2c0 { 134 134 pinctrl-names = "default"; 135 - pinctrl-0 = <&i2c0_pins_a>; 135 + pinctrl-0 = <&i2c0_pins>; 136 136 status = "okay"; 137 137 138 138 axp209: pmic@34 { ··· 144 144 145 145 &i2c1 { 146 146 pinctrl-names = "default"; 147 - pinctrl-0 = <&i2c1_pins_a>; 147 + pinctrl-0 = <&i2c1_pins>; 148 148 status = "okay"; 149 149 }; 150 150 151 151 &i2c2 { 152 152 pinctrl-names = "default"; 153 - pinctrl-0 = <&i2c2_pins_a>; 153 + pinctrl-0 = <&i2c2_pins>; 154 154 status = "okay"; 155 155 }; 156 156 ··· 210 210 211 211 &mmc0 { 212 212 pinctrl-names = "default"; 213 - pinctrl-0 = <&mmc0_pins_a>; 213 + pinctrl-0 = <&mmc0_pins>; 214 214 vmmc-supply = <&reg_vcc3v3>; 215 215 bus-width = <4>; 216 216 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 219 219 220 220 &mmc3 { 221 221 pinctrl-names = "default"; 222 - pinctrl-0 = <&mmc3_pins_a>; 222 + pinctrl-0 = <&mmc3_pins>; 223 223 vmmc-supply = <&reg_vcc3v3>; 224 224 bus-width = <4>; 225 225 cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */ ··· 292 292 293 293 &spi1 { 294 294 pinctrl-names = "default"; 295 - pinctrl-0 = <&spi1_pins_a>, 296 - <&spi1_cs0_pins_a>; 295 + pinctrl-0 = <&spi1_pi_pins>, 296 + <&spi1_cs0_pi_pin>; 297 297 status = "okay"; 298 298 }; 299 299 300 300 &spi2 { 301 301 pinctrl-names = "default"; 302 - pinctrl-0 = <&spi2_pins_a>, 303 - <&spi2_cs0_pins_a>; 302 + pinctrl-0 = <&spi2_pc_pins>, 303 + <&spi2_cs0_pc_pin>; 304 304 status = "okay"; 305 305 }; 306 306 307 307 &uart0 { 308 308 pinctrl-names = "default"; 309 - pinctrl-0 = <&uart0_pins_a>; 309 + pinctrl-0 = <&uart0_pb_pins>; 310 310 status = "okay"; 311 311 }; 312 312 313 313 &uart6 { 314 314 pinctrl-names = "default"; 315 - pinctrl-0 = <&uart6_pins_a>; 315 + pinctrl-0 = <&uart6_pi_pins>; 316 316 status = "okay"; 317 317 }; 318 318 319 319 &uart7 { 320 320 pinctrl-names = "default"; 321 - pinctrl-0 = <&uart7_pins_a>; 321 + pinctrl-0 = <&uart7_pi_pins>; 322 322 status = "okay"; 323 323 }; 324 324
+1 -1
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
··· 21 21 22 22 &mmc2 { 23 23 pinctrl-names = "default"; 24 - pinctrl-0 = <&mmc2_pins_a>; 24 + pinctrl-0 = <&mmc2_pins>; 25 25 vmmc-supply = <&reg_vcc3v3>; 26 26 mmc-pwrseq = <&mmc2_pwrseq>; 27 27 bus-width = <4>;
+15 -15
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
··· 78 78 79 79 &can0 { 80 80 pinctrl-names = "default"; 81 - pinctrl-0 = <&can0_pins_a>; 81 + pinctrl-0 = <&can_ph_pins>; 82 82 status = "okay"; 83 83 }; 84 84 ··· 104 104 105 105 &gmac { 106 106 pinctrl-names = "default"; 107 - pinctrl-0 = <&gmac_pins_rgmii_a>; 107 + pinctrl-0 = <&gmac_rgmii_pins>; 108 108 phy = <&phy3>; 109 109 phy-mode = "rgmii"; 110 110 phy-supply = <&reg_vcc3v3>; ··· 131 131 132 132 &i2c0 { 133 133 pinctrl-names = "default"; 134 - pinctrl-0 = <&i2c0_pins_a>; 134 + pinctrl-0 = <&i2c0_pins>; 135 135 status = "okay"; 136 136 137 137 axp209: pmic@34 { ··· 144 144 /* Exposed to UEXT1 */ 145 145 &i2c1 { 146 146 pinctrl-names = "default"; 147 - pinctrl-0 = <&i2c1_pins_a>; 147 + pinctrl-0 = <&i2c1_pins>; 148 148 status = "okay"; 149 149 150 150 eeprom: eeprom@50 { ··· 157 157 /* Exposed to UEXT2 */ 158 158 &i2c2 { 159 159 pinctrl-names = "default"; 160 - pinctrl-0 = <&i2c2_pins_a>; 160 + pinctrl-0 = <&i2c2_pins>; 161 161 status = "okay"; 162 162 }; 163 163 164 164 &ir0 { 165 165 pinctrl-names = "default"; 166 - pinctrl-0 = <&ir0_rx_pins_a>; 166 + pinctrl-0 = <&ir0_rx_pin>; 167 167 status = "okay"; 168 168 }; 169 169 170 170 &mmc0 { 171 171 pinctrl-names = "default"; 172 - pinctrl-0 = <&mmc0_pins_a>; 172 + pinctrl-0 = <&mmc0_pins>; 173 173 vmmc-supply = <&reg_vcc3v3>; 174 174 bus-width = <4>; 175 175 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; ··· 178 178 179 179 &mmc3 { 180 180 pinctrl-names = "default"; 181 - pinctrl-0 = <&mmc3_pins_a>; 181 + pinctrl-0 = <&mmc3_pins>; 182 182 vmmc-supply = <&reg_vcc3v3>; 183 183 mmc-pwrseq = <&rtl_pwrseq>; 184 184 bus-width = <4>; ··· 274 274 /* Exposed to UEXT1 */ 275 275 &spi1 { 276 276 pinctrl-names = "default"; 277 - pinctrl-0 = <&spi1_pins_a>, 278 - <&spi1_cs0_pins_a>; 277 + pinctrl-0 = <&spi1_pi_pins>, 278 + <&spi1_cs0_pi_pin>; 279 279 status = "okay"; 280 280 }; 281 281 282 282 /* Exposed to UEXT2 */ 283 283 &spi2 { 284 284 pinctrl-names = "default"; 285 - pinctrl-0 = <&spi2_pins_a>, 286 - <&spi2_cs0_pins_a>; 285 + pinctrl-0 = <&spi2_pc_pins>, 286 + <&spi2_cs0_pc_pin>; 287 287 status = "okay"; 288 288 }; 289 289 290 290 &uart0 { 291 291 pinctrl-names = "default"; 292 - pinctrl-0 = <&uart0_pins_a>; 292 + pinctrl-0 = <&uart0_pb_pins>; 293 293 status = "okay"; 294 294 }; 295 295 ··· 303 303 /* Exposed to UEXT1 */ 304 304 &uart4 { 305 305 pinctrl-names = "default"; 306 - pinctrl-0 = <&uart4_pins_a>; 306 + pinctrl-0 = <&uart4_pg_pins>; 307 307 status = "okay"; 308 308 }; 309 309 310 310 /* Exposed to UEXT2 */ 311 311 &uart7 { 312 312 pinctrl-names = "default"; 313 - pinctrl-0 = <&uart7_pins_a>; 313 + pinctrl-0 = <&uart7_pi_pins>; 314 314 status = "okay"; 315 315 }; 316 316
+5 -5
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
··· 105 105 106 106 &gmac { 107 107 pinctrl-names = "default"; 108 - pinctrl-0 = <&gmac_pins_mii_a>; 108 + pinctrl-0 = <&gmac_mii_pins>; 109 109 phy = <&phy1>; 110 110 phy-mode = "mii"; 111 111 status = "okay"; ··· 127 127 128 128 &i2c0 { 129 129 pinctrl-names = "default"; 130 - pinctrl-0 = <&i2c0_pins_a>; 130 + pinctrl-0 = <&i2c0_pins>; 131 131 status = "okay"; 132 132 133 133 axp209: pmic@34 { ··· 143 143 144 144 &i2c1 { 145 145 pinctrl-names = "default"; 146 - pinctrl-0 = <&i2c1_pins_a>; 146 + pinctrl-0 = <&i2c1_pins>; 147 147 status = "okay"; 148 148 149 149 eeprom: eeprom@50 { ··· 155 155 156 156 &mmc0 { 157 157 pinctrl-names = "default"; 158 - pinctrl-0 = <&mmc0_pins_a>; 158 + pinctrl-0 = <&mmc0_pins>; 159 159 vmmc-supply = <&reg_vcc3v3>; 160 160 bus-width = <4>; 161 161 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 213 213 214 214 &uart0 { 215 215 pinctrl-names = "default"; 216 - pinctrl-0 = <&uart0_pins_a>; 216 + pinctrl-0 = <&uart0_pb_pins>; 217 217 status = "okay"; 218 218 }; 219 219
+1 -1
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
··· 55 55 56 56 &mmc2 { 57 57 pinctrl-names = "default"; 58 - pinctrl-0 = <&mmc2_pins_a>; 58 + pinctrl-0 = <&mmc2_pins>; 59 59 vmmc-supply = <&reg_vcc3v3>; 60 60 vqmmc-supply = <&reg_vcc3v3>; 61 61 bus-width = <4>;
+5 -5
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
··· 110 110 111 111 &gmac { 112 112 pinctrl-names = "default"; 113 - pinctrl-0 = <&gmac_pins_rgmii_a>; 113 + pinctrl-0 = <&gmac_rgmii_pins>; 114 114 phy = <&phy1>; 115 115 phy-mode = "rgmii"; 116 116 status = "okay"; ··· 132 132 133 133 &i2c0 { 134 134 pinctrl-names = "default"; 135 - pinctrl-0 = <&i2c0_pins_a>; 135 + pinctrl-0 = <&i2c0_pins>; 136 136 status = "okay"; 137 137 138 138 axp209: pmic@34 { ··· 144 144 145 145 &i2c1 { 146 146 pinctrl-names = "default"; 147 - pinctrl-0 = <&i2c1_pins_a>; 147 + pinctrl-0 = <&i2c1_pins>; 148 148 status = "okay"; 149 149 150 150 eeprom: eeprom@50 { ··· 160 160 161 161 &mmc0 { 162 162 pinctrl-names = "default"; 163 - pinctrl-0 = <&mmc0_pins_a>; 163 + pinctrl-0 = <&mmc0_pins>; 164 164 vmmc-supply = <&reg_vcc3v3>; 165 165 bus-width = <4>; 166 166 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 261 261 262 262 &uart0 { 263 263 pinctrl-names = "default"; 264 - pinctrl-0 = <&uart0_pins_a>; 264 + pinctrl-0 = <&uart0_pb_pins>; 265 265 status = "okay"; 266 266 }; 267 267
+1 -1
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
··· 55 55 56 56 &mmc2 { 57 57 pinctrl-names = "default"; 58 - pinctrl-0 = <&mmc2_pins_a>; 58 + pinctrl-0 = <&mmc2_pins>; 59 59 vmmc-supply = <&reg_vcc3v3>; 60 60 bus-width = <4>; 61 61 non-removable;
+13 -13
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
··· 117 117 118 118 &gmac { 119 119 pinctrl-names = "default"; 120 - pinctrl-0 = <&gmac_pins_mii_a>, <&gmac_txerr>; 120 + pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>; 121 121 phy = <&phy1>; 122 122 phy-mode = "mii"; 123 123 status = "okay"; ··· 139 139 140 140 &i2c0 { 141 141 pinctrl-names = "default"; 142 - pinctrl-0 = <&i2c0_pins_a>; 142 + pinctrl-0 = <&i2c0_pins>; 143 143 status = "okay"; 144 144 145 145 axp209: pmic@34 { ··· 151 151 152 152 &i2c1 { 153 153 pinctrl-names = "default"; 154 - pinctrl-0 = <&i2c1_pins_a>; 154 + pinctrl-0 = <&i2c1_pins>; 155 155 status = "okay"; 156 156 157 157 eeprom: eeprom@50 { ··· 163 163 164 164 &i2c2 { 165 165 pinctrl-names = "default"; 166 - pinctrl-0 = <&i2c2_pins_a>; 166 + pinctrl-0 = <&i2c2_pins>; 167 167 status = "okay"; 168 168 }; 169 169 ··· 223 223 224 224 &mmc0 { 225 225 pinctrl-names = "default"; 226 - pinctrl-0 = <&mmc0_pins_a>; 226 + pinctrl-0 = <&mmc0_pins>; 227 227 vmmc-supply = <&reg_vcc3v3>; 228 228 bus-width = <4>; 229 229 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 232 232 233 233 &mmc3 { 234 234 pinctrl-names = "default"; 235 - pinctrl-0 = <&mmc3_pins_a>; 235 + pinctrl-0 = <&mmc3_pins>; 236 236 vmmc-supply = <&reg_vcc3v3>; 237 237 bus-width = <4>; 238 238 cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ ··· 325 325 326 326 &spi1 { 327 327 pinctrl-names = "default"; 328 - pinctrl-0 = <&spi1_pins_a>, 329 - <&spi1_cs0_pins_a>; 328 + pinctrl-0 = <&spi1_pi_pins>, 329 + <&spi1_cs0_pi_pin>; 330 330 status = "okay"; 331 331 }; 332 332 333 333 &spi2 { 334 334 pinctrl-names = "default"; 335 - pinctrl-0 = <&spi2_pins_a>, 336 - <&spi2_cs0_pins_a>; 335 + pinctrl-0 = <&spi2_pc_pins>, 336 + <&spi2_cs0_pc_pin>; 337 337 status = "okay"; 338 338 }; 339 339 340 340 &uart0 { 341 341 pinctrl-names = "default"; 342 - pinctrl-0 = <&uart0_pins_a>; 342 + pinctrl-0 = <&uart0_pb_pins>; 343 343 status = "okay"; 344 344 }; 345 345 346 346 &uart6 { 347 347 pinctrl-names = "default"; 348 - pinctrl-0 = <&uart6_pins_a>; 348 + pinctrl-0 = <&uart6_pi_pins>; 349 349 status = "okay"; 350 350 }; 351 351 352 352 &uart7 { 353 353 pinctrl-names = "default"; 354 - pinctrl-0 = <&uart7_pins_a>; 354 + pinctrl-0 = <&uart7_pi_pins>; 355 355 status = "okay"; 356 356 }; 357 357
+6 -6
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
··· 119 119 120 120 &gmac { 121 121 pinctrl-names = "default"; 122 - pinctrl-0 = <&gmac_pins_rgmii_a>; 122 + pinctrl-0 = <&gmac_rgmii_pins>; 123 123 phy = <&phy1>; 124 124 phy-mode = "rgmii"; 125 125 phy-supply = <&reg_gmac_3v3>; ··· 142 142 143 143 &i2c0 { 144 144 pinctrl-names = "default"; 145 - pinctrl-0 = <&i2c0_pins_a>; 145 + pinctrl-0 = <&i2c0_pins>; 146 146 status = "okay"; 147 147 148 148 axp209: pmic@34 { ··· 156 156 157 157 &ir0 { 158 158 pinctrl-names = "default"; 159 - pinctrl-0 = <&ir0_rx_pins_a>; 159 + pinctrl-0 = <&ir0_rx_pin>; 160 160 status = "okay"; 161 161 }; 162 162 163 163 &mmc0 { 164 164 pinctrl-names = "default"; 165 - pinctrl-0 = <&mmc0_pins_a>; 165 + pinctrl-0 = <&mmc0_pins>; 166 166 vmmc-supply = <&reg_vcc3v3>; 167 167 bus-width = <4>; 168 168 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 171 171 172 172 &mmc3 { 173 173 pinctrl-names = "default"; 174 - pinctrl-0 = <&mmc3_pins_a>; 174 + pinctrl-0 = <&mmc3_pins>; 175 175 vmmc-supply = <&reg_vcc3v3>; 176 176 bus-width = <4>; 177 177 cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ ··· 231 231 232 232 &uart0 { 233 233 pinctrl-names = "default"; 234 - pinctrl-0 = <&uart0_pins_a>; 234 + pinctrl-0 = <&uart0_pb_pins>; 235 235 status = "okay"; 236 236 }; 237 237
+5 -5
arch/arm/boot/dts/sun7i-a20-orangepi.dts
··· 95 95 96 96 &gmac { 97 97 pinctrl-names = "default"; 98 - pinctrl-0 = <&gmac_pins_rgmii_a>; 98 + pinctrl-0 = <&gmac_rgmii_pins>; 99 99 phy = <&phy1>; 100 100 phy-mode = "rgmii"; 101 101 phy-supply = <&reg_gmac_3v3>; ··· 108 108 109 109 &i2c0 { 110 110 pinctrl-names = "default"; 111 - pinctrl-0 = <&i2c0_pins_a>; 111 + pinctrl-0 = <&i2c0_pins>; 112 112 status = "okay"; 113 113 114 114 axp209: pmic@34 { ··· 122 122 123 123 &ir0 { 124 124 pinctrl-names = "default"; 125 - pinctrl-0 = <&ir0_rx_pins_a>; 125 + pinctrl-0 = <&ir0_rx_pin>; 126 126 status = "okay"; 127 127 }; 128 128 129 129 &mmc0 { 130 130 pinctrl-names = "default"; 131 - pinctrl-0 = <&mmc0_pins_a>; 131 + pinctrl-0 = <&mmc0_pins>; 132 132 vmmc-supply = <&reg_vcc3v3>; 133 133 bus-width = <4>; 134 134 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ ··· 188 188 189 189 &uart0 { 190 190 pinctrl-names = "default"; 191 - pinctrl-0 = <&uart0_pins_a>; 191 + pinctrl-0 = <&uart0_pb_pins>; 192 192 status = "okay"; 193 193 }; 194 194
+5 -5
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
··· 113 113 114 114 &gmac { 115 115 pinctrl-names = "default"; 116 - pinctrl-0 = <&gmac_pins_rgmii_a>; 116 + pinctrl-0 = <&gmac_rgmii_pins>; 117 117 phy = <&phy1>; 118 118 phy-mode = "rgmii"; 119 119 status = "okay"; ··· 135 135 136 136 &i2c0 { 137 137 pinctrl-names = "default"; 138 - pinctrl-0 = <&i2c0_pins_a>; 138 + pinctrl-0 = <&i2c0_pins>; 139 139 status = "okay"; 140 140 141 141 axp209: pmic@34 { ··· 147 147 148 148 &ir0 { 149 149 pinctrl-names = "default"; 150 - pinctrl-0 = <&ir0_rx_pins_a>; 150 + pinctrl-0 = <&ir0_rx_pin>; 151 151 status = "okay"; 152 152 }; 153 153 154 154 &mmc0 { 155 155 pinctrl-names = "default"; 156 - pinctrl-0 = <&mmc0_pins_a>; 156 + pinctrl-0 = <&mmc0_pins>; 157 157 vmmc-supply = <&reg_vcc3v3>; 158 158 bus-width = <4>; 159 159 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 220 220 221 221 &uart0 { 222 222 pinctrl-names = "default"; 223 - pinctrl-0 = <&uart0_pins_a>; 223 + pinctrl-0 = <&uart0_pb_pins>; 224 224 status = "okay"; 225 225 }; 226 226
+5 -5
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
··· 121 121 122 122 &gmac { 123 123 pinctrl-names = "default"; 124 - pinctrl-0 = <&gmac_pins_mii_a>; 124 + pinctrl-0 = <&gmac_mii_pins>; 125 125 phy = <&phy1>; 126 126 phy-mode = "mii"; 127 127 status = "okay"; ··· 133 133 134 134 &i2c0 { 135 135 pinctrl-names = "default"; 136 - pinctrl-0 = <&i2c0_pins_a>; 136 + pinctrl-0 = <&i2c0_pins>; 137 137 status = "okay"; 138 138 139 139 axp209: pmic@34 { ··· 147 147 148 148 &ir0 { 149 149 pinctrl-names = "default"; 150 - pinctrl-0 = <&ir0_rx_pins_a>; 150 + pinctrl-0 = <&ir0_rx_pin>; 151 151 status = "okay"; 152 152 }; 153 153 154 154 &mmc0 { 155 155 pinctrl-names = "default"; 156 - pinctrl-0 = <&mmc0_pins_a>; 156 + pinctrl-0 = <&mmc0_pins>; 157 157 vmmc-supply = <&reg_vcc3v3>; 158 158 bus-width = <4>; 159 159 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 220 220 221 221 &uart0 { 222 222 pinctrl-names = "default"; 223 - pinctrl-0 = <&uart0_pins_a>; 223 + pinctrl-0 = <&uart0_pb_pins>; 224 224 status = "okay"; 225 225 }; 226 226
+6 -6
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
··· 90 90 91 91 &i2c0 { 92 92 pinctrl-names = "default"; 93 - pinctrl-0 = <&i2c0_pins_a>; 93 + pinctrl-0 = <&i2c0_pins>; 94 94 status = "okay"; 95 95 96 96 axp209: pmic@34 { ··· 104 104 105 105 &i2c1 { 106 106 pinctrl-names = "default"; 107 - pinctrl-0 = <&i2c1_pins_a>; 107 + pinctrl-0 = <&i2c1_pins>; 108 108 status = "okay"; 109 109 }; 110 110 111 111 &i2c2 { 112 112 pinctrl-names = "default"; 113 - pinctrl-0 = <&i2c2_pins_a>; 113 + pinctrl-0 = <&i2c2_pins>; 114 114 status = "okay"; 115 115 116 116 gt911: touchscreen@5d { ··· 145 145 146 146 &mmc0 { 147 147 pinctrl-names = "default"; 148 - pinctrl-0 = <&mmc0_pins_a>; 148 + pinctrl-0 = <&mmc0_pins>; 149 149 vmmc-supply = <&reg_vcc3v3>; 150 150 bus-width = <4>; 151 151 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 174 174 175 175 &pwm { 176 176 pinctrl-names = "default"; 177 - pinctrl-0 = <&pwm0_pins_a>; 177 + pinctrl-0 = <&pwm0_pin>; 178 178 status = "okay"; 179 179 }; 180 180 ··· 217 217 218 218 &uart0 { 219 219 pinctrl-names = "default"; 220 - pinctrl-0 = <&uart0_pins_a>; 220 + pinctrl-0 = <&uart0_pb_pins>; 221 221 status = "okay"; 222 222 }; 223 223
+7 -7
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
··· 80 80 81 81 &gmac { 82 82 pinctrl-names = "default"; 83 - pinctrl-0 = <&gmac_pins_rgmii_a>; 83 + pinctrl-0 = <&gmac_rgmii_pins>; 84 84 phy = <&phy1>; 85 85 phy-mode = "rgmii"; 86 86 status = "okay"; ··· 92 92 93 93 &i2c0 { 94 94 pinctrl-names = "default"; 95 - pinctrl-0 = <&i2c0_pins_a>; 95 + pinctrl-0 = <&i2c0_pins>; 96 96 status = "okay"; 97 97 98 98 axp209: pmic@34 { ··· 104 104 105 105 &i2c1 { 106 106 pinctrl-names = "default"; 107 - pinctrl-0 = <&i2c1_pins_a>; 107 + pinctrl-0 = <&i2c1_pins>; 108 108 status = "okay"; 109 109 }; 110 110 111 111 &i2c2 { 112 112 pinctrl-names = "default"; 113 - pinctrl-0 = <&i2c2_pins_a>; 113 + pinctrl-0 = <&i2c2_pins>; 114 114 status = "okay"; 115 115 }; 116 116 ··· 118 118 119 119 &mmc0 { 120 120 pinctrl-names = "default"; 121 - pinctrl-0 = <&mmc0_pins_a>; 121 + pinctrl-0 = <&mmc0_pins>; 122 122 vmmc-supply = <&reg_vcc3v3>; 123 123 bus-width = <4>; 124 124 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ ··· 127 127 128 128 &mmc3 { 129 129 pinctrl-names = "default"; 130 - pinctrl-0 = <&mmc3_pins_a>; 130 + pinctrl-0 = <&mmc3_pins>; 131 131 vmmc-supply = <&reg_vcc3v3>; 132 132 mmc-pwrseq = <&mmc3_pwrseq>; 133 133 bus-width = <4>; ··· 202 202 203 203 &uart0 { 204 204 pinctrl-names = "default"; 205 - pinctrl-0 = <&uart0_pins_a>; 205 + pinctrl-0 = <&uart0_pb_pins>; 206 206 status = "okay"; 207 207 }; 208 208
+48 -48
arch/arm/boot/dts/sun7i-a20.dtsi
··· 747 747 #interrupt-cells = <3>; 748 748 #gpio-cells = <3>; 749 749 750 - can0_pins_a: can0@0 { 750 + can_ph_pins: can-ph-pins { 751 751 pins = "PH20", "PH21"; 752 752 function = "can"; 753 753 }; 754 754 755 - clk_out_a_pins_a: clk_out_a@0 { 755 + clk_out_a_pin: clk-out-a-pin { 756 756 pins = "PI12"; 757 757 function = "clk_out_a"; 758 758 }; 759 759 760 - clk_out_b_pins_a: clk_out_b@0 { 760 + clk_out_b_pin: clk-out-b-pin { 761 761 pins = "PI13"; 762 762 function = "clk_out_b"; 763 763 }; 764 764 765 - emac_pins_a: emac0@0 { 765 + emac_pa_pins: emac-pa-pins { 766 766 pins = "PA0", "PA1", "PA2", 767 767 "PA3", "PA4", "PA5", "PA6", 768 768 "PA7", "PA8", "PA9", "PA10", ··· 771 771 function = "emac"; 772 772 }; 773 773 774 - gmac_pins_mii_a: gmac_mii@0 { 774 + gmac_mii_pins: gmac-mii-pins { 775 775 pins = "PA0", "PA1", "PA2", 776 776 "PA3", "PA4", "PA5", "PA6", 777 777 "PA7", "PA8", "PA9", "PA10", ··· 780 780 function = "gmac"; 781 781 }; 782 782 783 - gmac_pins_rgmii_a: gmac_rgmii@0 { 783 + gmac_rgmii_pins: gmac-rgmii-pins { 784 784 pins = "PA0", "PA1", "PA2", 785 785 "PA3", "PA4", "PA5", "PA6", 786 786 "PA7", "PA8", "PA10", ··· 794 794 drive-strength = <40>; 795 795 }; 796 796 797 - i2c0_pins_a: i2c0@0 { 797 + i2c0_pins: i2c0-pins { 798 798 pins = "PB0", "PB1"; 799 799 function = "i2c0"; 800 800 }; 801 801 802 - i2c1_pins_a: i2c1@0 { 802 + i2c1_pins: i2c1-pins { 803 803 pins = "PB18", "PB19"; 804 804 function = "i2c1"; 805 805 }; 806 806 807 - i2c2_pins_a: i2c2@0 { 807 + i2c2_pins: i2c2-pins { 808 808 pins = "PB20", "PB21"; 809 809 function = "i2c2"; 810 810 }; 811 811 812 - i2c3_pins_a: i2c3@0 { 812 + i2c3_pins: i2c3-pins { 813 813 pins = "PI0", "PI1"; 814 814 function = "i2c3"; 815 815 }; 816 816 817 - ir0_rx_pins_a: ir0@0 { 817 + ir0_rx_pin: ir0-rx-pin { 818 818 pins = "PB4"; 819 819 function = "ir0"; 820 820 }; 821 821 822 - ir0_tx_pins_a: ir0@1 { 822 + ir0_tx_pin: ir0-tx-pin { 823 823 pins = "PB3"; 824 824 function = "ir0"; 825 825 }; 826 826 827 - ir1_rx_pins_a: ir1@0 { 827 + ir1_rx_pin: ir1-rx-pin { 828 828 pins = "PB23"; 829 829 function = "ir1"; 830 830 }; 831 831 832 - ir1_tx_pins_a: ir1@1 { 832 + ir1_tx_pin: ir1-tx-pin { 833 833 pins = "PB22"; 834 834 function = "ir1"; 835 835 }; 836 836 837 - mmc0_pins_a: mmc0@0 { 837 + mmc0_pins: mmc0-pins { 838 838 pins = "PF0", "PF1", "PF2", 839 839 "PF3", "PF4", "PF5"; 840 840 function = "mmc0"; ··· 842 842 bias-pull-up; 843 843 }; 844 844 845 - mmc2_pins_a: mmc2@0 { 845 + mmc2_pins: mmc2-pins { 846 846 pins = "PC6", "PC7", "PC8", 847 847 "PC9", "PC10", "PC11"; 848 848 function = "mmc2"; ··· 850 850 bias-pull-up; 851 851 }; 852 852 853 - mmc3_pins_a: mmc3@0 { 853 + mmc3_pins: mmc3-pins { 854 854 pins = "PI4", "PI5", "PI6", 855 855 "PI7", "PI8", "PI9"; 856 856 function = "mmc3"; ··· 858 858 bias-pull-up; 859 859 }; 860 860 861 - ps20_pins_a: ps20@0 { 861 + ps2_0_pins: ps2-0-pins { 862 862 pins = "PI20", "PI21"; 863 863 function = "ps2"; 864 864 }; 865 865 866 - ps21_pins_a: ps21@0 { 866 + ps2_1_ph_pins: ps2-1-ph-pins { 867 867 pins = "PH12", "PH13"; 868 868 function = "ps2"; 869 869 }; 870 870 871 - pwm0_pins_a: pwm0@0 { 871 + pwm0_pin: pwm0-pin { 872 872 pins = "PB2"; 873 873 function = "pwm"; 874 874 }; 875 875 876 - pwm1_pins_a: pwm1@0 { 876 + pwm1_pin: pwm1-pin { 877 877 pins = "PI3"; 878 878 function = "pwm"; 879 879 }; 880 880 881 - spdif_tx_pins_a: spdif@0 { 881 + spdif_tx_pin: spdif-tx-pin { 882 882 pins = "PB13"; 883 883 function = "spdif"; 884 884 bias-pull-up; 885 885 }; 886 886 887 - spi0_pins_a: spi0@0 { 887 + spi0_pi_pins: spi0-pi-pins { 888 888 pins = "PI11", "PI12", "PI13"; 889 889 function = "spi0"; 890 890 }; 891 891 892 - spi0_cs0_pins_a: spi0_cs0@0 { 892 + spi0_cs0_pi_pin: spi0-cs0-pi-pin { 893 893 pins = "PI10"; 894 894 function = "spi0"; 895 895 }; 896 896 897 - spi0_cs1_pins_a: spi0_cs1@0 { 897 + spi0_cs1_pi_pin: spi0-cs1-pi-pin { 898 898 pins = "PI14"; 899 899 function = "spi0"; 900 900 }; 901 901 902 - spi1_pins_a: spi1@0 { 902 + spi1_pi_pins: spi1-pi-pins { 903 903 pins = "PI17", "PI18", "PI19"; 904 904 function = "spi1"; 905 905 }; 906 906 907 - spi1_cs0_pins_a: spi1_cs0@0 { 907 + spi1_cs0_pi_pin: spi1-cs0-pi-pin { 908 908 pins = "PI16"; 909 909 function = "spi1"; 910 910 }; 911 911 912 - spi2_pins_a: spi2@0 { 913 - pins = "PC20", "PC21", "PC22"; 914 - function = "spi2"; 915 - }; 916 - 917 - spi2_pins_b: spi2@1 { 912 + spi2_pb_pins: spi2-pb-pins { 918 913 pins = "PB15", "PB16", "PB17"; 919 914 function = "spi2"; 920 915 }; 921 916 922 - spi2_cs0_pins_a: spi2_cs0@0 { 923 - pins = "PC19"; 924 - function = "spi2"; 925 - }; 926 - 927 - spi2_cs0_pins_b: spi2_cs0@1 { 917 + spi2_cs0_pb_pin: spi2-cs0-pb-pin { 928 918 pins = "PB14"; 929 919 function = "spi2"; 930 920 }; 931 921 932 - uart0_pins_a: uart0@0 { 922 + spi2_pc_pins: spi2-pc-pins { 923 + pins = "PC20", "PC21", "PC22"; 924 + function = "spi2"; 925 + }; 926 + 927 + spi2_cs0_pc_pin: spi2-cs0-pc-pin { 928 + pins = "PC19"; 929 + function = "spi2"; 930 + }; 931 + 932 + uart0_pb_pins: uart0-pb-pins { 933 933 pins = "PB22", "PB23"; 934 934 function = "uart0"; 935 935 }; 936 936 937 - uart2_pins_a: uart2@0 { 937 + uart2_pi_pins: uart2-pi-pins { 938 938 pins = "PI16", "PI17", "PI18", "PI19"; 939 939 function = "uart2"; 940 940 }; 941 941 942 - uart3_pins_a: uart3@0 { 942 + uart3_pg_pins: uart3-pg-pins { 943 943 pins = "PG6", "PG7", "PG8", "PG9"; 944 944 function = "uart3"; 945 945 }; 946 946 947 - uart3_pins_b: uart3@1 { 947 + uart3_ph_pins: uart3-ph-pins { 948 948 pins = "PH0", "PH1"; 949 949 function = "uart3"; 950 950 }; 951 951 952 - uart4_pins_a: uart4@0 { 952 + uart4_pg_pins: uart4-pg-pins { 953 953 pins = "PG10", "PG11"; 954 954 function = "uart4"; 955 955 }; 956 956 957 - uart4_pins_b: uart4@1 { 957 + uart4_ph_pins: uart4-ph-pins { 958 958 pins = "PH4", "PH5"; 959 959 function = "uart4"; 960 960 }; 961 961 962 - uart5_pins_a: uart5@0 { 962 + uart5_pi_pins: uart5-pi-pins { 963 963 pins = "PI10", "PI11"; 964 964 function = "uart5"; 965 965 }; 966 966 967 - uart6_pins_a: uart6@0 { 967 + uart6_pi_pins: uart6-pi-pins { 968 968 pins = "PI12", "PI13"; 969 969 function = "uart6"; 970 970 }; 971 971 972 - uart7_pins_a: uart7@0 { 972 + uart7_pi_pins: uart7-pi-pins { 973 973 pins = "PI20", "PI21"; 974 974 function = "uart7"; 975 975 };
+1 -1
arch/arm/boot/dts/sunxi-itead-core-common.dtsi
··· 121 121 122 122 &uart0 { 123 123 pinctrl-names = "default"; 124 - pinctrl-0 = <&uart0_pins_a>; 124 + pinctrl-0 = <&uart0_pb_pins>; 125 125 status = "okay"; 126 126 }; 127 127