Skip to content

Commit 3e5c0cd

Browse files
jannaujannau
committed
Merge branch 'bits/000-devicetree' into asahi-wip
2 parents 9bc5c94 + ceb29a7 commit 3e5c0cd

138 files changed

Lines changed: 22779 additions & 178 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/arm/apple.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ description: |
5757
- iPad Pro (2nd Generation) (10.5 Inch)
5858
- iPad Pro (2nd Generation) (12.9 Inch)
5959
60+
Devices based on the "T2" SoC:
61+
62+
- Apple T2 MacBookPro15,2 (j132)
63+
- Apple T2 iMacPro1,1 (j137)
64+
- Apple T2 MacBookAir8,2 (j140a)
65+
- Apple T2 MacBookAir8,1 (j140k)
66+
- Apple T2 MacBookPro16,1 (j152f)
67+
- Apple T2 MacPro7,1 (j160)
68+
- Apple T2 Macmini8,1 (j174)
69+
- Apple T2 iMac20,1 (j185)
70+
- Apple T2 iMac20,2 (j185f)
71+
- Apple T2 MacBookPro15,4 (j213)
72+
- Apple T2 MacBookPro16,2 (j214k)
73+
- Apple T2 MacBookPro16,4 (j215)
74+
- Apple T2 MacBookPro16,3 (j223)
75+
- Apple T2 MacBookAir9,1 (j230k)
76+
- Apple T2 MacBookPro15,1 (j680)
77+
- Apple T2 MacBookPro15,3 (j780)
78+
6079
Devices based on the "A11" SoC:
6180
6281
- iPhone 8
@@ -211,6 +230,28 @@ properties:
211230
- const: apple,t8011
212231
- const: apple,arm-platform
213232

233+
- description: Apple T2 SoC based platforms
234+
items:
235+
- enum:
236+
- apple,j132 # Apple T2 MacBookPro15,2 (j132)
237+
- apple,j137 # Apple T2 iMacPro1,1 (j137)
238+
- apple,j140a # Apple T2 MacBookAir8,2 (j140a)
239+
- apple,j140k # Apple T2 MacBookAir8,1 (j140k)
240+
- apple,j152f # Apple T2 MacBookPro16,1 (j152f)
241+
- apple,j160 # Apple T2 MacPro7,1 (j160)
242+
- apple,j174 # Apple T2 Macmini8,1 (j174)
243+
- apple,j185 # Apple T2 iMac20,1 (j185)
244+
- apple,j185f # Apple T2 iMac20,2 (j185f)
245+
- apple,j213 # Apple T2 MacBookPro15,4 (j213)
246+
- apple,j214k # Apple T2 MacBookPro16,2 (j214k)
247+
- apple,j215 # Apple T2 MacBookPro16,4 (j215)
248+
- apple,j223 # Apple T2 MacBookPro16,3 (j223)
249+
- apple,j230k # Apple T2 MacBookAir9,1 (j230k)
250+
- apple,j680 # Apple T2 MacBookPro15,1 (j680)
251+
- apple,j780 # Apple T2 MacBookPro15,3 (j780)
252+
- const: apple,t8012
253+
- const: apple,arm-platform
254+
214255
- description: Apple A11 SoC based platforms
215256
items:
216257
- enum:

‎Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ properties:
2222
compatible:
2323
items:
2424
- enum:
25+
- apple,s5l8960x-pmgr
26+
- apple,t7000-pmgr
27+
- apple,s8000-pmgr
28+
- apple,t8010-pmgr
29+
- apple,t8015-pmgr
2530
- apple,t8103-pmgr
2631
- apple,t8112-pmgr
2732
- apple,t6000-pmgr

‎Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ properties:
3131
compatible:
3232
items:
3333
- enum:
34+
- apple,s5l8960x-pmgr-pwrstate
35+
- apple,t7000-pmgr-pwrstate
36+
- apple,s8000-pmgr-pwrstate
37+
- apple,t8010-pmgr-pwrstate
38+
- apple,t8015-pmgr-pwrstate
3439
- apple,t8103-pmgr-pwrstate
3540
- apple,t8112-pmgr-pwrstate
3641
- apple,t6000-pmgr-pwrstate

‎arch/arm64/boot/dts/apple/Makefile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ dtb-$(CONFIG_ARCH_APPLE) += t8011-j120.dtb
4646
dtb-$(CONFIG_ARCH_APPLE) += t8011-j121.dtb
4747
dtb-$(CONFIG_ARCH_APPLE) += t8011-j207.dtb
4848
dtb-$(CONFIG_ARCH_APPLE) += t8011-j208.dtb
49+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j132.dtb
50+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j137.dtb
51+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j140a.dtb
52+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j140k.dtb
53+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j152f.dtb
54+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j160.dtb
55+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j174.dtb
56+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j185.dtb
57+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j185f.dtb
58+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j213.dtb
59+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j215.dtb
60+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j223.dtb
61+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j230k.dtb
62+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j214k.dtb
63+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j680.dtb
64+
dtb-$(CONFIG_ARCH_APPLE) += t8012-j780.dtb
4965
dtb-$(CONFIG_ARCH_APPLE) += t8015-d201.dtb
5066
dtb-$(CONFIG_ARCH_APPLE) += t8015-d20.dtb
5167
dtb-$(CONFIG_ARCH_APPLE) += t8015-d211.dtb
@@ -64,5 +80,14 @@ dtb-$(CONFIG_ARCH_APPLE) += t6001-j316c.dtb
6480
dtb-$(CONFIG_ARCH_APPLE) += t6001-j375c.dtb
6581
dtb-$(CONFIG_ARCH_APPLE) += t6002-j375d.dtb
6682
dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
83+
dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
6784
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
6885
dtb-$(CONFIG_ARCH_APPLE) += t8112-j493.dtb
86+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j414s.dtb
87+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j414c.dtb
88+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j416s.dtb
89+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j416c.dtb
90+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j474s.dtb
91+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j475c.dtb
92+
dtb-$(CONFIG_ARCH_APPLE) += t6022-j475d.dtb
93+
dtb-$(CONFIG_ARCH_APPLE) += t6022-j180d.dtb

‎arch/arm64/boot/dts/apple/hwmon-common.dtsi‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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 {
9+
hwmon {
10+
apple,power-keys {
11+
power-PSTR {
12+
apple,key-id = "PSTR";
13+
label = "Total System Power";
14+
};
15+
power-PDTR {
16+
apple,key-id = "PDTR";
17+
label = "AC Input Power";
18+
};
19+
power-PMVR {
20+
apple,key-id = "PMVR";
21+
label = "3.8 V Rail Power";
22+
};
23+
};
24+
apple,temp-keys {
25+
temp-TH0x {
26+
apple,key-id = "TH0x";
27+
label = "NAND Flash Temperature";
28+
};
29+
};
30+
apple,volt-keys {
31+
volt-VD0R {
32+
apple,key-id = "VD0R";
33+
label = "AC Input Voltage";
34+
};
35+
};
36+
apple,current-keys {
37+
current-ID0R {
38+
apple,key-id = "ID0R";
39+
label = "AC Input Current";
40+
};
41+
};
42+
};
43+
};

‎arch/arm64/boot/dts/apple/hwmon-fan-dual.dtsi‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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 {
11+
hwmon {
12+
apple,fan-keys {
13+
fan-F0Ac {
14+
label = "Fan 1";
15+
};
16+
fan-F1Ac {
17+
apple,key-id = "F1Ac";
18+
label = "Fan 2";
19+
apple,fan-minimum = "F1Mn";
20+
apple,fan-maximum = "F1Mx";
21+
apple,fan-target = "F1Tg";
22+
apple,fan-mode = "F1Md";
23+
};
24+
};
25+
};
26+
};

‎arch/arm64/boot/dts/apple/hwmon-fan.dtsi‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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 {
9+
hwmon {
10+
apple,fan-keys {
11+
fan-F0Ac {
12+
apple,key-id = "F0Ac";
13+
label = "Fan";
14+
apple,fan-minimum = "F0Mn";
15+
apple,fan-maximum = "F0Mx";
16+
apple,fan-target = "F0Tg";
17+
apple,fan-mode = "F0Md";
18+
};
19+
};
20+
};
21+
};

‎arch/arm64/boot/dts/apple/hwmon-laptop.dtsi‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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 {
9+
hwmon {
10+
apple,power-keys {
11+
power-PHPC {
12+
apple,key-id = "PHPC";
13+
label = "Heatpipe Power";
14+
};
15+
};
16+
apple,temp-keys {
17+
temp-TB0T {
18+
apple,key-id = "TB0T";
19+
label = "Battery Hotspot";
20+
};
21+
temp-TCHP {
22+
apple,key-id = "TCHP";
23+
label = "Charge Regulator Temp";
24+
};
25+
temp-TW0P {
26+
apple,key-id = "TW0P";
27+
label = "WiFi/BT Module Temp";
28+
};
29+
};
30+
apple,volt-keys {
31+
volt-SBAV {
32+
apple,key-id = "SBAV";
33+
label = "Battery Voltage";
34+
};
35+
volt-VD0R {
36+
apple,key-id = "VD0R";
37+
label = "Charger Input Voltage";
38+
};
39+
};
40+
};
41+
};

‎arch/arm64/boot/dts/apple/hwmon-mini.dtsi‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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 {
12+
hwmon {
13+
apple,temp-keys {
14+
temp-TW0P {
15+
apple,key-id = "TW0P";
16+
label = "WiFi/BT Module Temp";
17+
};
18+
};
19+
};
20+
};

‎arch/arm64/boot/dts/apple/isp-common.dtsi‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Common ISP configuration for Apple silicon platforms.
4+
*
5+
* Copyright The Asahi Linux Contributors
6+
*/
7+
8+
/ {
9+
aliases {
10+
isp = &isp;
11+
};
12+
13+
reserved-memory {
14+
#address-cells = <2>;
15+
#size-cells = <2>;
16+
ranges;
17+
18+
isp_heap: isp-heap {
19+
compatible = "apple,asc-mem";
20+
/* Filled in by bootloder */
21+
reg = <0 0 0 0>;
22+
no-map;
23+
};
24+
};
25+
};
26+
27+
&isp {
28+
memory-region = <&isp_heap>;
29+
memory-region-names = "heap";
30+
status = "okay";
31+
};
32+
33+
&isp_dart0 {
34+
status = "okay";
35+
};
36+
37+
&isp_dart1 {
38+
status = "okay";
39+
};
40+
41+
&isp_dart2 {
42+
status = "okay";
43+
};
44+
45+
&ps_isp_sys {
46+
status = "okay";
47+
};

0 commit comments

Comments
 (0)