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

Merge tag 'asahi-soc-dt-6.15-v3' of https://github.com/AsahiLinux/linux into soc/dt

Apple SoC DT updates for 6.15, final batch:

- Added touchbar screen nodes for M1/M2 platforms
- Added backlight nodes for iPhone, iPad and iPod touch

* tag 'asahi-soc-dt-6.15-v3' of https://github.com/AsahiLinux/linux:
arm64: dts: apple: t8015: Add backlight nodes
arm64: dts: apple: t8010: Add backlight nodes
arm64: dts: apple: s800-0-3: Add backlight nodes
arm64: dts: apple: t7000: Add backlight nodes
arm64: dts: apple: s5l8960x: Add backlight nodes
arm64: dts: apple: Add touchbar screen nodes

Link: https://lore.kernel.org/r/20250309113212.48137-1-sven@svenpeter.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+239
+4
arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi
··· 51 51 }; 52 52 }; 53 53 54 + &dwi_bl { 55 + status = "okay"; 56 + }; 57 + 54 58 &framebuffer0 { 55 59 power-domains = <&ps_disp0 &ps_mipi_dsi>; 56 60 };
+7
arch/arm64/boot/dts/apple/s5l8960x.dtsi
··· 100 100 power-domains = <&ps_aic>; 101 101 }; 102 102 103 + dwi_bl: backlight@20e200010 { 104 + compatible = "apple,s5l8960x-dwi-bl", "apple,dwi-bl"; 105 + reg = <0x2 0x0e200010 0x0 0x8>; 106 + power-domains = <&ps_dwi>; 107 + status = "disabled"; 108 + }; 109 + 103 110 pinctrl: pinctrl@20e300000 { 104 111 compatible = "apple,s5l8960x-pinctrl", "apple,pinctrl"; 105 112 reg = <0x2 0x0e300000 0x0 0x100000>;
+4
arch/arm64/boot/dts/apple/s800-0-3-common.dtsi
··· 43 43 }; 44 44 }; 45 45 46 + &dwi_bl { 47 + status = "okay"; 48 + }; 49 + 46 50 &serial0 { 47 51 status = "okay"; 48 52 };
+7
arch/arm64/boot/dts/apple/s800-0-3.dtsi
··· 91 91 power-domains = <&ps_aic>; 92 92 }; 93 93 94 + dwi_bl: backlight@20e200080 { 95 + compatible = "apple,s8000-dwi-bl", "apple,dwi-bl"; 96 + reg = <0x2 0x0e200080 0x0 0x8>; 97 + power-domains = <&ps_dwi>; 98 + status = "disabled"; 99 + }; 100 + 94 101 pinctrl_ap: pinctrl@20f100000 { 95 102 compatible = "apple,s8000-pinctrl", "apple,pinctrl"; 96 103 reg = <0x2 0x0f100000 0x0 0x100000>;
+4
arch/arm64/boot/dts/apple/t7000-handheld.dtsi
··· 22 22 }; 23 23 }; 24 24 25 + &dwi_bl { 26 + status = "okay"; 27 + }; 28 + 25 29 &serial0 { 26 30 status = "okay"; 27 31 };
+7
arch/arm64/boot/dts/apple/t7000.dtsi
··· 155 155 power-domains = <&ps_aic>; 156 156 }; 157 157 158 + dwi_bl: backlight@20e200010 { 159 + compatible = "apple,t7000-dwi-bl", "apple,dwi-bl"; 160 + reg = <0x2 0x0e200010 0x0 0x8>; 161 + power-domains = <&ps_dwi>; 162 + status = "disabled"; 163 + }; 164 + 158 165 pinctrl: pinctrl@20e300000 { 159 166 compatible = "apple,t7000-pinctrl", "apple,pinctrl"; 160 167 reg = <0x2 0x0e300000 0x0 0x100000>;
+4
arch/arm64/boot/dts/apple/t8010-common.dtsi
··· 43 43 }; 44 44 }; 45 45 46 + &dwi_bl { 47 + status = "okay"; 48 + }; 49 + 46 50 &serial0 { 47 51 status = "okay"; 48 52 };
+7
arch/arm64/boot/dts/apple/t8010.dtsi
··· 167 167 power-domains = <&ps_aic>; 168 168 }; 169 169 170 + dwi_bl: backlight@20e200080 { 171 + compatible = "apple,t8010-dwi-bl", "apple,dwi-bl"; 172 + reg = <0x2 0x0e200080 0x0 0x8>; 173 + power-domains = <&ps_dwi>; 174 + status = "disabled"; 175 + }; 176 + 170 177 pinctrl_ap: pinctrl@20f100000 { 171 178 compatible = "apple,t8010-pinctrl", "apple,pinctrl"; 172 179 reg = <0x2 0x0f100000 0x0 0x100000>;
+4
arch/arm64/boot/dts/apple/t8015-8.dtsi
··· 11 11 / { 12 12 chassis-type = "handset"; 13 13 }; 14 + 15 + &dwi_bl { 16 + status = "okay"; 17 + };
+7
arch/arm64/boot/dts/apple/t8015.dtsi
··· 262 262 reg = <0x2 0x32000000 0 0x8c000>; 263 263 }; 264 264 265 + dwi_bl: backlight@232200080 { 266 + compatible = "apple,t8015-dwi-bl", "apple,dwi-bl"; 267 + reg = <0x2 0x32200080 0x0 0x8>; 268 + power-domains = <&ps_dwi>; 269 + status = "disabled"; 270 + }; 271 + 265 272 pinctrl_ap: pinctrl@233100000 { 266 273 compatible = "apple,t8015-pinctrl", "apple,pinctrl"; 267 274 reg = <0x2 0x33100000 0x0 0x1000>;
+31
arch/arm64/boot/dts/apple/t8103-j293.dts
··· 76 76 touchscreen-inverted-y; 77 77 }; 78 78 }; 79 + 80 + &display_dfr { 81 + status = "okay"; 82 + }; 83 + 84 + &dfr_mipi_out { 85 + dfr_mipi_out_panel: endpoint@0 { 86 + reg = <0>; 87 + remote-endpoint = <&dfr_panel_in>; 88 + }; 89 + }; 90 + 91 + &displaydfr_mipi { 92 + status = "okay"; 93 + 94 + dfr_panel: panel@0 { 95 + compatible = "apple,j293-summit", "apple,summit"; 96 + reg = <0>; 97 + max-brightness = <255>; 98 + 99 + port { 100 + dfr_panel_in: endpoint { 101 + remote-endpoint = <&dfr_mipi_out_panel>; 102 + }; 103 + }; 104 + }; 105 + }; 106 + 107 + &displaydfr_dart { 108 + status = "okay"; 109 + };
+61
arch/arm64/boot/dts/apple/t8103.dtsi
··· 370 370 #performance-domain-cells = <0>; 371 371 }; 372 372 373 + display_dfr: display-pipe@228200000 { 374 + compatible = "apple,t8103-display-pipe", "apple,h7-display-pipe"; 375 + reg = <0x2 0x28200000 0x0 0xc000>, 376 + <0x2 0x28400000 0x0 0x4000>; 377 + reg-names = "be", "fe"; 378 + power-domains = <&ps_dispdfr_fe>, <&ps_dispdfr_be>; 379 + interrupt-parent = <&aic>; 380 + interrupts = <AIC_IRQ 502 IRQ_TYPE_LEVEL_HIGH>, 381 + <AIC_IRQ 506 IRQ_TYPE_LEVEL_HIGH>; 382 + interrupt-names = "be", "fe"; 383 + iommus = <&displaydfr_dart 0>; 384 + status = "disabled"; 385 + 386 + port { 387 + dfr_adp_out_mipi: endpoint { 388 + remote-endpoint = <&dfr_mipi_in_adp>; 389 + }; 390 + }; 391 + }; 392 + 393 + displaydfr_dart: iommu@228304000 { 394 + compatible = "apple,t8103-dart"; 395 + reg = <0x2 0x28304000 0x0 0x4000>; 396 + interrupt-parent = <&aic>; 397 + interrupts = <AIC_IRQ 504 IRQ_TYPE_LEVEL_HIGH>; 398 + #iommu-cells = <1>; 399 + power-domains = <&ps_dispdfr_fe>; 400 + status = "disabled"; 401 + }; 402 + 403 + displaydfr_mipi: dsi@228600000 { 404 + compatible = "apple,t8103-display-pipe-mipi", "apple,h7-display-pipe-mipi"; 405 + reg = <0x2 0x28600000 0x0 0x100000>; 406 + power-domains = <&ps_mipi_dsi>; 407 + #address-cells = <1>; 408 + #size-cells = <0>; 409 + status = "disabled"; 410 + 411 + ports { 412 + #address-cells = <1>; 413 + #size-cells = <0>; 414 + 415 + dfr_mipi_in: port@0 { 416 + reg = <0>; 417 + #address-cells = <1>; 418 + #size-cells = <0>; 419 + 420 + dfr_mipi_in_adp: endpoint@0 { 421 + reg = <0>; 422 + remote-endpoint = <&dfr_adp_out_mipi>; 423 + }; 424 + }; 425 + 426 + dfr_mipi_out: port@1 { 427 + reg = <1>; 428 + #address-cells = <1>; 429 + #size-cells = <0>; 430 + }; 431 + }; 432 + }; 433 + 373 434 sio_dart: iommu@235004000 { 374 435 compatible = "apple,t8103-dart"; 375 436 reg = <0x2 0x35004000 0x0 0x4000>;
+31
arch/arm64/boot/dts/apple/t8112-j493.dts
··· 40 40 }; 41 41 }; 42 42 43 + &display_dfr { 44 + status = "okay"; 45 + }; 46 + 47 + &dfr_mipi_out { 48 + dfr_mipi_out_panel: endpoint@0 { 49 + reg = <0>; 50 + remote-endpoint = <&dfr_panel_in>; 51 + }; 52 + }; 53 + 54 + &displaydfr_mipi { 55 + status = "okay"; 56 + 57 + dfr_panel: panel@0 { 58 + compatible = "apple,j493-summit", "apple,summit"; 59 + reg = <0>; 60 + max-brightness = <255>; 61 + 62 + port { 63 + dfr_panel_in: endpoint { 64 + remote-endpoint = <&dfr_mipi_out_panel>; 65 + }; 66 + }; 67 + }; 68 + }; 69 + 70 + &displaydfr_dart { 71 + status = "okay"; 72 + }; 73 + 43 74 /* 44 75 * Force the bus number assignments so that we can declare some of the 45 76 * on-board devices and properties that are populated by the bootloader
+61
arch/arm64/boot/dts/apple/t8112.dtsi
··· 386 386 #performance-domain-cells = <0>; 387 387 }; 388 388 389 + display_dfr: display-pipe@228200000 { 390 + compatible = "apple,t8112-display-pipe", "apple,h7-display-pipe"; 391 + reg = <0x2 0x28200000 0x0 0xc000>, 392 + <0x2 0x28400000 0x0 0x4000>; 393 + reg-names = "be", "fe"; 394 + power-domains = <&ps_dispdfr_fe>, <&ps_dispdfr_be>; 395 + interrupt-parent = <&aic>; 396 + interrupts = <AIC_IRQ 614 IRQ_TYPE_LEVEL_HIGH>, 397 + <AIC_IRQ 618 IRQ_TYPE_LEVEL_HIGH>; 398 + interrupt-names = "be", "fe"; 399 + iommus = <&displaydfr_dart 0>; 400 + status = "disabled"; 401 + 402 + port { 403 + dfr_adp_out_mipi: endpoint { 404 + remote-endpoint = <&dfr_mipi_in_adp>; 405 + }; 406 + }; 407 + }; 408 + 409 + displaydfr_dart: iommu@228304000 { 410 + compatible = "apple,t8110-dart"; 411 + reg = <0x2 0x28304000 0x0 0x4000>; 412 + interrupt-parent = <&aic>; 413 + interrupts = <AIC_IRQ 616 IRQ_TYPE_LEVEL_HIGH>; 414 + #iommu-cells = <1>; 415 + power-domains = <&ps_dispdfr_fe>; 416 + status = "disabled"; 417 + }; 418 + 419 + displaydfr_mipi: dsi@228600000 { 420 + compatible = "apple,t8112-display-pipe-mipi", "apple,h7-display-pipe-mipi"; 421 + reg = <0x2 0x28600000 0x0 0x100000>; 422 + power-domains = <&ps_mipi_dsi>; 423 + #address-cells = <1>; 424 + #size-cells = <0>; 425 + status = "disabled"; 426 + 427 + ports { 428 + #address-cells = <1>; 429 + #size-cells = <0>; 430 + 431 + dfr_mipi_in: port@0 { 432 + reg = <0>; 433 + #address-cells = <1>; 434 + #size-cells = <0>; 435 + 436 + dfr_mipi_in_adp: endpoint@0 { 437 + reg = <0>; 438 + remote-endpoint = <&dfr_adp_out_mipi>; 439 + }; 440 + }; 441 + 442 + dfr_mipi_out: port@1 { 443 + reg = <1>; 444 + #address-cells = <1>; 445 + #size-cells = <0>; 446 + }; 447 + }; 448 + }; 449 + 389 450 sio_dart: iommu@235004000 { 390 451 compatible = "apple,t8110-dart"; 391 452 reg = <0x2 0x35004000 0x0 0x4000>;