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

Merge tag 'ux500-dts-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt

Ux500 DTS updates for the v5.10 kernel cycle:

- Add the s6e63m0 display to the Golden device
- Add the KTD253 backlight to the Skomer device
- Update the LP5521 LED DTS entries for binding changes

* tag 'ux500-dts-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: dts: ste-href: Add reg property to the LP5521 channel nodes
ARM: dts: ux500-skomer: Add KTD253 backlight
ARM: dts: ux500-golden: Add S6E63M0 DSI display

Link: https://lore.kernel.org/r/CACRpkda=-cgFjN7K2vBU5x4uSYrohrZSbjqMnSFb3Qe2Az1W5g@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>

+113 -15
+16 -6
arch/arm/boot/dts/ste-href.dtsi
··· 58 58 reg = <0x33>; 59 59 label = "lp5521_pri"; 60 60 clock-mode = /bits/ 8 <2>; 61 - chan0 { 61 + #address-cells = <1>; 62 + #size-cells = <0>; 63 + chan@0 { 64 + reg = <0>; 62 65 led-cur = /bits/ 8 <0x2f>; 63 66 max-cur = /bits/ 8 <0x5f>; 64 67 linux,default-trigger = "heartbeat"; 65 68 }; 66 - chan1 { 69 + chan@1 { 70 + reg = <1>; 67 71 led-cur = /bits/ 8 <0x2f>; 68 72 max-cur = /bits/ 8 <0x5f>; 69 73 }; 70 - chan2 { 74 + chan@2 { 75 + reg = <2>; 71 76 led-cur = /bits/ 8 <0x2f>; 72 77 max-cur = /bits/ 8 <0x5f>; 73 78 }; ··· 82 77 reg = <0x34>; 83 78 label = "lp5521_sec"; 84 79 clock-mode = /bits/ 8 <2>; 85 - chan0 { 80 + #address-cells = <1>; 81 + #size-cells = <0>; 82 + chan@0 { 83 + reg = <0>; 86 84 led-cur = /bits/ 8 <0x2f>; 87 85 max-cur = /bits/ 8 <0x5f>; 88 86 }; 89 - chan1 { 87 + chan@1 { 88 + reg = <1>; 90 89 led-cur = /bits/ 8 <0x2f>; 91 90 max-cur = /bits/ 8 <0x5f>; 92 91 }; 93 - chan2 { 92 + chan@2 { 93 + reg = <2>; 94 94 led-cur = /bits/ 8 <0x2f>; 95 95 max-cur = /bits/ 8 <0x5f>; 96 96 };
+91
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
··· 316 316 }; 317 317 }; 318 318 }; 319 + 320 + mcde@a0350000 { 321 + status = "okay"; 322 + pinctrl-names = "default"; 323 + pinctrl-0 = <&dsi_default_mode>; 324 + 325 + dsi-controller@a0351000 { 326 + panel@0 { 327 + compatible = "samsung,s6e63m0"; 328 + reg = <0>; 329 + vdd3-supply = <&panel_reg_3v0>; 330 + vci-supply = <&panel_reg_1v8>; 331 + reset-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; 332 + /* ESD (electrostatic discharge) detection interrupt */ 333 + interrupt-parent = <&gpio2>; 334 + interrupts = <18 IRQ_TYPE_EDGE_RISING>; 335 + interrupt-names = "esd"; 336 + pinctrl-names = "default"; 337 + pinctrl-0 = <&display_default_mode>; 338 + }; 339 + }; 340 + }; 319 341 }; 320 342 321 343 gpio-keys { ··· 437 415 pinctrl-names = "default"; 438 416 pinctrl-0 = <&wlan_en_default>; 439 417 }; 418 + 419 + /* MIC5366 GPIO-controlled regulator */ 420 + panel_reg_1v8: regulator-panel-1v8 { 421 + compatible = "regulator-fixed"; 422 + 423 + regulator-name = "panel-fixed-supply"; 424 + regulator-min-microvolt = <1800000>; 425 + regulator-max-microvolt = <1800000>; 426 + /* GPIO219 */ 427 + gpio = <&gpio6 27 GPIO_ACTIVE_HIGH>; 428 + 429 + startup-delay-us = <200>; 430 + enable-active-high; 431 + 432 + pinctrl-names = "default"; 433 + pinctrl-0 = <&panel_reg_default_mode>; 434 + }; 435 + 436 + /* MIC5366 GPIO-controlled regulator */ 437 + panel_reg_3v0: regulator-panel-3v0 { 438 + compatible = "regulator-fixed"; 439 + 440 + regulator-name = "panel-fixed-supply"; 441 + regulator-min-microvolt = <3000000>; 442 + regulator-max-microvolt = <3000000>; 443 + /* GPIO219 */ 444 + gpio = <&gpio6 27 GPIO_ACTIVE_HIGH>; 445 + 446 + startup-delay-us = <200>; 447 + enable-active-high; 448 + 449 + pinctrl-names = "default"; 450 + pinctrl-0 = <&panel_reg_default_mode>; 451 + }; 440 452 }; 441 453 442 454 &pinctrl { ··· 528 472 golden_cfg1 { 529 473 pins = "GPIO223_AH9"; /* MEM_LDO_EN */ 530 474 ste,config = <&gpio_out_hi>; 475 + }; 476 + }; 477 + }; 478 + 479 + mcde { 480 + dsi_default_mode: dsi_default { 481 + default_mux1 { 482 + /* Mux in VSI0 used for DSI TE */ 483 + function = "lcd"; 484 + groups = 485 + "lcdvsi0_a_1"; /* VSI0 for LCD */ 486 + }; 487 + default_cfg1 { 488 + pins = 489 + "GPIO68_E1"; /* VSI0 */ 490 + ste,config = <&in_nopull>; 491 + }; 492 + }; 493 + }; 494 + 495 + display { 496 + display_default_mode: display_default { 497 + golden_cfg1 { 498 + pins = "GPIO139_C9"; /* MIPI_DSI0_RESET_N */ 499 + ste,config = <&gpio_out_lo>; 500 + }; 501 + golden_cfg2 { 502 + pins = "GPIO82_C1"; /* LDI_ESD_DET */ 503 + ste,config = <&gpio_in_pu>; 504 + }; 505 + }; 506 + panel_reg_default_mode: panel_reg_default { 507 + golden_cfg1 { 508 + pins = "GPIO219_AG10"; /* LCD_PWR_EN */ 509 + ste,config = <&gpio_out_lo>; 531 510 }; 532 511 }; 533 512 };
+6 -9
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
··· 108 108 }; 109 109 }; 110 110 111 - /* 112 - * FIXME: this is not quite GPIO backlight. This is a 113 - * KTD253 one-wire GPIO-controlled backlight. It can 114 - * work as a GPIO backlight. 115 - */ 116 - gpio_bl: backlight { 117 - compatible = "gpio-backlight"; 111 + ktd253: backlight { 112 + compatible = "kinetic,ktd253"; 118 113 /* GPIO 69 */ 119 - gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; 114 + enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; 115 + /* Default to 13/32 brightness */ 116 + default-brightness = <13>; 120 117 pinctrl-names = "default"; 121 118 pinctrl-0 = <&gpio_backlight_default_mode>; 122 119 }; ··· 406 409 reset-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; 407 410 pinctrl-names = "default"; 408 411 pinctrl-0 = <&display_default_mode>; 409 - backlight = <&gpio_bl>; 412 + backlight = <&ktd253>; 410 413 }; 411 414 }; 412 415 };