ARM: dts: exynos: align pinctrl with dtschema in Exynos4210

+15 -15

arch/arm/boot/dts/exynos4210-i9100.dts

··· 672 672 pinctrl-names = "default"; 673 673 pinctrl-0 = <&sleep0>; 674 674 675 - sleep0: sleep-states { 676 - gpa0-0 { 675 + sleep0: sleep-state { 676 + gpa0-0-pin { 677 677 samsung,pins = "gpa0-0"; 678 678 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_INPUT>; 679 679 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>; 680 680 }; 681 681 682 - gpa0-1 { 682 + gpa0-1-pin { 683 683 samsung,pins = "gpa0-1"; 684 684 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_OUT0>; 685 685 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>; 686 686 }; 687 687 688 - gpa0-2 { 688 + gpa0-2-pin { 689 689 samsung,pins = "gpa0-2"; 690 690 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_INPUT>; 691 691 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>; 692 692 }; 693 693 694 - gpa0-3 { 694 + gpa0-3-pin { 695 695 samsung,pins = "gpa0-3"; 696 696 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_OUT1>; 697 697 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>; ··· 700 700 }; 701 701 702 702 &pinctrl_1 { 703 - mhl_int: mhl-int { 703 + mhl_int: mhl-int-pins { 704 704 samsung,pins = "gpf3-5"; 705 705 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 706 706 }; 707 707 708 - i2c_mhl_bus: i2c-mhl-bus { 708 + i2c_mhl_bus: i2c-mhl-bus-pins { 709 709 samsung,pins = "gpf0-4", "gpf0-6"; 710 710 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 711 711 samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; 712 712 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 713 713 }; 714 714 715 - usb_sel: usb-sel { 715 + usb_sel: usb-sel-pins { 716 716 samsung,pins = "gpl0-6"; 717 717 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 718 718 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; ··· 720 720 samsung,pin-val = <0>; 721 721 }; 722 722 723 - bt_en: bt-en { 723 + bt_en: bt-en-pins { 724 724 samsung,pins = "gpl0-4"; 725 725 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 726 726 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; ··· 728 728 samsung,pin-val = <0>; 729 729 }; 730 730 731 - bt_res: bt-res { 731 + bt_res: bt-res-pins { 732 732 samsung,pins = "gpl1-0"; 733 733 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 734 734 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; ··· 736 736 samsung,pin-val = <0>; 737 737 }; 738 738 739 - otg_gp: otg-gp { 739 + otg_gp: otg-gp-pins { 740 740 samsung,pins = "gpx3-3"; 741 741 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 742 742 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; ··· 744 744 samsung,pin-val = <0>; 745 745 }; 746 746 747 - mag_mhl_gpio: mag-mhl { 747 + mag_mhl_gpio: mag-mhl-pins { 748 748 samsung,pins = "gpd0-2"; 749 749 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 750 750 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 751 751 }; 752 752 753 - max8997_irq: max8997-irq { 753 + max8997_irq: max8997-irq-pins { 754 754 samsung,pins = "gpx0-7"; 755 755 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 756 756 }; 757 757 758 - max17042_fuel_irq: max17042-fuel-irq { 758 + max17042_fuel_irq: max17042-fuel-irq-pins { 759 759 samsung,pins = "gpx2-3"; 760 760 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 761 761 }; 762 762 763 - tsp224_irq: tsp224-irq { 763 + tsp224_irq: tsp224-irq-pins { 764 764 samsung,pins = "gpx0-4"; 765 765 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 766 766 };

+1 -1

arch/arm/boot/dts/exynos4210-origen.dts

··· 316 316 }; 317 317 318 318 &pinctrl_1 { 319 - max8997_irq: max8997-irq { 319 + max8997_irq: max8997-irq-pins { 320 320 samsung,pins = "gpx0-3", "gpx0-4"; 321 321 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 322 322 };

+113 -113

arch/arm/boot/dts/exynos4210-pinctrl.dtsi

··· 14 14 #include <dt-bindings/pinctrl/samsung.h> 15 15 16 16 &pinctrl_0 { 17 - gpa0: gpa0 { 17 + gpa0: gpa0-gpio-bank { 18 18 gpio-controller; 19 19 #gpio-cells = <2>; 20 20 ··· 22 22 #interrupt-cells = <2>; 23 23 }; 24 24 25 - gpa1: gpa1 { 25 + gpa1: gpa1-gpio-bank { 26 26 gpio-controller; 27 27 #gpio-cells = <2>; 28 28 ··· 30 30 #interrupt-cells = <2>; 31 31 }; 32 32 33 - gpb: gpb { 33 + gpb: gpb-gpio-bank { 34 34 gpio-controller; 35 35 #gpio-cells = <2>; 36 36 ··· 38 38 #interrupt-cells = <2>; 39 39 }; 40 40 41 - gpc0: gpc0 { 41 + gpc0: gpc0-gpio-bank { 42 42 gpio-controller; 43 43 #gpio-cells = <2>; 44 44 ··· 46 46 #interrupt-cells = <2>; 47 47 }; 48 48 49 - gpc1: gpc1 { 49 + gpc1: gpc1-gpio-bank { 50 50 gpio-controller; 51 51 #gpio-cells = <2>; 52 52 ··· 54 54 #interrupt-cells = <2>; 55 55 }; 56 56 57 - gpd0: gpd0 { 57 + gpd0: gpd0-gpio-bank { 58 58 gpio-controller; 59 59 #gpio-cells = <2>; 60 60 ··· 62 62 #interrupt-cells = <2>; 63 63 }; 64 64 65 - gpd1: gpd1 { 65 + gpd1: gpd1-gpio-bank { 66 66 gpio-controller; 67 67 #gpio-cells = <2>; 68 68 ··· 70 70 #interrupt-cells = <2>; 71 71 }; 72 72 73 - gpe0: gpe0 { 73 + gpe0: gpe0-gpio-bank { 74 74 gpio-controller; 75 75 #gpio-cells = <2>; 76 76 ··· 78 78 #interrupt-cells = <2>; 79 79 }; 80 80 81 - gpe1: gpe1 { 81 + gpe1: gpe1-gpio-bank { 82 82 gpio-controller; 83 83 #gpio-cells = <2>; 84 84 ··· 86 86 #interrupt-cells = <2>; 87 87 }; 88 88 89 - gpe2: gpe2 { 89 + gpe2: gpe2-gpio-bank { 90 90 gpio-controller; 91 91 #gpio-cells = <2>; 92 92 ··· 94 94 #interrupt-cells = <2>; 95 95 }; 96 96 97 - gpe3: gpe3 { 97 + gpe3: gpe3-gpio-bank { 98 98 gpio-controller; 99 99 #gpio-cells = <2>; 100 100 ··· 102 102 #interrupt-cells = <2>; 103 103 }; 104 104 105 - gpe4: gpe4 { 105 + gpe4: gpe4-gpio-bank { 106 106 gpio-controller; 107 107 #gpio-cells = <2>; 108 108 ··· 110 110 #interrupt-cells = <2>; 111 111 }; 112 112 113 - gpf0: gpf0 { 113 + gpf0: gpf0-gpio-bank { 114 114 gpio-controller; 115 115 #gpio-cells = <2>; 116 116 ··· 118 118 #interrupt-cells = <2>; 119 119 }; 120 120 121 - gpf1: gpf1 { 121 + gpf1: gpf1-gpio-bank { 122 122 gpio-controller; 123 123 #gpio-cells = <2>; 124 124 ··· 126 126 #interrupt-cells = <2>; 127 127 }; 128 128 129 - gpf2: gpf2 { 129 + gpf2: gpf2-gpio-bank { 130 130 gpio-controller; 131 131 #gpio-cells = <2>; 132 132 ··· 134 134 #interrupt-cells = <2>; 135 135 }; 136 136 137 - gpf3: gpf3 { 137 + gpf3: gpf3-gpio-bank { 138 138 gpio-controller; 139 139 #gpio-cells = <2>; 140 140 ··· 142 142 #interrupt-cells = <2>; 143 143 }; 144 144 145 - uart0_data: uart0-data { 145 + uart0_data: uart0-data-pins { 146 146 samsung,pins = "gpa0-0", "gpa0-1"; 147 147 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 148 148 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 149 149 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 150 150 }; 151 151 152 - uart0_fctl: uart0-fctl { 152 + uart0_fctl: uart0-fctl-pins { 153 153 samsung,pins = "gpa0-2", "gpa0-3"; 154 154 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 155 155 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 156 156 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 157 157 }; 158 158 159 - uart1_data: uart1-data { 159 + uart1_data: uart1-data-pins { 160 160 samsung,pins = "gpa0-4", "gpa0-5"; 161 161 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 162 162 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 163 163 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 164 164 }; 165 165 166 - uart1_fctl: uart1-fctl { 166 + uart1_fctl: uart1-fctl-pins { 167 167 samsung,pins = "gpa0-6", "gpa0-7"; 168 168 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 169 169 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 170 170 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 171 171 }; 172 172 173 - i2c2_bus: i2c2-bus { 173 + i2c2_bus: i2c2-bus-pins { 174 174 samsung,pins = "gpa0-6", "gpa0-7"; 175 175 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 176 176 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 177 177 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 178 178 }; 179 179 180 - uart2_data: uart2-data { 180 + uart2_data: uart2-data-pins { 181 181 samsung,pins = "gpa1-0", "gpa1-1"; 182 182 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 183 183 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 184 184 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 185 185 }; 186 186 187 - uart2_fctl: uart2-fctl { 187 + uart2_fctl: uart2-fctl-pins { 188 188 samsung,pins = "gpa1-2", "gpa1-3"; 189 189 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 190 190 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 191 191 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 192 192 }; 193 193 194 - uart_audio_a: uart-audio-a { 194 + uart_audio_a: uart-audio-a-pins { 195 195 samsung,pins = "gpa1-0", "gpa1-1"; 196 196 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 197 197 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 198 198 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 199 199 }; 200 200 201 - i2c3_bus: i2c3-bus { 201 + i2c3_bus: i2c3-bus-pins { 202 202 samsung,pins = "gpa1-2", "gpa1-3"; 203 203 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 204 204 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 205 205 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 206 206 }; 207 207 208 - uart3_data: uart3-data { 208 + uart3_data: uart3-data-pins { 209 209 samsung,pins = "gpa1-4", "gpa1-5"; 210 210 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 211 211 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 212 212 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 213 213 }; 214 214 215 - uart_audio_b: uart-audio-b { 215 + uart_audio_b: uart-audio-b-pins { 216 216 samsung,pins = "gpa1-4", "gpa1-5"; 217 217 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 218 218 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 219 219 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 220 220 }; 221 221 222 - spi0_bus: spi0-bus { 222 + spi0_bus: spi0-bus-pins { 223 223 samsung,pins = "gpb-0", "gpb-2", "gpb-3"; 224 224 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 225 225 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 226 226 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 227 227 }; 228 228 229 - i2c4_bus: i2c4-bus { 229 + i2c4_bus: i2c4-bus-pins { 230 230 samsung,pins = "gpb-2", "gpb-3"; 231 231 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 232 232 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 233 233 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 234 234 }; 235 235 236 - spi1_bus: spi1-bus { 236 + spi1_bus: spi1-bus-pins { 237 237 samsung,pins = "gpb-4", "gpb-6", "gpb-7"; 238 238 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 239 239 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 240 240 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 241 241 }; 242 242 243 - i2c5_bus: i2c5-bus { 243 + i2c5_bus: i2c5-bus-pins { 244 244 samsung,pins = "gpb-6", "gpb-7"; 245 245 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 246 246 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 247 247 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 248 248 }; 249 249 250 - i2s1_bus: i2s1-bus { 250 + i2s1_bus: i2s1-bus-pins { 251 251 samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", 252 252 "gpc0-4"; 253 253 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; ··· 255 255 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 256 256 }; 257 257 258 - pcm1_bus: pcm1-bus { 258 + pcm1_bus: pcm1-bus-pins { 259 259 samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", 260 260 "gpc0-4"; 261 261 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; ··· 263 263 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 264 264 }; 265 265 266 - ac97_bus: ac97-bus { 266 + ac97_bus: ac97-bus-pins { 267 267 samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", 268 268 "gpc0-4"; 269 269 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; ··· 271 271 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 272 272 }; 273 273 274 - i2s2_bus: i2s2-bus { 274 + i2s2_bus: i2s2-bus-pins { 275 275 samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3", 276 276 "gpc1-4"; 277 277 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; ··· 279 279 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 280 280 }; 281 281 282 - pcm2_bus: pcm2-bus { 282 + pcm2_bus: pcm2-bus-pins { 283 283 samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3", 284 284 "gpc1-4"; 285 285 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; ··· 287 287 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 288 288 }; 289 289 290 - spdif_bus: spdif-bus { 290 + spdif_bus: spdif-bus-pins { 291 291 samsung,pins = "gpc1-0", "gpc1-1"; 292 292 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 293 293 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 294 294 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 295 295 }; 296 296 297 - i2c6_bus: i2c6-bus { 297 + i2c6_bus: i2c6-bus-pins { 298 298 samsung,pins = "gpc1-3", "gpc1-4"; 299 299 samsung,pin-function = <EXYNOS_PIN_FUNC_4>; 300 300 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 301 301 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 302 302 }; 303 303 304 - spi2_bus: spi2-bus { 304 + spi2_bus: spi2-bus-pins { 305 305 samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4"; 306 306 samsung,pin-function = <EXYNOS_PIN_FUNC_5>; 307 307 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 308 308 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 309 309 }; 310 310 311 - i2c7_bus: i2c7-bus { 311 + i2c7_bus: i2c7-bus-pins { 312 312 samsung,pins = "gpd0-2", "gpd0-3"; 313 313 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 314 314 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 315 315 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 316 316 }; 317 317 318 - i2c0_bus: i2c0-bus { 318 + i2c0_bus: i2c0-bus-pins { 319 319 samsung,pins = "gpd1-0", "gpd1-1"; 320 320 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 321 321 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 322 322 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 323 323 }; 324 324 325 - i2c1_bus: i2c1-bus { 325 + i2c1_bus: i2c1-bus-pins { 326 326 samsung,pins = "gpd1-2", "gpd1-3"; 327 327 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 328 328 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 329 329 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 330 330 }; 331 331 332 - pwm0_out: pwm0-out { 332 + pwm0_out: pwm0-out-pins { 333 333 samsung,pins = "gpd0-0"; 334 334 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 335 335 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 336 336 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 337 337 }; 338 338 339 - pwm1_out: pwm1-out { 339 + pwm1_out: pwm1-out-pins { 340 340 samsung,pins = "gpd0-1"; 341 341 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 342 342 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 343 343 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 344 344 }; 345 345 346 - pwm2_out: pwm2-out { 346 + pwm2_out: pwm2-out-pins { 347 347 samsung,pins = "gpd0-2"; 348 348 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 349 349 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 350 350 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 351 351 }; 352 352 353 - pwm3_out: pwm3-out { 353 + pwm3_out: pwm3-out-pins { 354 354 samsung,pins = "gpd0-3"; 355 355 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 356 356 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 357 357 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 358 358 }; 359 359 360 - lcd_ctrl: lcd-ctrl { 360 + lcd_ctrl: lcd-ctrl-pins { 361 361 samsung,pins = "gpd0-0", "gpd0-1"; 362 362 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 363 363 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 364 364 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 365 365 }; 366 366 367 - lcd_sync: lcd-sync { 367 + lcd_sync: lcd-sync-pins { 368 368 samsung,pins = "gpf0-0", "gpf0-1"; 369 369 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 370 370 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 371 371 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 372 372 }; 373 373 374 - lcd_en: lcd-en { 374 + lcd_en: lcd-en-pins { 375 375 samsung,pins = "gpe3-4"; 376 376 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 377 377 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 378 378 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 379 379 }; 380 380 381 - lcd_clk: lcd-clk { 381 + lcd_clk: lcd-clk-pins { 382 382 samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3"; 383 383 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 384 384 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 385 385 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 386 386 }; 387 387 388 - lcd_data16: lcd-data-width16 { 388 + lcd_data16: lcd-data-width16-pins { 389 389 samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2", 390 390 "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0", 391 391 "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7", ··· 395 395 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 396 396 }; 397 397 398 - lcd_data18: lcd-data-width18 { 398 + lcd_data18: lcd-data-width18-pins { 399 399 samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1", 400 400 "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7", 401 401 "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3", ··· 406 406 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 407 407 }; 408 408 409 - lcd_data24: lcd-data-width24 { 409 + lcd_data24: lcd-data-width24-pins { 410 410 samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7", 411 411 "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3", 412 412 "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7", ··· 420 420 }; 421 421 422 422 &pinctrl_1 { 423 - gpj0: gpj0 { 423 + gpj0: gpj0-gpio-bank { 424 424 gpio-controller; 425 425 #gpio-cells = <2>; 426 426 ··· 428 428 #interrupt-cells = <2>; 429 429 }; 430 430 431 - gpj1: gpj1 { 431 + gpj1: gpj1-gpio-bank { 432 432 gpio-controller; 433 433 #gpio-cells = <2>; 434 434 ··· 436 436 #interrupt-cells = <2>; 437 437 }; 438 438 439 - gpk0: gpk0 { 439 + gpk0: gpk0-gpio-bank { 440 440 gpio-controller; 441 441 #gpio-cells = <2>; 442 442 ··· 444 444 #interrupt-cells = <2>; 445 445 }; 446 446 447 - gpk1: gpk1 { 447 + gpk1: gpk1-gpio-bank { 448 448 gpio-controller; 449 449 #gpio-cells = <2>; 450 450 ··· 452 452 #interrupt-cells = <2>; 453 453 }; 454 454 455 - gpk2: gpk2 { 455 + gpk2: gpk2-gpio-bank { 456 456 gpio-controller; 457 457 #gpio-cells = <2>; 458 458 ··· 460 460 #interrupt-cells = <2>; 461 461 }; 462 462 463 - gpk3: gpk3 { 463 + gpk3: gpk3-gpio-bank { 464 464 gpio-controller; 465 465 #gpio-cells = <2>; 466 466 ··· 468 468 #interrupt-cells = <2>; 469 469 }; 470 470 471 - gpl0: gpl0 { 471 + gpl0: gpl0-gpio-bank { 472 472 gpio-controller; 473 473 #gpio-cells = <2>; 474 474 ··· 476 476 #interrupt-cells = <2>; 477 477 }; 478 478 479 - gpl1: gpl1 { 479 + gpl1: gpl1-gpio-bank { 480 480 gpio-controller; 481 481 #gpio-cells = <2>; 482 482 ··· 484 484 #interrupt-cells = <2>; 485 485 }; 486 486 487 - gpl2: gpl2 { 487 + gpl2: gpl2-gpio-bank { 488 488 gpio-controller; 489 489 #gpio-cells = <2>; 490 490 ··· 492 492 #interrupt-cells = <2>; 493 493 }; 494 494 495 - gpy0: gpy0 { 495 + gpy0: gpy0-gpio-bank { 496 496 gpio-controller; 497 497 #gpio-cells = <2>; 498 498 }; 499 499 500 - gpy1: gpy1 { 500 + gpy1: gpy1-gpio-bank { 501 501 gpio-controller; 502 502 #gpio-cells = <2>; 503 503 }; 504 504 505 - gpy2: gpy2 { 505 + gpy2: gpy2-gpio-bank { 506 506 gpio-controller; 507 507 #gpio-cells = <2>; 508 508 }; 509 509 510 - gpy3: gpy3 { 510 + gpy3: gpy3-gpio-bank { 511 511 gpio-controller; 512 512 #gpio-cells = <2>; 513 513 }; 514 514 515 - gpy4: gpy4 { 515 + gpy4: gpy4-gpio-bank { 516 516 gpio-controller; 517 517 #gpio-cells = <2>; 518 518 }; 519 519 520 - gpy5: gpy5 { 520 + gpy5: gpy5-gpio-bank { 521 521 gpio-controller; 522 522 #gpio-cells = <2>; 523 523 }; 524 524 525 - gpy6: gpy6 { 525 + gpy6: gpy6-gpio-bank { 526 526 gpio-controller; 527 527 #gpio-cells = <2>; 528 528 }; 529 529 530 - gpx0: gpx0 { 530 + gpx0: gpx0-gpio-bank { 531 531 gpio-controller; 532 532 #gpio-cells = <2>; 533 533 ··· 544 544 #interrupt-cells = <2>; 545 545 }; 546 546 547 - gpx1: gpx1 { 547 + gpx1: gpx1-gpio-bank { 548 548 gpio-controller; 549 549 #gpio-cells = <2>; 550 550 ··· 561 561 #interrupt-cells = <2>; 562 562 }; 563 563 564 - gpx2: gpx2 { 564 + gpx2: gpx2-gpio-bank { 565 565 gpio-controller; 566 566 #gpio-cells = <2>; 567 567 ··· 569 569 #interrupt-cells = <2>; 570 570 }; 571 571 572 - gpx3: gpx3 { 572 + gpx3: gpx3-gpio-bank { 573 573 gpio-controller; 574 574 #gpio-cells = <2>; 575 575 ··· 577 577 #interrupt-cells = <2>; 578 578 }; 579 579 580 - sd0_clk: sd0-clk { 580 + sd0_clk: sd0-clk-pins { 581 581 samsung,pins = "gpk0-0"; 582 582 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 583 583 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 584 584 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 585 585 }; 586 586 587 - sd0_cmd: sd0-cmd { 587 + sd0_cmd: sd0-cmd-pins { 588 588 samsung,pins = "gpk0-1"; 589 589 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 590 590 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 591 591 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 592 592 }; 593 593 594 - sd0_cd: sd0-cd { 594 + sd0_cd: sd0-cd-pins { 595 595 samsung,pins = "gpk0-2"; 596 596 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 597 597 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 598 598 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 599 599 }; 600 600 601 - sd0_bus1: sd0-bus-width1 { 601 + sd0_bus1: sd0-bus-width1-pins { 602 602 samsung,pins = "gpk0-3"; 603 603 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 604 604 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 605 605 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 606 606 }; 607 607 608 - sd0_bus4: sd0-bus-width4 { 608 + sd0_bus4: sd0-bus-width4-pins { 609 609 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; 610 610 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 611 611 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 612 612 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 613 613 }; 614 614 615 - sd0_bus8: sd0-bus-width8 { 615 + sd0_bus8: sd0-bus-width8-pins { 616 616 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; 617 617 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 618 618 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 619 619 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 620 620 }; 621 621 622 - sd4_clk: sd4-clk { 622 + sd4_clk: sd4-clk-pins { 623 623 samsung,pins = "gpk0-0"; 624 624 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 625 625 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 626 626 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 627 627 }; 628 628 629 - sd4_cmd: sd4-cmd { 629 + sd4_cmd: sd4-cmd-pins { 630 630 samsung,pins = "gpk0-1"; 631 631 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 632 632 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 633 633 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 634 634 }; 635 635 636 - sd4_cd: sd4-cd { 636 + sd4_cd: sd4-cd-pins { 637 637 samsung,pins = "gpk0-2"; 638 638 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 639 639 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 640 640 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 641 641 }; 642 642 643 - sd4_bus1: sd4-bus-width1 { 643 + sd4_bus1: sd4-bus-width1-pins { 644 644 samsung,pins = "gpk0-3"; 645 645 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 646 646 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 647 647 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 648 648 }; 649 649 650 - sd4_bus4: sd4-bus-width4 { 650 + sd4_bus4: sd4-bus-width4-pins { 651 651 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; 652 652 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 653 653 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 654 654 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 655 655 }; 656 656 657 - sd4_bus8: sd4-bus-width8 { 657 + sd4_bus8: sd4-bus-width8-pins { 658 658 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; 659 659 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 660 660 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 661 661 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 662 662 }; 663 663 664 - sd1_clk: sd1-clk { 664 + sd1_clk: sd1-clk-pins { 665 665 samsung,pins = "gpk1-0"; 666 666 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 667 667 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 668 668 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 669 669 }; 670 670 671 - sd1_cmd: sd1-cmd { 671 + sd1_cmd: sd1-cmd-pins { 672 672 samsung,pins = "gpk1-1"; 673 673 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 674 674 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 675 675 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 676 676 }; 677 677 678 - sd1_cd: sd1-cd { 678 + sd1_cd: sd1-cd-pins { 679 679 samsung,pins = "gpk1-2"; 680 680 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 681 681 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 682 682 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 683 683 }; 684 684 685 - sd1_bus1: sd1-bus-width1 { 685 + sd1_bus1: sd1-bus-width1-pins { 686 686 samsung,pins = "gpk1-3"; 687 687 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 688 688 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 689 689 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 690 690 }; 691 691 692 - sd1_bus4: sd1-bus-width4 { 692 + sd1_bus4: sd1-bus-width4-pins { 693 693 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; 694 694 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 695 695 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 696 696 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 697 697 }; 698 698 699 - sd2_clk: sd2-clk { 699 + sd2_clk: sd2-clk-pins { 700 700 samsung,pins = "gpk2-0"; 701 701 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 702 702 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 703 703 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 704 704 }; 705 705 706 - sd2_cmd: sd2-cmd { 706 + sd2_cmd: sd2-cmd-pins { 707 707 samsung,pins = "gpk2-1"; 708 708 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 709 709 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 710 710 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 711 711 }; 712 712 713 - sd2_cd: sd2-cd { 713 + sd2_cd: sd2-cd-pins { 714 714 samsung,pins = "gpk2-2"; 715 715 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 716 716 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 717 717 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 718 718 }; 719 719 720 - sd2_bus1: sd2-bus-width1 { 720 + sd2_bus1: sd2-bus-width1-pins { 721 721 samsung,pins = "gpk2-3"; 722 722 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 723 723 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 724 724 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 725 725 }; 726 726 727 - sd2_bus4: sd2-bus-width4 { 727 + sd2_bus4: sd2-bus-width4-pins { 728 728 samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6"; 729 729 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 730 730 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 731 731 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 732 732 }; 733 733 734 - sd2_bus8: sd2-bus-width8 { 734 + sd2_bus8: sd2-bus-width8-pins { 735 735 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; 736 736 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 737 737 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 738 738 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 739 739 }; 740 740 741 - sd3_clk: sd3-clk { 741 + sd3_clk: sd3-clk-pins { 742 742 samsung,pins = "gpk3-0"; 743 743 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 744 744 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 745 745 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 746 746 }; 747 747 748 - sd3_cmd: sd3-cmd { 748 + sd3_cmd: sd3-cmd-pins { 749 749 samsung,pins = "gpk3-1"; 750 750 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 751 751 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 752 752 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 753 753 }; 754 754 755 - sd3_cd: sd3-cd { 755 + sd3_cd: sd3-cd-pins { 756 756 samsung,pins = "gpk3-2"; 757 757 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 758 758 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 759 759 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 760 760 }; 761 761 762 - sd3_bus1: sd3-bus-width1 { 762 + sd3_bus1: sd3-bus-width1-pins { 763 763 samsung,pins = "gpk3-3"; 764 764 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 765 765 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 766 766 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 767 767 }; 768 768 769 - sd3_bus4: sd3-bus-width4 { 769 + sd3_bus4: sd3-bus-width4-pins { 770 770 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; 771 771 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 772 772 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 773 773 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 774 774 }; 775 775 776 - eint0: ext-int0 { 776 + eint0: ext-int0-pins { 777 777 samsung,pins = "gpx0-0"; 778 778 samsung,pin-function = <EXYNOS_PIN_FUNC_F>; 779 779 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 780 780 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 781 781 }; 782 782 783 - eint8: ext-int8 { 783 + eint8: ext-int8-pins { 784 784 samsung,pins = "gpx1-0"; 785 785 samsung,pin-function = <EXYNOS_PIN_FUNC_F>; 786 786 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 787 787 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 788 788 }; 789 789 790 - eint15: ext-int15 { 790 + eint15: ext-int15-pins { 791 791 samsung,pins = "gpx1-7"; 792 792 samsung,pin-function = <EXYNOS_PIN_FUNC_F>; 793 793 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 794 794 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 795 795 }; 796 796 797 - eint16: ext-int16 { 797 + eint16: ext-int16-pins { 798 798 samsung,pins = "gpx2-0"; 799 799 samsung,pin-function = <EXYNOS_PIN_FUNC_F>; 800 800 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 801 801 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 802 802 }; 803 803 804 - eint31: ext-int31 { 804 + eint31: ext-int31-pins { 805 805 samsung,pins = "gpx3-7"; 806 806 samsung,pin-function = <EXYNOS_PIN_FUNC_F>; 807 807 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 808 808 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 809 809 }; 810 810 811 - cam_port_a_io: cam-port-a-io { 811 + cam_port_a_io: cam-port-a-io-pins { 812 812 samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3", 813 813 "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7", 814 814 "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4"; ··· 817 817 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 818 818 }; 819 819 820 - cam_port_a_clk_active: cam-port-a-clk-active { 820 + cam_port_a_clk_active: cam-port-a-clk-active-pins { 821 821 samsung,pins = "gpj1-3"; 822 822 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 823 823 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 824 824 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>; 825 825 }; 826 826 827 - cam_port_a_clk_idle: cam-port-a-clk-idle { 827 + cam_port_a_clk_idle: cam-port-a-clk-idle-pins { 828 828 samsung,pins = "gpj1-3"; 829 829 samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; 830 830 samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; 831 831 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 832 832 }; 833 833 834 - hdmi_cec: hdmi-cec { 834 + hdmi_cec: hdmi-cec-pins { 835 835 samsung,pins = "gpx3-6"; 836 836 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 837 837 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; ··· 840 840 }; 841 841 842 842 &pinctrl_2 { 843 - gpz: gpz { 843 + gpz: gpz-gpio-bank { 844 844 gpio-controller; 845 845 #gpio-cells = <2>; 846 846 }; 847 847 848 - i2s0_bus: i2s0-bus { 848 + i2s0_bus: i2s0-bus-pins { 849 849 samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3", 850 850 "gpz-4", "gpz-5", "gpz-6"; 851 851 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; ··· 853 853 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 854 854 }; 855 855 856 - pcm0_bus: pcm0-bus { 856 + pcm0_bus: pcm0-bus-pins { 857 857 samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3", 858 858 "gpz-4"; 859 859 samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

+2 -2

arch/arm/boot/dts/exynos4210-smdkv310.dts

··· 152 152 }; 153 153 154 154 &pinctrl_1 { 155 - keypad_rows: keypad-rows { 155 + keypad_rows: keypad-rows-pins { 156 156 samsung,pins = "gpx2-0", "gpx2-1"; 157 157 samsung,pin-function = <EXYNOS_PIN_FUNC_3>; 158 158 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; 159 159 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 160 160 }; 161 161 162 - keypad_cols: keypad-cols { 162 + keypad_cols: keypad-cols-pins { 163 163 samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3", 164 164 "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7"; 165 165 samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

+3 -3

arch/arm/boot/dts/exynos4210-trats.dts

··· 464 464 }; 465 465 466 466 &pinctrl_1 { 467 - bt_shutdown: bt-shutdown { 467 + bt_shutdown: bt-shutdown-pins { 468 468 samsung,pins = "gpl1-0"; 469 469 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 470 470 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 471 471 }; 472 472 473 - bt_host_wakeup: bt-host-wakeup { 473 + bt_host_wakeup: bt-host-wakeup-pins { 474 474 samsung,pins = "gpx2-6"; 475 475 samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; 476 476 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 477 477 }; 478 478 479 - bt_device_wakeup: bt-device-wakeup { 479 + bt_device_wakeup: bt-device-wakeup-pins { 480 480 samsung,pins = "gpx3-1"; 481 481 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 482 482 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

+6 -6

arch/arm/boot/dts/exynos4210-universal_c210.dts

··· 533 533 }; 534 534 535 535 &pinctrl_1 { 536 - bt_shutdown: bt-shutdown { 536 + bt_shutdown: bt-shutdown-pins { 537 537 samsung,pins = "gpe1-4"; 538 538 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 539 539 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 540 540 }; 541 541 542 - bt_host_wakeup: bt-host-wakeup { 542 + bt_host_wakeup: bt-host-wakeup-pins { 543 543 samsung,pins = "gpx2-6"; 544 544 samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; 545 545 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 546 546 }; 547 547 548 - bt_device_wakeup: bt-device-wakeup { 548 + bt_device_wakeup: bt-device-wakeup-pins { 549 549 samsung,pins = "gpx3-1"; 550 550 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 551 551 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 552 552 }; 553 553 554 - lp3974_irq: lp3974-irq { 554 + lp3974_irq: lp3974-irq-pins { 555 555 samsung,pins = "gpx0-7", "gpx2-7"; 556 556 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 557 557 }; 558 558 559 - hdmi_hpd: hdmi-hpd { 559 + hdmi_hpd: hdmi-hpd-pins { 560 560 samsung,pins = "gpx3-7"; 561 561 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; 562 562 }; 563 563 }; 564 564 565 565 &pinctrl_0 { 566 - i2c_ddc_bus: i2c-ddc-bus { 566 + i2c_ddc_bus: i2c-ddc-bus-pins { 567 567 samsung,pins = "gpe4-2", "gpe4-3"; 568 568 samsung,pin-function = <EXYNOS_PIN_FUNC_2>; 569 569 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;