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

ARM: dts: Use labels for overriding nodes in exynos5420-smdk5420

Usage of labels instead of full paths reduces possible mistakes when
overriding nodes.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Kukjin Kim
e7d7ef30 3a3cf6c4

+298 -297
+298 -297
arch/arm/boot/dts/exynos5420-smdk5420.dts
··· 64 64 }; 65 65 }; 66 66 67 - rtc@101E0000 { 68 - status = "okay"; 69 - }; 70 - 71 - codec@11000000 { 72 - samsung,mfc-r = <0x43000000 0x800000>; 73 - samsung,mfc-l = <0x51000000 0x800000>; 74 - }; 75 - 76 - mmc@12200000 { 77 - status = "okay"; 78 - broken-cd; 79 - card-detect-delay = <200>; 80 - samsung,dw-mshc-ciu-div = <3>; 81 - samsung,dw-mshc-sdr-timing = <0 4>; 82 - samsung,dw-mshc-ddr-timing = <0 2>; 83 - samsung,dw-mshc-hs400-timing = <0 2>; 84 - samsung,read-strobe-delay = <90>; 85 - pinctrl-names = "default"; 86 - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 87 - &sd0_rclk>; 88 - bus-width = <8>; 89 - cap-mmc-highspeed; 90 - }; 91 - 92 - mmc@12220000 { 93 - status = "okay"; 94 - card-detect-delay = <200>; 95 - samsung,dw-mshc-ciu-div = <3>; 96 - samsung,dw-mshc-sdr-timing = <2 3>; 97 - samsung,dw-mshc-ddr-timing = <1 2>; 98 - pinctrl-names = "default"; 99 - pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>; 100 - bus-width = <4>; 101 - cap-sd-highspeed; 102 - }; 103 - 104 - dp-controller@145B0000 { 105 - pinctrl-names = "default"; 106 - pinctrl-0 = <&dp_hpd>; 107 - samsung,color-space = <0>; 108 - samsung,dynamic-range = <0>; 109 - samsung,ycbcr-coeff = <0>; 110 - samsung,color-depth = <1>; 111 - samsung,link-rate = <0x0a>; 112 - samsung,lane-count = <4>; 113 - status = "okay"; 114 - }; 115 - 116 - fimd@14400000 { 117 - status = "okay"; 118 - display-timings { 119 - native-mode = <&timing0>; 120 - timing0: timing@0 { 121 - clock-frequency = <50000>; 122 - hactive = <2560>; 123 - vactive = <1600>; 124 - hfront-porch = <48>; 125 - hback-porch = <80>; 126 - hsync-len = <32>; 127 - vback-porch = <16>; 128 - vfront-porch = <8>; 129 - vsync-len = <6>; 130 - }; 131 - }; 132 - }; 133 - 134 - pinctrl@13400000 { 135 - hdmi_hpd_irq: hdmi-hpd-irq { 136 - samsung,pins = "gpx3-7"; 137 - samsung,pin-function = <0>; 138 - samsung,pin-pud = <1>; 139 - samsung,pin-drv = <0>; 140 - }; 141 - }; 142 - 143 - pinctrl@14000000 { 144 - usb300_vbus_en: usb300-vbus-en { 145 - samsung,pins = "gpg0-5"; 146 - samsung,pin-function = <1>; 147 - samsung,pin-pud = <0>; 148 - samsung,pin-drv = <0>; 149 - }; 150 - 151 - usb301_vbus_en: usb301-vbus-en { 152 - samsung,pins = "gpg1-4"; 153 - samsung,pin-function = <1>; 154 - samsung,pin-pud = <0>; 155 - samsung,pin-drv = <0>; 156 - }; 157 - }; 158 - 159 - hdmi@14530000 { 160 - status = "okay"; 161 - hpd-gpio = <&gpx3 7 0>; 162 - pinctrl-names = "default"; 163 - pinctrl-0 = <&hdmi_hpd_irq>; 164 - }; 165 - 166 67 usb300_vbus_reg: regulator-usb300 { 167 68 compatible = "regulator-fixed"; 168 69 regulator-name = "VBUS0"; ··· 86 185 enable-active-high; 87 186 }; 88 187 89 - phy@12100000 { 90 - vbus-supply = <&usb300_vbus_reg>; 91 - }; 188 + }; 92 189 93 - phy@12500000 { 94 - vbus-supply = <&usb301_vbus_reg>; 95 - }; 190 + &dp { 191 + pinctrl-names = "default"; 192 + pinctrl-0 = <&dp_hpd>; 193 + samsung,color-space = <0>; 194 + samsung,dynamic-range = <0>; 195 + samsung,ycbcr-coeff = <0>; 196 + samsung,color-depth = <1>; 197 + samsung,link-rate = <0x0a>; 198 + samsung,lane-count = <4>; 199 + status = "okay"; 200 + }; 96 201 97 - i2c_2: i2c@12C80000 { 98 - samsung,i2c-sda-delay = <100>; 99 - samsung,i2c-max-bus-freq = <66000>; 100 - status = "okay"; 101 - 102 - hdmiddc@50 { 103 - compatible = "samsung,exynos4210-hdmiddc"; 104 - reg = <0x50>; 202 + &fimd { 203 + status = "okay"; 204 + display-timings { 205 + native-mode = <&timing0>; 206 + timing0: timing@0 { 207 + clock-frequency = <50000>; 208 + hactive = <2560>; 209 + vactive = <1600>; 210 + hfront-porch = <48>; 211 + hback-porch = <80>; 212 + hsync-len = <32>; 213 + vback-porch = <16>; 214 + vfront-porch = <8>; 215 + vsync-len = <6>; 105 216 }; 106 217 }; 218 + }; 107 219 108 - hsi2c_4: i2c@12CA0000 { 109 - status = "okay"; 220 + &hdmi { 221 + status = "okay"; 222 + hpd-gpio = <&gpx3 7 0>; 223 + pinctrl-names = "default"; 224 + pinctrl-0 = <&hdmi_hpd_irq>; 225 + }; 110 226 111 - s2mps11_pmic@66 { 112 - compatible = "samsung,s2mps11-pmic"; 113 - reg = <0x66>; 114 - s2mps11,buck2-ramp-delay = <12>; 115 - s2mps11,buck34-ramp-delay = <12>; 116 - s2mps11,buck16-ramp-delay = <12>; 117 - s2mps11,buck6-ramp-enable = <1>; 118 - s2mps11,buck2-ramp-enable = <1>; 119 - s2mps11,buck3-ramp-enable = <1>; 120 - s2mps11,buck4-ramp-enable = <1>; 227 + &hsi2c_4 { 228 + status = "okay"; 121 229 122 - s2mps11_osc: clocks { 123 - #clock-cells = <1>; 124 - clock-output-names = "s2mps11_ap", 125 - "s2mps11_cp", "s2mps11_bt"; 230 + s2mps11_pmic@66 { 231 + compatible = "samsung,s2mps11-pmic"; 232 + reg = <0x66>; 233 + s2mps11,buck2-ramp-delay = <12>; 234 + s2mps11,buck34-ramp-delay = <12>; 235 + s2mps11,buck16-ramp-delay = <12>; 236 + s2mps11,buck6-ramp-enable = <1>; 237 + s2mps11,buck2-ramp-enable = <1>; 238 + s2mps11,buck3-ramp-enable = <1>; 239 + s2mps11,buck4-ramp-enable = <1>; 240 + 241 + s2mps11_osc: clocks { 242 + #clock-cells = <1>; 243 + clock-output-names = "s2mps11_ap", 244 + "s2mps11_cp", "s2mps11_bt"; 245 + }; 246 + 247 + regulators { 248 + ldo1_reg: LDO1 { 249 + regulator-name = "vdd_ldo1"; 250 + regulator-min-microvolt = <1000000>; 251 + regulator-max-microvolt = <1000000>; 252 + regulator-always-on; 126 253 }; 127 254 128 - regulators { 129 - ldo1_reg: LDO1 { 130 - regulator-name = "vdd_ldo1"; 131 - regulator-min-microvolt = <1000000>; 132 - regulator-max-microvolt = <1000000>; 133 - regulator-always-on; 134 - }; 255 + ldo3_reg: LDO3 { 256 + regulator-name = "vdd_ldo3"; 257 + regulator-min-microvolt = <1800000>; 258 + regulator-max-microvolt = <1800000>; 259 + regulator-always-on; 260 + }; 135 261 136 - ldo3_reg: LDO3 { 137 - regulator-name = "vdd_ldo3"; 138 - regulator-min-microvolt = <1800000>; 139 - regulator-max-microvolt = <1800000>; 140 - regulator-always-on; 141 - }; 262 + ldo5_reg: LDO5 { 263 + regulator-name = "vdd_ldo5"; 264 + regulator-min-microvolt = <1800000>; 265 + regulator-max-microvolt = <1800000>; 266 + regulator-always-on; 267 + }; 142 268 143 - ldo5_reg: LDO5 { 144 - regulator-name = "vdd_ldo5"; 145 - regulator-min-microvolt = <1800000>; 146 - regulator-max-microvolt = <1800000>; 147 - regulator-always-on; 148 - }; 269 + ldo6_reg: LDO6 { 270 + regulator-name = "vdd_ldo6"; 271 + regulator-min-microvolt = <1000000>; 272 + regulator-max-microvolt = <1000000>; 273 + regulator-always-on; 274 + }; 149 275 150 - ldo6_reg: LDO6 { 151 - regulator-name = "vdd_ldo6"; 152 - regulator-min-microvolt = <1000000>; 153 - regulator-max-microvolt = <1000000>; 154 - regulator-always-on; 155 - }; 276 + ldo7_reg: LDO7 { 277 + regulator-name = "vdd_ldo7"; 278 + regulator-min-microvolt = <1800000>; 279 + regulator-max-microvolt = <1800000>; 280 + regulator-always-on; 281 + }; 156 282 157 - ldo7_reg: LDO7 { 158 - regulator-name = "vdd_ldo7"; 159 - regulator-min-microvolt = <1800000>; 160 - regulator-max-microvolt = <1800000>; 161 - regulator-always-on; 162 - }; 283 + ldo8_reg: LDO8 { 284 + regulator-name = "vdd_ldo8"; 285 + regulator-min-microvolt = <1800000>; 286 + regulator-max-microvolt = <1800000>; 287 + regulator-always-on; 288 + }; 163 289 164 - ldo8_reg: LDO8 { 165 - regulator-name = "vdd_ldo8"; 166 - regulator-min-microvolt = <1800000>; 167 - regulator-max-microvolt = <1800000>; 168 - regulator-always-on; 169 - }; 290 + ldo9_reg: LDO9 { 291 + regulator-name = "vdd_ldo9"; 292 + regulator-min-microvolt = <3000000>; 293 + regulator-max-microvolt = <3000000>; 294 + regulator-always-on; 295 + }; 170 296 171 - ldo9_reg: LDO9 { 172 - regulator-name = "vdd_ldo9"; 173 - regulator-min-microvolt = <3000000>; 174 - regulator-max-microvolt = <3000000>; 175 - regulator-always-on; 176 - }; 297 + ldo10_reg: LDO10 { 298 + regulator-name = "vdd_ldo10"; 299 + regulator-min-microvolt = <1800000>; 300 + regulator-max-microvolt = <1800000>; 301 + regulator-always-on; 302 + }; 177 303 178 - ldo10_reg: LDO10 { 179 - regulator-name = "vdd_ldo10"; 180 - regulator-min-microvolt = <1800000>; 181 - regulator-max-microvolt = <1800000>; 182 - regulator-always-on; 183 - }; 304 + ldo11_reg: LDO11 { 305 + regulator-name = "vdd_ldo11"; 306 + regulator-min-microvolt = <1000000>; 307 + regulator-max-microvolt = <1000000>; 308 + regulator-always-on; 309 + }; 184 310 185 - ldo11_reg: LDO11 { 186 - regulator-name = "vdd_ldo11"; 187 - regulator-min-microvolt = <1000000>; 188 - regulator-max-microvolt = <1000000>; 189 - regulator-always-on; 190 - }; 311 + ldo12_reg: LDO12 { 312 + regulator-name = "vdd_ldo12"; 313 + regulator-min-microvolt = <1800000>; 314 + regulator-max-microvolt = <1800000>; 315 + regulator-always-on; 316 + }; 191 317 192 - ldo12_reg: LDO12 { 193 - regulator-name = "vdd_ldo12"; 194 - regulator-min-microvolt = <1800000>; 195 - regulator-max-microvolt = <1800000>; 196 - regulator-always-on; 197 - }; 318 + ldo13_reg: LDO13 { 319 + regulator-name = "vdd_ldo13"; 320 + regulator-min-microvolt = <2800000>; 321 + regulator-max-microvolt = <2800000>; 322 + regulator-always-on; 323 + }; 198 324 199 - ldo13_reg: LDO13 { 200 - regulator-name = "vdd_ldo13"; 201 - regulator-min-microvolt = <2800000>; 202 - regulator-max-microvolt = <2800000>; 203 - regulator-always-on; 204 - }; 325 + ldo15_reg: LDO15 { 326 + regulator-name = "vdd_ldo15"; 327 + regulator-min-microvolt = <3100000>; 328 + regulator-max-microvolt = <3100000>; 329 + regulator-always-on; 330 + }; 205 331 206 - ldo15_reg: LDO15 { 207 - regulator-name = "vdd_ldo15"; 208 - regulator-min-microvolt = <3100000>; 209 - regulator-max-microvolt = <3100000>; 210 - regulator-always-on; 211 - }; 332 + ldo16_reg: LDO16 { 333 + regulator-name = "vdd_ldo16"; 334 + regulator-min-microvolt = <2200000>; 335 + regulator-max-microvolt = <2200000>; 336 + regulator-always-on; 337 + }; 212 338 213 - ldo16_reg: LDO16 { 214 - regulator-name = "vdd_ldo16"; 215 - regulator-min-microvolt = <2200000>; 216 - regulator-max-microvolt = <2200000>; 217 - regulator-always-on; 218 - }; 339 + ldo17_reg: LDO17 { 340 + regulator-name = "tsp_avdd"; 341 + regulator-min-microvolt = <3300000>; 342 + regulator-max-microvolt = <3300000>; 343 + regulator-always-on; 344 + }; 219 345 220 - ldo17_reg: LDO17 { 221 - regulator-name = "tsp_avdd"; 222 - regulator-min-microvolt = <3300000>; 223 - regulator-max-microvolt = <3300000>; 224 - regulator-always-on; 225 - }; 346 + ldo19_reg: LDO19 { 347 + regulator-name = "vdd_sd"; 348 + regulator-min-microvolt = <2800000>; 349 + regulator-max-microvolt = <2800000>; 350 + regulator-always-on; 351 + }; 226 352 227 - ldo19_reg: LDO19 { 228 - regulator-name = "vdd_sd"; 229 - regulator-min-microvolt = <2800000>; 230 - regulator-max-microvolt = <2800000>; 231 - regulator-always-on; 232 - }; 353 + ldo24_reg: LDO24 { 354 + regulator-name = "tsp_io"; 355 + regulator-min-microvolt = <2800000>; 356 + regulator-max-microvolt = <2800000>; 357 + regulator-always-on; 358 + }; 233 359 234 - ldo24_reg: LDO24 { 235 - regulator-name = "tsp_io"; 236 - regulator-min-microvolt = <2800000>; 237 - regulator-max-microvolt = <2800000>; 238 - regulator-always-on; 239 - }; 360 + buck1_reg: BUCK1 { 361 + regulator-name = "vdd_mif"; 362 + regulator-min-microvolt = <800000>; 363 + regulator-max-microvolt = <1300000>; 364 + regulator-always-on; 365 + regulator-boot-on; 366 + }; 240 367 241 - buck1_reg: BUCK1 { 242 - regulator-name = "vdd_mif"; 243 - regulator-min-microvolt = <800000>; 244 - regulator-max-microvolt = <1300000>; 245 - regulator-always-on; 246 - regulator-boot-on; 247 - }; 368 + buck2_reg: BUCK2 { 369 + regulator-name = "vdd_arm"; 370 + regulator-min-microvolt = <800000>; 371 + regulator-max-microvolt = <1500000>; 372 + regulator-always-on; 373 + regulator-boot-on; 374 + }; 248 375 249 - buck2_reg: BUCK2 { 250 - regulator-name = "vdd_arm"; 251 - regulator-min-microvolt = <800000>; 252 - regulator-max-microvolt = <1500000>; 253 - regulator-always-on; 254 - regulator-boot-on; 255 - }; 376 + buck3_reg: BUCK3 { 377 + regulator-name = "vdd_int"; 378 + regulator-min-microvolt = <800000>; 379 + regulator-max-microvolt = <1400000>; 380 + regulator-always-on; 381 + regulator-boot-on; 382 + }; 256 383 257 - buck3_reg: BUCK3 { 258 - regulator-name = "vdd_int"; 259 - regulator-min-microvolt = <800000>; 260 - regulator-max-microvolt = <1400000>; 261 - regulator-always-on; 262 - regulator-boot-on; 263 - }; 384 + buck4_reg: BUCK4 { 385 + regulator-name = "vdd_g3d"; 386 + regulator-min-microvolt = <800000>; 387 + regulator-max-microvolt = <1400000>; 388 + regulator-always-on; 389 + regulator-boot-on; 390 + }; 264 391 265 - buck4_reg: BUCK4 { 266 - regulator-name = "vdd_g3d"; 267 - regulator-min-microvolt = <800000>; 268 - regulator-max-microvolt = <1400000>; 269 - regulator-always-on; 270 - regulator-boot-on; 271 - }; 392 + buck5_reg: BUCK5 { 393 + regulator-name = "vdd_mem"; 394 + regulator-min-microvolt = <800000>; 395 + regulator-max-microvolt = <1400000>; 396 + regulator-always-on; 397 + regulator-boot-on; 398 + }; 272 399 273 - buck5_reg: BUCK5 { 274 - regulator-name = "vdd_mem"; 275 - regulator-min-microvolt = <800000>; 276 - regulator-max-microvolt = <1400000>; 277 - regulator-always-on; 278 - regulator-boot-on; 279 - }; 400 + buck6_reg: BUCK6 { 401 + regulator-name = "vdd_kfc"; 402 + regulator-min-microvolt = <800000>; 403 + regulator-max-microvolt = <1500000>; 404 + regulator-always-on; 405 + regulator-boot-on; 406 + }; 280 407 281 - buck6_reg: BUCK6 { 282 - regulator-name = "vdd_kfc"; 283 - regulator-min-microvolt = <800000>; 284 - regulator-max-microvolt = <1500000>; 285 - regulator-always-on; 286 - regulator-boot-on; 287 - }; 408 + buck7_reg: BUCK7 { 409 + regulator-name = "vdd_1.0v_ldo"; 410 + regulator-min-microvolt = <800000>; 411 + regulator-max-microvolt = <1500000>; 412 + regulator-always-on; 413 + regulator-boot-on; 414 + }; 288 415 289 - buck7_reg: BUCK7 { 290 - regulator-name = "vdd_1.0v_ldo"; 291 - regulator-min-microvolt = <800000>; 292 - regulator-max-microvolt = <1500000>; 293 - regulator-always-on; 294 - regulator-boot-on; 295 - }; 416 + buck8_reg: BUCK8 { 417 + regulator-name = "vdd_1.8v_ldo"; 418 + regulator-min-microvolt = <800000>; 419 + regulator-max-microvolt = <1500000>; 420 + regulator-always-on; 421 + regulator-boot-on; 422 + }; 296 423 297 - buck8_reg: BUCK8 { 298 - regulator-name = "vdd_1.8v_ldo"; 299 - regulator-min-microvolt = <800000>; 300 - regulator-max-microvolt = <1500000>; 301 - regulator-always-on; 302 - regulator-boot-on; 303 - }; 424 + buck9_reg: BUCK9 { 425 + regulator-name = "vdd_2.8v_ldo"; 426 + regulator-min-microvolt = <3000000>; 427 + regulator-max-microvolt = <3750000>; 428 + regulator-always-on; 429 + regulator-boot-on; 430 + }; 304 431 305 - buck9_reg: BUCK9 { 306 - regulator-name = "vdd_2.8v_ldo"; 307 - regulator-min-microvolt = <3000000>; 308 - regulator-max-microvolt = <3750000>; 309 - regulator-always-on; 310 - regulator-boot-on; 311 - }; 312 - 313 - buck10_reg: BUCK10 { 314 - regulator-name = "vdd_vmem"; 315 - regulator-min-microvolt = <2850000>; 316 - regulator-max-microvolt = <2850000>; 317 - regulator-always-on; 318 - regulator-boot-on; 319 - }; 432 + buck10_reg: BUCK10 { 433 + regulator-name = "vdd_vmem"; 434 + regulator-min-microvolt = <2850000>; 435 + regulator-max-microvolt = <2850000>; 436 + regulator-always-on; 437 + regulator-boot-on; 320 438 }; 321 439 }; 322 440 }; 441 + }; 442 + 443 + &i2c_2 { 444 + samsung,i2c-sda-delay = <100>; 445 + samsung,i2c-max-bus-freq = <66000>; 446 + status = "okay"; 447 + 448 + hdmiddc@50 { 449 + compatible = "samsung,exynos4210-hdmiddc"; 450 + reg = <0x50>; 451 + }; 452 + }; 453 + 454 + &mfc { 455 + samsung,mfc-r = <0x43000000 0x800000>; 456 + samsung,mfc-l = <0x51000000 0x800000>; 457 + }; 458 + 459 + &mmc_0 { 460 + status = "okay"; 461 + broken-cd; 462 + card-detect-delay = <200>; 463 + samsung,dw-mshc-ciu-div = <3>; 464 + samsung,dw-mshc-sdr-timing = <0 4>; 465 + samsung,dw-mshc-ddr-timing = <0 2>; 466 + samsung,dw-mshc-hs400-timing = <0 2>; 467 + samsung,read-strobe-delay = <90>; 468 + pinctrl-names = "default"; 469 + pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 470 + &sd0_rclk>; 471 + bus-width = <8>; 472 + cap-mmc-highspeed; 473 + }; 474 + 475 + &mmc_2 { 476 + status = "okay"; 477 + card-detect-delay = <200>; 478 + samsung,dw-mshc-ciu-div = <3>; 479 + samsung,dw-mshc-sdr-timing = <2 3>; 480 + samsung,dw-mshc-ddr-timing = <1 2>; 481 + pinctrl-names = "default"; 482 + pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>; 483 + bus-width = <4>; 484 + cap-sd-highspeed; 485 + }; 486 + 487 + &pinctrl_0 { 488 + hdmi_hpd_irq: hdmi-hpd-irq { 489 + samsung,pins = "gpx3-7"; 490 + samsung,pin-function = <0>; 491 + samsung,pin-pud = <1>; 492 + samsung,pin-drv = <0>; 493 + }; 494 + }; 495 + 496 + &pinctrl_2 { 497 + usb300_vbus_en: usb300-vbus-en { 498 + samsung,pins = "gpg0-5"; 499 + samsung,pin-function = <1>; 500 + samsung,pin-pud = <0>; 501 + samsung,pin-drv = <0>; 502 + }; 503 + 504 + usb301_vbus_en: usb301-vbus-en { 505 + samsung,pins = "gpg1-4"; 506 + samsung,pin-function = <1>; 507 + samsung,pin-pud = <0>; 508 + samsung,pin-drv = <0>; 509 + }; 510 + }; 511 + 512 + &rtc { 513 + status = "okay"; 514 + }; 515 + 516 + &usbdrd_phy0 { 517 + vbus-supply = <&usb300_vbus_reg>; 518 + }; 519 + 520 + &usbdrd_phy1 { 521 + vbus-supply = <&usb301_vbus_reg>; 323 522 };