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: s3c64xx: align pinctrl with dtschema

Align the pin controller related nodes with dtschema. No functional
change expected.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20220111201722.327219-16-krzysztof.kozlowski@canonical.com

Krzysztof Kozlowski 9e47ccc0 901e2878

+125 -125
+2 -2
arch/arm/boot/dts/s3c6410-mini6410.dts
··· 193 193 }; 194 194 195 195 &pinctrl0 { 196 - gpio_leds: gpio-leds { 196 + gpio_leds: gpio-leds-pins { 197 197 samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7"; 198 198 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 199 199 }; 200 200 201 - gpio_keys: gpio-keys { 201 + gpio_keys: gpio-keys-pins { 202 202 samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3", 203 203 "gpn-4", "gpn-5", "gpl-11", "gpl-12"; 204 204 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
+123 -123
arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
··· 16 16 * Pin banks 17 17 */ 18 18 19 - gpa: gpa { 19 + gpa: gpa-gpio-bank { 20 20 gpio-controller; 21 21 #gpio-cells = <2>; 22 22 interrupt-controller; 23 23 #interrupt-cells = <2>; 24 24 }; 25 25 26 - gpb: gpb { 26 + gpb: gpb-gpio-bank { 27 27 gpio-controller; 28 28 #gpio-cells = <2>; 29 29 interrupt-controller; 30 30 #interrupt-cells = <2>; 31 31 }; 32 32 33 - gpc: gpc { 33 + gpc: gpc-gpio-bank { 34 34 gpio-controller; 35 35 #gpio-cells = <2>; 36 36 interrupt-controller; 37 37 #interrupt-cells = <2>; 38 38 }; 39 39 40 - gpd: gpd { 40 + gpd: gpd-gpio-bank { 41 41 gpio-controller; 42 42 #gpio-cells = <2>; 43 43 interrupt-controller; 44 44 #interrupt-cells = <2>; 45 45 }; 46 46 47 - gpe: gpe { 47 + gpe: gpe-gpio-bank { 48 48 gpio-controller; 49 49 #gpio-cells = <2>; 50 50 }; 51 51 52 - gpf: gpf { 53 - gpio-controller; 54 - #gpio-cells = <2>; 55 - interrupt-controller; 56 - #interrupt-cells = <2>; 57 - }; 58 - 59 - gpg: gpg { 52 + gpf: gpf-gpio-bank { 60 53 gpio-controller; 61 54 #gpio-cells = <2>; 62 55 interrupt-controller; 63 56 #interrupt-cells = <2>; 64 57 }; 65 58 66 - gph: gph { 59 + gpg: gpg-gpio-bank { 67 60 gpio-controller; 68 61 #gpio-cells = <2>; 69 62 interrupt-controller; 70 63 #interrupt-cells = <2>; 71 64 }; 72 65 73 - gpi: gpi { 74 - gpio-controller; 75 - #gpio-cells = <2>; 76 - }; 77 - 78 - gpj: gpj { 79 - gpio-controller; 80 - #gpio-cells = <2>; 81 - }; 82 - 83 - gpk: gpk { 84 - gpio-controller; 85 - #gpio-cells = <2>; 86 - }; 87 - 88 - gpl: gpl { 66 + gph: gph-gpio-bank { 89 67 gpio-controller; 90 68 #gpio-cells = <2>; 91 69 interrupt-controller; 92 70 #interrupt-cells = <2>; 93 71 }; 94 72 95 - gpm: gpm { 73 + gpi: gpi-gpio-bank { 74 + gpio-controller; 75 + #gpio-cells = <2>; 76 + }; 77 + 78 + gpj: gpj-gpio-bank { 79 + gpio-controller; 80 + #gpio-cells = <2>; 81 + }; 82 + 83 + gpk: gpk-gpio-bank { 84 + gpio-controller; 85 + #gpio-cells = <2>; 86 + }; 87 + 88 + gpl: gpl-gpio-bank { 96 89 gpio-controller; 97 90 #gpio-cells = <2>; 98 91 interrupt-controller; 99 92 #interrupt-cells = <2>; 100 93 }; 101 94 102 - gpn: gpn { 95 + gpm: gpm-gpio-bank { 103 96 gpio-controller; 104 97 #gpio-cells = <2>; 105 98 interrupt-controller; 106 99 #interrupt-cells = <2>; 107 100 }; 108 101 109 - gpo: gpo { 102 + gpn: gpn-gpio-bank { 110 103 gpio-controller; 111 104 #gpio-cells = <2>; 112 105 interrupt-controller; 113 106 #interrupt-cells = <2>; 114 107 }; 115 108 116 - gpp: gpp { 109 + gpo: gpo-gpio-bank { 117 110 gpio-controller; 118 111 #gpio-cells = <2>; 119 112 interrupt-controller; 120 113 #interrupt-cells = <2>; 121 114 }; 122 115 123 - gpq: gpq { 116 + gpp: gpp-gpio-bank { 117 + gpio-controller; 118 + #gpio-cells = <2>; 119 + interrupt-controller; 120 + #interrupt-cells = <2>; 121 + }; 122 + 123 + gpq: gpq-gpio-bank { 124 124 gpio-controller; 125 125 #gpio-cells = <2>; 126 126 interrupt-controller; ··· 131 131 * Pin groups 132 132 */ 133 133 134 - uart0_data: uart0-data { 134 + uart0_data: uart0-data-pins { 135 135 samsung,pins = "gpa-0", "gpa-1"; 136 136 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 137 137 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 138 138 }; 139 139 140 - uart0_fctl: uart0-fctl { 140 + uart0_fctl: uart0-fctl-pins { 141 141 samsung,pins = "gpa-2", "gpa-3"; 142 142 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 143 143 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 144 144 }; 145 145 146 - uart1_data: uart1-data { 146 + uart1_data: uart1-data-pins { 147 147 samsung,pins = "gpa-4", "gpa-5"; 148 148 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 149 149 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 150 150 }; 151 151 152 - uart1_fctl: uart1-fctl { 152 + uart1_fctl: uart1-fctl-pins { 153 153 samsung,pins = "gpa-6", "gpa-7"; 154 154 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 155 155 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 156 156 }; 157 157 158 - uart2_data: uart2-data { 158 + uart2_data: uart2-data-pins { 159 159 samsung,pins = "gpb-0", "gpb-1"; 160 160 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 161 161 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 162 162 }; 163 163 164 - uart3_data: uart3-data { 164 + uart3_data: uart3-data-pins { 165 165 samsung,pins = "gpb-2", "gpb-3"; 166 166 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 167 167 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 168 168 }; 169 169 170 - ext_dma_0: ext-dma-0 { 170 + ext_dma_0: ext-dma-0-pins { 171 171 samsung,pins = "gpb-0", "gpb-1"; 172 172 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 173 173 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 174 174 }; 175 175 176 - ext_dma_1: ext-dma-1 { 176 + ext_dma_1: ext-dma-1-pins { 177 177 samsung,pins = "gpb-2", "gpb-3"; 178 178 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 179 179 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 180 180 }; 181 181 182 - irda_data_0: irda-data-0 { 182 + irda_data_0: irda-data-0-pins { 183 183 samsung,pins = "gpb-0", "gpb-1"; 184 184 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 185 185 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 186 186 }; 187 187 188 - irda_data_1: irda-data-1 { 188 + irda_data_1: irda-data-1-pins { 189 189 samsung,pins = "gpb-2", "gpb-3"; 190 190 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 191 191 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 192 192 }; 193 193 194 - irda_sdbw: irda-sdbw { 194 + irda_sdbw: irda-sdbw-pins { 195 195 samsung,pins = "gpb-4"; 196 196 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 197 197 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 198 198 }; 199 199 200 - i2c0_bus: i2c0-bus { 200 + i2c0_bus: i2c0-bus-pins { 201 201 samsung,pins = "gpb-5", "gpb-6"; 202 202 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 203 203 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 204 204 }; 205 205 206 - i2c1_bus: i2c1-bus { 206 + i2c1_bus: i2c1-bus-pins { 207 207 /* S3C6410-only */ 208 208 samsung,pins = "gpb-2", "gpb-3"; 209 209 samsung,pin-function = <EXYNOS_PIN_FUNC_6>; 210 210 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 211 211 }; 212 212 213 - spi0_bus: spi0-bus { 213 + spi0_bus: spi0-bus-pins { 214 214 samsung,pins = "gpc-0", "gpc-1", "gpc-2"; 215 215 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 216 216 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 217 217 }; 218 218 219 - spi0_cs: spi0-cs { 219 + spi0_cs: spi0-cs-pins { 220 220 samsung,pins = "gpc-3"; 221 221 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 222 222 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 223 223 }; 224 224 225 - spi1_bus: spi1-bus { 225 + spi1_bus: spi1-bus-pins { 226 226 samsung,pins = "gpc-4", "gpc-5", "gpc-6"; 227 227 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 228 228 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 229 229 }; 230 230 231 - spi1_cs: spi1-cs { 231 + spi1_cs: spi1-cs-pins { 232 232 samsung,pins = "gpc-7"; 233 233 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 234 234 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 235 235 }; 236 236 237 - sd0_cmd: sd0-cmd { 237 + sd0_cmd: sd0-cmd-pins { 238 238 samsung,pins = "gpg-1"; 239 239 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 240 240 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 241 241 }; 242 242 243 - sd0_clk: sd0-clk { 243 + sd0_clk: sd0-clk-pins { 244 244 samsung,pins = "gpg-0"; 245 245 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 246 246 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 247 247 }; 248 248 249 - sd0_bus1: sd0-bus1 { 249 + sd0_bus1: sd0-bus1-pins { 250 250 samsung,pins = "gpg-2"; 251 251 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 252 252 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 253 253 }; 254 254 255 - sd0_bus4: sd0-bus4 { 255 + sd0_bus4: sd0-bus4-pins { 256 256 samsung,pins = "gpg-2", "gpg-3", "gpg-4", "gpg-5"; 257 257 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 258 258 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 259 259 }; 260 260 261 - sd0_cd: sd0-cd { 261 + sd0_cd: sd0-cd-pins { 262 262 samsung,pins = "gpg-6"; 263 263 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 264 264 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 265 265 }; 266 266 267 - sd1_cmd: sd1-cmd { 267 + sd1_cmd: sd1-cmd-pins { 268 268 samsung,pins = "gph-1"; 269 269 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 270 270 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 271 271 }; 272 272 273 - sd1_clk: sd1-clk { 273 + sd1_clk: sd1-clk-pins { 274 274 samsung,pins = "gph-0"; 275 275 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 276 276 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 277 277 }; 278 278 279 - sd1_bus1: sd1-bus1 { 279 + sd1_bus1: sd1-bus1-pins { 280 280 samsung,pins = "gph-2"; 281 281 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 282 282 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 283 283 }; 284 284 285 - sd1_bus4: sd1-bus4 { 285 + sd1_bus4: sd1-bus4-pins { 286 286 samsung,pins = "gph-2", "gph-3", "gph-4", "gph-5"; 287 287 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 288 288 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 289 289 }; 290 290 291 - sd1_bus8: sd1-bus8 { 291 + sd1_bus8: sd1-bus8-pins { 292 292 samsung,pins = "gph-2", "gph-3", "gph-4", "gph-5", 293 293 "gph-6", "gph-7", "gph-8", "gph-9"; 294 294 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 295 295 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 296 296 }; 297 297 298 - sd1_cd: sd1-cd { 298 + sd1_cd: sd1-cd-pins { 299 299 samsung,pins = "gpg-6"; 300 300 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 301 301 samsung,pin-pud = <S3C64XX_PIN_PULL_UP>; 302 302 }; 303 303 304 - sd2_cmd: sd2-cmd { 304 + sd2_cmd: sd2-cmd-pins { 305 305 samsung,pins = "gpc-4"; 306 306 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 307 307 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 308 308 }; 309 309 310 - sd2_clk: sd2-clk { 310 + sd2_clk: sd2-clk-pins { 311 311 samsung,pins = "gpc-5"; 312 312 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 313 313 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 314 314 }; 315 315 316 - sd2_bus1: sd2-bus1 { 316 + sd2_bus1: sd2-bus1-pins { 317 317 samsung,pins = "gph-6"; 318 318 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 319 319 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 320 320 }; 321 321 322 - sd2_bus4: sd2-bus4 { 322 + sd2_bus4: sd2-bus4-pins { 323 323 samsung,pins = "gph-6", "gph-7", "gph-8", "gph-9"; 324 324 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 325 325 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 326 326 }; 327 327 328 - i2s0_bus: i2s0-bus { 328 + i2s0_bus: i2s0-bus-pins { 329 329 samsung,pins = "gpd-0", "gpd-2", "gpd-3", "gpd-4"; 330 330 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 331 331 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 332 332 }; 333 333 334 - i2s0_cdclk: i2s0-cdclk { 334 + i2s0_cdclk: i2s0-cdclk-pins { 335 335 samsung,pins = "gpd-1"; 336 336 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 337 337 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 338 338 }; 339 339 340 - i2s1_bus: i2s1-bus { 340 + i2s1_bus: i2s1-bus-pins { 341 341 samsung,pins = "gpe-0", "gpe-2", "gpe-3", "gpe-4"; 342 342 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 343 343 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 344 344 }; 345 345 346 - i2s1_cdclk: i2s1-cdclk { 346 + i2s1_cdclk: i2s1-cdclk-pins { 347 347 samsung,pins = "gpe-1"; 348 348 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 349 349 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 350 350 }; 351 351 352 - i2s2_bus: i2s2-bus { 352 + i2s2_bus: i2s2-bus-pins { 353 353 /* S3C6410-only */ 354 354 samsung,pins = "gpc-4", "gpc-5", "gpc-6", "gph-6", 355 355 "gph-8", "gph-9"; ··· 357 357 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 358 358 }; 359 359 360 - i2s2_cdclk: i2s2-cdclk { 360 + i2s2_cdclk: i2s2-cdclk-pins { 361 361 /* S3C6410-only */ 362 362 samsung,pins = "gph-7"; 363 363 samsung,pin-function = <EXYNOS_PIN_FUNC_5>; 364 364 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 365 365 }; 366 366 367 - pcm0_bus: pcm0-bus { 367 + pcm0_bus: pcm0-bus-pins { 368 368 samsung,pins = "gpd-0", "gpd-2", "gpd-3", "gpd-4"; 369 369 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 370 370 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 371 371 }; 372 372 373 - pcm0_extclk: pcm0-extclk { 373 + pcm0_extclk: pcm0-extclk-pins { 374 374 samsung,pins = "gpd-1"; 375 375 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 376 376 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 377 377 }; 378 378 379 - pcm1_bus: pcm1-bus { 379 + pcm1_bus: pcm1-bus-pins { 380 380 samsung,pins = "gpe-0", "gpe-2", "gpe-3", "gpe-4"; 381 381 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 382 382 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 383 383 }; 384 384 385 - pcm1_extclk: pcm1-extclk { 385 + pcm1_extclk: pcm1-extclk-pins { 386 386 samsung,pins = "gpe-1"; 387 387 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 388 388 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 389 389 }; 390 390 391 - ac97_bus_0: ac97-bus-0 { 391 + ac97_bus_0: ac97-bus-0-pins { 392 392 samsung,pins = "gpd-0", "gpd-1", "gpd-2", "gpd-3", "gpd-4"; 393 393 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 394 394 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 395 395 }; 396 396 397 - ac97_bus_1: ac97-bus-1 { 397 + ac97_bus_1: ac97-bus-1-pins { 398 398 samsung,pins = "gpe-0", "gpe-1", "gpe-2", "gpe-3", "gpe-4"; 399 399 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 400 400 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 401 401 }; 402 402 403 - cam_port: cam-port { 403 + cam_port: cam-port-pins { 404 404 samsung,pins = "gpf-0", "gpf-1", "gpf-2", "gpf-4", 405 405 "gpf-5", "gpf-6", "gpf-7", "gpf-8", 406 406 "gpf-9", "gpf-10", "gpf-11", "gpf-12"; ··· 408 408 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 409 409 }; 410 410 411 - cam_rst: cam-rst { 411 + cam_rst: cam-rst-pins { 412 412 samsung,pins = "gpf-3"; 413 413 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 414 414 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 415 415 }; 416 416 417 - cam_field: cam-field { 417 + cam_field: cam-field-pins { 418 418 /* S3C6410-only */ 419 419 samsung,pins = "gpb-4"; 420 420 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 421 421 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 422 422 }; 423 423 424 - pwm_extclk: pwm-extclk { 424 + pwm_extclk: pwm-extclk-pins { 425 425 samsung,pins = "gpf-13"; 426 426 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 427 427 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 428 428 }; 429 429 430 - pwm0_out: pwm0-out { 430 + pwm0_out: pwm0-out-pins { 431 431 samsung,pins = "gpf-14"; 432 432 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 433 433 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 434 434 }; 435 435 436 - pwm1_out: pwm1-out { 436 + pwm1_out: pwm1-out-pins { 437 437 samsung,pins = "gpf-15"; 438 438 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 439 439 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 440 440 }; 441 441 442 - clkout0: clkout-0 { 442 + clkout0: clkout-0-pins { 443 443 samsung,pins = "gpf-14"; 444 444 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 445 445 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 446 446 }; 447 447 448 - keypad_col0_0: keypad-col0-0 { 448 + keypad_col0_0: keypad-col0-0-pins { 449 449 samsung,pins = "gph-0"; 450 450 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 451 451 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 452 452 }; 453 453 454 - keypad_col1_0: keypad-col1-0 { 454 + keypad_col1_0: keypad-col1-0-pins { 455 455 samsung,pins = "gph-1"; 456 456 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 457 457 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 458 458 }; 459 459 460 - keypad_col2_0: keypad-col2-0 { 460 + keypad_col2_0: keypad-col2-0-pins { 461 461 samsung,pins = "gph-2"; 462 462 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 463 463 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 464 464 }; 465 465 466 - keypad_col3_0: keypad-col3-0 { 466 + keypad_col3_0: keypad-col3-0-pins { 467 467 samsung,pins = "gph-3"; 468 468 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 469 469 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 470 470 }; 471 471 472 - keypad_col4_0: keypad-col4-0 { 472 + keypad_col4_0: keypad-col4-0-pins { 473 473 samsung,pins = "gph-4"; 474 474 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 475 475 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 476 476 }; 477 477 478 - keypad_col5_0: keypad-col5-0 { 478 + keypad_col5_0: keypad-col5-0-pins { 479 479 samsung,pins = "gph-5"; 480 480 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 481 481 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 482 482 }; 483 483 484 - keypad_col6_0: keypad-col6-0 { 484 + keypad_col6_0: keypad-col6-0-pins { 485 485 samsung,pins = "gph-6"; 486 486 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 487 487 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 488 488 }; 489 489 490 - keypad_col7_0: keypad-col7-0 { 490 + keypad_col7_0: keypad-col7-0-pins { 491 491 samsung,pins = "gph-7"; 492 492 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 493 493 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 494 494 }; 495 495 496 - keypad_col0_1: keypad-col0-1 { 496 + keypad_col0_1: keypad-col0-1-pins { 497 497 samsung,pins = "gpl-0"; 498 498 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 499 499 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 500 500 }; 501 501 502 - keypad_col1_1: keypad-col1-1 { 502 + keypad_col1_1: keypad-col1-1-pins { 503 503 samsung,pins = "gpl-1"; 504 504 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 505 505 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 506 506 }; 507 507 508 - keypad_col2_1: keypad-col2-1 { 508 + keypad_col2_1: keypad-col2-1-pins { 509 509 samsung,pins = "gpl-2"; 510 510 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 511 511 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 512 512 }; 513 513 514 - keypad_col3_1: keypad-col3-1 { 514 + keypad_col3_1: keypad-col3-1-pins { 515 515 samsung,pins = "gpl-3"; 516 516 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 517 517 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 518 518 }; 519 519 520 - keypad_col4_1: keypad-col4-1 { 520 + keypad_col4_1: keypad-col4-1-pins { 521 521 samsung,pins = "gpl-4"; 522 522 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 523 523 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 524 524 }; 525 525 526 - keypad_col5_1: keypad-col5-1 { 526 + keypad_col5_1: keypad-col5-1-pins { 527 527 samsung,pins = "gpl-5"; 528 528 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 529 529 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 530 530 }; 531 531 532 - keypad_col6_1: keypad-col6-1 { 532 + keypad_col6_1: keypad-col6-1-pins { 533 533 samsung,pins = "gpl-6"; 534 534 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 535 535 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 536 536 }; 537 537 538 - keypad_col7_1: keypad-col7-1 { 538 + keypad_col7_1: keypad-col7-1-pins { 539 539 samsung,pins = "gpl-7"; 540 540 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 541 541 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 542 542 }; 543 543 544 - keypad_row0_0: keypad-row0-0 { 544 + keypad_row0_0: keypad-row0-0-pins { 545 545 samsung,pins = "gpk-8"; 546 546 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 547 547 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 548 548 }; 549 549 550 - keypad_row1_0: keypad-row1-0 { 550 + keypad_row1_0: keypad-row1-0-pins { 551 551 samsung,pins = "gpk-9"; 552 552 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 553 553 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 554 554 }; 555 555 556 - keypad_row2_0: keypad-row2-0 { 556 + keypad_row2_0: keypad-row2-0-pins { 557 557 samsung,pins = "gpk-10"; 558 558 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 559 559 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 560 560 }; 561 561 562 - keypad_row3_0: keypad-row3-0 { 562 + keypad_row3_0: keypad-row3-0-pins { 563 563 samsung,pins = "gpk-11"; 564 564 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 565 565 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 566 566 }; 567 567 568 - keypad_row4_0: keypad-row4-0 { 568 + keypad_row4_0: keypad-row4-0-pins { 569 569 samsung,pins = "gpk-12"; 570 570 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 571 571 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 572 572 }; 573 573 574 - keypad_row5_0: keypad-row5-0 { 574 + keypad_row5_0: keypad-row5-0-pins { 575 575 samsung,pins = "gpk-13"; 576 576 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 577 577 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 578 578 }; 579 579 580 - keypad_row6_0: keypad-row6-0 { 580 + keypad_row6_0: keypad-row6-0-pins { 581 581 samsung,pins = "gpk-14"; 582 582 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 583 583 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 584 584 }; 585 585 586 - keypad_row7_0: keypad-row7-0 { 586 + keypad_row7_0: keypad-row7-0-pins { 587 587 samsung,pins = "gpk-15"; 588 588 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 589 589 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 590 590 }; 591 591 592 - keypad_row0_1: keypad-row0-1 { 592 + keypad_row0_1: keypad-row0-1-pins { 593 593 samsung,pins = "gpn-0"; 594 594 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 595 595 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 596 596 }; 597 597 598 - keypad_row1_1: keypad-row1-1 { 598 + keypad_row1_1: keypad-row1-1-pins { 599 599 samsung,pins = "gpn-1"; 600 600 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 601 601 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 602 602 }; 603 603 604 - keypad_row2_1: keypad-row2-1 { 604 + keypad_row2_1: keypad-row2-1-pins { 605 605 samsung,pins = "gpn-2"; 606 606 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 607 607 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 608 608 }; 609 609 610 - keypad_row3_1: keypad-row3-1 { 610 + keypad_row3_1: keypad-row3-1-pins { 611 611 samsung,pins = "gpn-3"; 612 612 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 613 613 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 614 614 }; 615 615 616 - keypad_row4_1: keypad-row4-1 { 616 + keypad_row4_1: keypad-row4-1-pins { 617 617 samsung,pins = "gpn-4"; 618 618 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 619 619 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 620 620 }; 621 621 622 - keypad_row5_1: keypad-row5-1 { 622 + keypad_row5_1: keypad-row5-1-pins { 623 623 samsung,pins = "gpn-5"; 624 624 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 625 625 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 626 626 }; 627 627 628 - keypad_row6_1: keypad-row6-1 { 628 + keypad_row6_1: keypad-row6-1-pins { 629 629 samsung,pins = "gpn-6"; 630 630 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 631 631 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 632 632 }; 633 633 634 - keypad_row7_1: keypad-row7-1 { 634 + keypad_row7_1: keypad-row7-1-pins { 635 635 samsung,pins = "gpn-7"; 636 636 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 637 637 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 638 638 }; 639 639 640 - lcd_ctrl: lcd-ctrl { 640 + lcd_ctrl: lcd-ctrl-pins { 641 641 samsung,pins = "gpj-8", "gpj-9", "gpj-10", "gpj-11"; 642 642 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 643 643 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 644 644 }; 645 645 646 - lcd_data16: lcd-data-width16 { 646 + lcd_data16: lcd-data-width16-pins { 647 647 samsung,pins = "gpi-3", "gpi-4", "gpi-5", "gpi-6", 648 648 "gpi-7", "gpi-10", "gpi-11", "gpi-12", 649 649 "gpi-13", "gpi-14", "gpi-15", "gpj-3", ··· 652 652 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 653 653 }; 654 654 655 - lcd_data18: lcd-data-width18 { 655 + lcd_data18: lcd-data-width18-pins { 656 656 samsung,pins = "gpi-2", "gpi-3", "gpi-4", "gpi-5", 657 657 "gpi-6", "gpi-7", "gpi-10", "gpi-11", 658 658 "gpi-12", "gpi-13", "gpi-14", "gpi-15", ··· 662 662 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 663 663 }; 664 664 665 - lcd_data24: lcd-data-width24 { 665 + lcd_data24: lcd-data-width24-pins { 666 666 samsung,pins = "gpi-0", "gpi-1", "gpi-2", "gpi-3", 667 667 "gpi-4", "gpi-5", "gpi-6", "gpi-7", 668 668 "gpi-8", "gpi-9", "gpi-10", "gpi-11", ··· 673 673 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 674 674 }; 675 675 676 - hsi_bus: hsi-bus { 676 + hsi_bus: hsi-bus-pins { 677 677 samsung,pins = "gpk-0", "gpk-1", "gpk-2", "gpk-3", 678 678 "gpk-4", "gpk-5", "gpk-6", "gpk-7"; 679 679 samsung,pin-function = <EXYNOS_PIN_FUNC_3>;