github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Apple SoC DT updates for 6.4 (v2).

Browse Source 
A late addition to the tree, adding the PWM controllers and associated
 keyboard backlight nodes, since that driver and its bindings are now
 on the way to 6.4.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSByI3Ki0mXziclZJcd+FPLCI8zYgUCZD0PuAAKCRAd+FPLCI8z
 YljSAP9IWstTYTmoFOga4Ba4S8LBcmuTBUqHmVbHNZYCO3JrfwD/T4Xn2qvHfdsd
 /ajLodjmHoLh/E6HuSai55u6YLGi6As=
 =e3Zh
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmQ9VI4ACgkQYKtH/8kJ
 UifvERAAjeIQ215j/PgBivMcYy28eF7aL0TB56ztVq8LEQoC0rwEQu8vdgKGHECW
 qvyjviWlg50aFbL2dRphsdtmeQsjc4cUfiH//UyehcTxFKkqaegVwi41bXktqUC6
 vMRwoUBKOmAWSKZtOVy6gxNFETxf+nS72ZJUwUX/ckQZ+qFHFOOOy4jsqbe5KUnp
 tK/dKNn51dHvrWRQ+8x+ZqpGFwF71SLtmKfHWyraSIQOSL94RDj5JrDzGGzYaXAs
 57ZfBF6Fmpro0tKhJz7fDLvqpYSthgi9aYoHarTui52eJzcAIc7OGhl+CuQF4rfZ
 2K9vWnKkRMP2Faj2B/sKZB26my3rby3ir4YprLEMCeGFhKsvOh3k9B8AMhz3XCPU
 AeM2hXI+lL09cwbcW5remgNA5ctSWK/Yy5ZvN5aV2xM1hpJFco9WHKNBJi9RJpvn
 Z5E4bDGy1nzyUfHGEPeJxlXAAyc8aqCJj9ELNr8YvqbZ9fKN57w3Za/mVYJgIB2e
 EVmIdmsXrmrwm1cssd2wt977Fk6oty5Ett6sp45Vbxqd/rLzFW6/BkKTW4N6+YEI
 H7gtjZyJ0WXFy40lgQSWuSBtDEhmmCAiyXM7VMVB0TGVTQcHLsgPlg4ksnPJ40Xo
 110vdJr6N0+hW2va3Hjp3+Wma6/3I3sbgtIOEsUowZjaRPxdF5Y=
 =sofq
 -----END PGP SIGNATURE-----

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

Apple SoC DT updates for 6.4 (v2).

A late addition to the tree, adding the PWM controllers and associated
keyboard backlight nodes, since that driver and its bindings are now
on the way to 6.4.

* tag 'asahi-soc-dt-6.4-v2' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: t8112: Add PWM controller
  arm64: dts: apple: t600x: Add PWM controller
  arm64: dts: apple: t8103: Add PWM controller

Link: https://lore.kernel.org/r/d0862463-acb3-ce83-6493-281a833ec87e@marcan.st
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-17 16:15:40 +02:00
commit 9476d415f7
8 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm64/boot/dts/apple/t600x-die0.dtsi
View File

@ -71,6 +71,15 @@ sio_dart_1: iommu@39b008000 {
power-domains = <&ps_sio_cpu>;
};
fpwm0: pwm@39b030000 {
compatible = "apple,t6000-fpwm", "apple,s5l-fpwm";
reg = <0x3 0x9b030000 0x0 0x4000>;
power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
#pwm-cells = <2>;
status = "disabled";
};
i2c0: i2c@39b040000 {
compatible = "apple,t6000-i2c", "apple,i2c";
reg = <0x3 0x9b040000 0x0 0x4000>;

18
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View File

@ -9,6 +9,8 @@
* Copyright The Asahi Linux Contributors
*/
#include <dt-bindings/leds/common.h>
/ {
aliases {
serial0 = &serial0;
@ -34,6 +36,18 @@ memory@10000000000 {
device_type = "memory";
reg = <0x100 0 0x2 0>; /* To be filled by loader */
};
led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm0 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};
&serial0 {
@ -101,3 +115,7 @@ sdhci0: mmc@0,0 {
wp-inverted;
};
};
&fpwm0 {
status = "okay";
};

17
arch/arm64/boot/dts/apple/t8103-j293.dts
View File

@ -11,10 +11,23 @@
#include "t8103.dtsi"
#include "t8103-jxxx.dtsi"
#include <dt-bindings/leds/common.h>
/ {
compatible = "apple,j293", "apple,t8103", "apple,arm-platform";
model = "Apple MacBook Pro (13-inch, M1, 2020)";
led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};
&bluetooth0 {
@ -32,3 +45,7 @@ &i2c2 {
&i2c4 {
status = "okay";
};
&fpwm1 {
status = "okay";
};

17
arch/arm64/boot/dts/apple/t8103-j313.dts
View File

@ -11,10 +11,23 @@
#include "t8103.dtsi"
#include "t8103-jxxx.dtsi"
#include <dt-bindings/leds/common.h>
/ {
compatible = "apple,j313", "apple,t8103", "apple,arm-platform";
model = "Apple MacBook Air (M1, 2020)";
led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};
&bluetooth0 {
@ -24,3 +37,7 @@ &bluetooth0 {
&wifi0 {
brcm,board-type = "apple,shikoku";
};
&fpwm1 {
status = "okay";
};

9
arch/arm64/boot/dts/apple/t8103.dtsi
View File

@ -432,6 +432,15 @@ i2c4: i2c@235020000 {
status = "disabled"; /* only used in J293 */
};
fpwm1: pwm@235044000 {
compatible = "apple,t8103-fpwm", "apple,s5l-fpwm";
reg = <0x2 0x35044000 0x0 0x4000>;
power-domains = <&ps_fpwm1>;
clocks = <&clkref>;
#pwm-cells = <2>;
status = "disabled";
};
serial0: serial@235200000 {
compatible = "apple,s5l-uart";
reg = <0x2 0x35200000 0x0 0x1000>;

17
arch/arm64/boot/dts/apple/t8112-j413.dts
View File

@ -11,6 +11,7 @@
#include "t8112.dtsi"
#include "t8112-jxxx.dtsi"
#include <dt-bindings/leds/common.h>
/ {
compatible = "apple,j413", "apple,t8112", "apple,arm-platform";
@ -20,6 +21,18 @@ aliases {
bluetooth0 = &bluetooth0;
wifi0 = &wifi0;
};
led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};
/*
@ -61,3 +74,7 @@ hpm5: usb-pd@3a {
&i2c4 {
status = "okay";
};
&fpwm1 {
status = "okay";
};

17
arch/arm64/boot/dts/apple/t8112-j493.dts
View File

@ -11,6 +11,7 @@
#include "t8112.dtsi"
#include "t8112-jxxx.dtsi"
#include <dt-bindings/leds/common.h>
/ {
compatible = "apple,j493", "apple,t8112", "apple,arm-platform";
@ -20,6 +21,18 @@ aliases {
bluetooth0 = &bluetooth0;
wifi0 = &wifi0;
};
led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};
/*
@ -50,3 +63,7 @@ bluetooth0: bluetooth@0,1 {
&i2c4 {
status = "okay";
};
&fpwm1 {
status = "okay";
};

9
arch/arm64/boot/dts/apple/t8112.dtsi
View File

@ -458,6 +458,15 @@ i2c4: i2c@235020000 {
status = "disabled";
};
fpwm1: pwm@235044000 {
compatible = "apple,t8112-fpwm", "apple,s5l-fpwm";
reg = <0x2 0x35044000 0x0 0x4000>;
power-domains = <&ps_fpwm1>;
clocks = <&clkref>;
#pwm-cells = <2>;
status = "disabled";
};
serial0: serial@235200000 {
compatible = "apple,s5l-uart";
reg = <0x2 0x35200000 0x0 0x1000>;