Skip to content

Commit 8b08a78

Browse files
ObiKeahloaObiKeahloa
committed
arm: dts: apple: Update Apple device trees
This synchronizes the device trees with those that are in the 6.18 kernel. Ideally, it will fix the issue of USB not working for users post update to 6.18 kernels. These now match the current state of the device trees on the asahi branch of the Asahi Linux github repository. Signed-off-by: Mayukh Bejoy <[email protected]>
1 parent 8aa706b commit 8b08a78

57 files changed

Lines changed: 3993 additions & 1382 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/dts/hwmon-common.dtsi‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* hwmon sensors expected on all systems
4+
*
5+
* Copyright The Asahi Linux Contributors
6+
*/
7+
8+
&smc_hwmon {
9+
power-PSTR {
10+
apple,key-id = "PSTR";
11+
label = "Total System Power";
12+
};
13+
power-PDTR {
14+
apple,key-id = "PDTR";
15+
label = "AC Input Power";
16+
};
17+
power-PMVR {
18+
apple,key-id = "PMVR";
19+
label = "3.8 V Rail Power";
20+
};
21+
temperature-TH0x {
22+
apple,key-id = "TH0x";
23+
label = "NAND Flash Temperature";
24+
};
25+
voltage-VD0R {
26+
apple,key-id = "VD0R";
27+
label = "AC Input Voltage";
28+
};
29+
current-ID0R {
30+
apple,key-id = "ID0R";
31+
label = "AC Input Current";
32+
};
33+
};

‎arch/arm/dts/hwmon-fan-dual.dtsi‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Copyright The Asahi Linux Contributors
4+
*
5+
* Fan hwmon sensors for machines with 2 fan.
6+
*/
7+
8+
#include "hwmon-fan.dtsi"
9+
10+
&smc_hwmon {
11+
fan-F0Ac {
12+
label = "Fan 1";
13+
};
14+
fan-F1Ac {
15+
apple,key-id = "F1Ac";
16+
label = "Fan 2";
17+
apple,fan-minimum = "F1Mn";
18+
apple,fan-maximum = "F1Mx";
19+
apple,fan-target = "F1Tg";
20+
apple,fan-mode = "F1Md";
21+
};
22+
};

‎arch/arm/dts/hwmon-fan.dtsi‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Copyright The Asahi Linux Contributors
4+
*
5+
* Fan hwmon sensors for machines with a single fan.
6+
*/
7+
8+
&smc_hwmon {
9+
fan-F0Ac {
10+
apple,key-id = "F0Ac";
11+
label = "Fan";
12+
apple,fan-minimum = "F0Mn";
13+
apple,fan-maximum = "F0Mx";
14+
apple,fan-target = "F0Tg";
15+
apple,fan-mode = "F0Md";
16+
};
17+
};

‎arch/arm/dts/hwmon-laptop.dtsi‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* hwmon sensors expected on all laptops
4+
*
5+
* Copyright The Asahi Linux Contributors
6+
*/
7+
8+
&smc_hwmon {
9+
power-PHPC {
10+
apple,key-id = "PHPC";
11+
label = "Heatpipe Power";
12+
};
13+
temperature-TB0T {
14+
apple,key-id = "TB0T";
15+
label = "Battery Hotspot";
16+
};
17+
temperature-TCHP {
18+
apple,key-id = "TCHP";
19+
label = "Charge Regulator Temp";
20+
};
21+
temperature-TW0P {
22+
apple,key-id = "TW0P";
23+
label = "WiFi/BT Module Temp";
24+
};
25+
voltage-SBAV {
26+
apple,key-id = "SBAV";
27+
label = "Battery Voltage";
28+
};
29+
voltage-VD0R {
30+
apple,key-id = "VD0R";
31+
label = "Charger Input Voltage";
32+
};
33+
};

‎arch/arm/dts/hwmon-mini.dtsi‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* hwmon sensors common to the Mac mini desktop
4+
* models, but not the Studio or Pro.
5+
*
6+
* Copyright The Asahi Linux Contributors
7+
*/
8+
9+
#include "hwmon-fan.dtsi"
10+
11+
&smc_hwmon {
12+
temperature-TW0P {
13+
apple,key-id = "TW0P";
14+
label = "WiFi/BT Module Temp";
15+
};
16+
};

‎arch/arm/dts/spi1-nvram.dtsi‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2-
/*
3-
* Common config for Apple's nvram using a SPI nor flash. This is common on all
4-
* M1 and M2 devices. identically set up identically on all M1 and M2 devicesspi1, spinor and nvram config identical on all devices
5-
*
6-
* Copyright The Asahi Linux Contributors
7-
*/
2+
//
3+
// Devicetree include for common spi-nor nvram flash.
4+
//
5+
// Apple uses a consistent configiguration for the nvram on all known M1* and
6+
// M2* devices.
7+
//
8+
// Copyright The Asahi Linux Contributors
9+
10+
/ {
11+
aliases {
12+
nvram = &nvram;
13+
};
14+
};
815

916
&spi1 {
1017
status = "okay";
@@ -13,8 +20,6 @@
1320
compatible = "jedec,spi-nor";
1421
reg = <0x0>;
1522
spi-max-frequency = <25000000>;
16-
#address-cells = <1>;
17-
#size-cells = <1>;
1823

1924
partitions {
2025
compatible = "fixed-partitions";

‎arch/arm/dts/t6000-j314s.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
adj-height-mm = <189>;
3333
};
3434

35+
&aop_audio {
36+
apple,chassis-name = "J314";
37+
apple,machine-kind = "MacBook Pro";
38+
};
39+
3540
&sound {
3641
compatible = "apple,j314-macaudio", "apple,macaudio";
3742
model = "MacBook Pro J314";

‎arch/arm/dts/t6000-j316s.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
adj-height-mm = <216>;
3333
};
3434

35+
&aop_audio {
36+
apple,chassis-name = "J316";
37+
apple,machine-kind = "MacBook Pro";
38+
};
39+
3540
&sound {
3641
compatible = "apple,j316-macaudio", "apple,macaudio";
3742
model = "MacBook Pro J316";

‎arch/arm/dts/t6001-j314c.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
adj-height-mm = <189>;
3333
};
3434

35+
&aop_audio {
36+
apple,chassis-name = "J314";
37+
apple,machine-kind = "MacBook Pro";
38+
};
39+
3540
&sound {
3641
compatible = "apple,j314-macaudio", "apple,macaudio";
3742
model = "MacBook Pro J314";

‎arch/arm/dts/t6001-j316c.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
adj-height-mm = <216>;
3333
};
3434

35+
&aop_audio {
36+
apple,chassis-name = "J316";
37+
apple,machine-kind = "MacBook Pro";
38+
};
39+
3540
&sound {
3641
compatible = "apple,j316-macaudio", "apple,macaudio";
3742
model = "MacBook Pro J316";

0 commit comments

Comments
 (0)