Unverified Commit 9476d415 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 1e14b4f9 50aa09ac

arch/arm64/boot/dts/apple/t600x-die0.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -71,6 +71,15 @@ 
		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>;

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

+18 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 * Copyright The Asahi Linux Contributors

 */



#include <dt-bindings/leds/common.h>



/ {

	aliases {

		serial0 = &serial0;
@@ -34,6 +36,18 @@ 
		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 @@ 
		wp-inverted;

	};

};



&fpwm0 {

	status = "okay";

};

arch/arm64/boot/dts/apple/t8103-j293.dts

+17 −0
Original line number Diff line number Diff line
@@ -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 @@ 
&i2c4 {

	status = "okay";

};



&fpwm1 {

	status = "okay";

};

arch/arm64/boot/dts/apple/t8103-j313.dts

+17 −0
Original line number Diff line number Diff line
@@ -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 @@ 
&wifi0 {

	brcm,board-type = "apple,shikoku";

};



&fpwm1 {

	status = "okay";

};

arch/arm64/boot/dts/apple/t8103.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -432,6 +432,15 @@ 
			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>;