arm: dts: apple: Update Apple M1 device trees

This synchronizes the device trees with those that are in the process of being upstreamed into Linux. These now match the current state of the device trees on the asahi branch of the Asahi Linux github repository. Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
jannau · Feb 19, 2022 · 0a50f5d · 0a50f5d
1 parent 1a68d0a
commit 0a50f5d
Show file tree

Hide file tree

Showing 7 changed files with 340 additions and 81 deletions.
diff --git a/arch/arm/dts/t8103-j274.dts b/arch/arm/dts/t8103-j274.dts
@@ -57,21 +57,17 @@
 };
 
 &i2c1 {
-	clock-frequency = <50000>;
-
 	speaker_amp: codec@31 {
 		compatible = "ti,tas5770l", "ti,tas2770";
 		reg = <0x31>;
 		reset-gpios = <&pinctrl_ap 181 GPIO_ACTIVE_HIGH>;
 		#sound-dai-cells = <0>;
-	};
+	};	
 };
 
 &i2c2 {
 	status = "okay";
 
-	clock-frequency = <50000>;
-
 	jack_codec: codec@48 {
 		compatible = "cirrus,cs42l83", "cirrus,cs42l42";
 		reg = <0x48>;
@@ -93,7 +89,6 @@
 		simple-audio-card,dai-link@0 {
 			reg = <0>;
 			format = "left_j";
-			tdm-slot-width = <32>;
 			mclk-fs = <64>;
 
 			link0_cpu: cpu {
@@ -108,12 +103,11 @@
 		};
 
 		simple-audio-card,dai-link@1 {
+			reg = <1>;
 			bitclock-inversion;
 			frame-inversion;
-			reg = <1>;
 			format = "i2s";
 			mclk-fs = <64>;
-			tdm-slot-width = <32>;
 
 			link1_cpu: cpu {
 				sound-dai = <&mca 2>;

diff --git a/arch/arm/dts/t8103-j293.dts b/arch/arm/dts/t8103-j293.dts
@@ -70,7 +70,6 @@
 
 &i2c2 {
 	status = "okay";
-	clock-frequency = <50000>;
 
 	jack_codec: codec@48 {
 		compatible = "cirrus,cs42l83", "cirrus,cs42l42";

diff --git a/arch/arm/dts/t8103-j313.dts b/arch/arm/dts/t8103-j313.dts
@@ -69,8 +69,6 @@
 /delete-node/ &port02;
 
 &i2c3 {
-	clock-frequency = <50000>;
-
 	jack_codec: codec@48 {
 		compatible = "cirrus,cs42l83", "cirrus,cs42l42";
 		reg = <0x48>;

diff --git a/arch/arm/dts/t8103-j456.dts b/arch/arm/dts/t8103-j456.dts
@@ -75,8 +75,6 @@
 };
 
 &i2c1 {
-	clock-frequency = <50000>;
-
 	jack_codec: codec@48 {
 		compatible = "cirrus,cs42l83", "cirrus,cs42l42";
 		reg = <0x48>;

diff --git a/arch/arm/dts/t8103-j457.dts b/arch/arm/dts/t8103-j457.dts
@@ -63,8 +63,6 @@
 /delete-node/ &port01;
 
 &i2c1 {
-	clock-frequency = <50000>;
-
 	jack_codec: codec@48 {
 		compatible = "cirrus,cs42l83", "cirrus,cs42l42";
 		reg = <0x48>;

diff --git a/arch/arm/dts/t8103-jxxx.dtsi b/arch/arm/dts/t8103-jxxx.dtsi
@@ -9,8 +9,6 @@
  * Copyright The Asahi Linux Contributors
  */
 
-#include <dt-bindings/spmi/spmi.h>
-
 / {
 	aliases {
 		serial0 = &serial0;
@@ -123,7 +121,7 @@
  */
 &port00 {
 	bus-range = <1 1>;
-	pwren-gpios = <&smc 13 0>;
+	pwren-gpios = <&smc_gpio 13 GPIO_ACTIVE_HIGH>;
 	wifi0: network@0,0 {
 		compatible = "pci14e4,4425";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
@@ -132,12 +130,3 @@
 		apple,antenna-sku = "XX";
 	};
 };
-
-&spmi {
-	status = "okay";
-
-	pmu@f {
-		compatible = "apple,sera-pmu";
-		reg = <0xf SPMI_USID>;
-	};
-};