Skip to content

Commit bb99aff

Browse files
jannaujannau
committed
Merge branch 'bits/000-devicetree' into asahi-wip
2 parents cb1830e + 18be80d commit bb99aff

76 files changed

Lines changed: 13884 additions & 38 deletions

Some content is hidden

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

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,14 @@ dtb-$(CONFIG_ARCH_APPLE) += t6001-j316c.dtb
8080
dtb-$(CONFIG_ARCH_APPLE) += t6001-j375c.dtb
8181
dtb-$(CONFIG_ARCH_APPLE) += t6002-j375d.dtb
8282
dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
83+
dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
8384
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
8485
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+
};

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* ISP configuration for platforms with IMX248 sensor.
4+
*
5+
* Copyright The Asahi Linux Contributors
6+
*/
7+
8+
#include "isp-common.dtsi"
9+
10+
&isp {
11+
apple,temporal-filter = <0>;
12+
13+
sensor-presets {
14+
/* 1280x720 */
15+
preset0 {
16+
apple,config-index = <0>;
17+
apple,input-size = <1296 736>;
18+
apple,output-size = <1280 720>;
19+
apple,crop = <8 8 1280 720>;
20+
};
21+
/* 960x720 (4:3) */
22+
preset1 {
23+
apple,config-index = <0>;
24+
apple,input-size = <1296 736>;
25+
apple,output-size = <960 720>;
26+
apple,crop = <168 8 960 720>;
27+
};
28+
/* 960x540 (16:9) */
29+
preset2 {
30+
apple,config-index = <0>;
31+
apple,input-size = <1296 736>;
32+
apple,output-size = <960 540>;
33+
apple,crop = <8 8 1280 720>;
34+
};
35+
/* 640x480 (4:3) */
36+
preset3 {
37+
apple,config-index = <0>;
38+
apple,input-size = <1296 736>;
39+
apple,output-size = <640 480>;
40+
apple,crop = <168 8 960 720>;
41+
};
42+
/* 640x360 (16:9) */
43+
preset4 {
44+
apple,config-index = <0>;
45+
apple,input-size = <1296 736>;
46+
apple,output-size = <640 360>;
47+
apple,crop = <8 8 1280 720>;
48+
};
49+
/* 320x180 (16:9) */
50+
preset5 {
51+
apple,config-index = <0>;
52+
apple,input-size = <1296 736>;
53+
apple,output-size = <320 180>;
54+
apple,crop = <8 8 1280 720>;
55+
};
56+
};
57+
};

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* ISP configuration for platforms with IMX364 sensor.
4+
*
5+
* Copyright The Asahi Linux Contributors
6+
*/
7+
8+
#include "isp-common.dtsi"
9+
10+
&isp {
11+
apple,temporal-filter = <0>;
12+
13+
sensor-presets {
14+
/* 1920x1080 */
15+
preset0 {
16+
apple,config-index = <0>;
17+
apple,input-size = <1920 1080>;
18+
apple,output-size = <1920 1080>;
19+
apple,crop = <0 0 1920 1080>;
20+
};
21+
/* 1440x720 (4:3) */
22+
preset1 {
23+
apple,config-index = <0>;
24+
apple,input-size = <1920 1080>;
25+
apple,output-size = <1440 1080>;
26+
apple,crop = <240 0 1440 1080>;
27+
};
28+
/* 1280x720 (16:9) */
29+
preset2 {
30+
apple,config-index = <0>;
31+
apple,input-size = <1920 1080>;
32+
apple,output-size = <1280 720>;
33+
apple,crop = <0 0 1920 1080>;
34+
};
35+
/* 960x720 (4:3) */
36+
preset3{
37+
apple,config-index = <0>;
38+
apple,input-size = <1920 1080>;
39+
apple,output-size = <960 720>;
40+
apple,crop = <240 0 1440 1080>;
41+
};
42+
/* 960x540 (16:9) */
43+
preset4 {
44+
apple,config-index = <0>;
45+
apple,input-size = <1920 1080>;
46+
apple,output-size = <960 540>;
47+
apple,crop = <0 0 1920 1080>;
48+
};
49+
/* 640x480 (4:3) */
50+
preset5 {
51+
apple,config-index = <0>;
52+
apple,input-size = <1920 1080>;
53+
apple,output-size = <640 480>;
54+
apple,crop = <240 0 1440 1080>;
55+
};
56+
/* 640x360 (16:9) */
57+
preset6 {
58+
apple,config-index = <0>;
59+
apple,input-size = <1920 1080>;
60+
apple,output-size = <640 360>;
61+
apple,crop = <0 0 1920 1080>;
62+
};
63+
/* 320x180 (16:9) */
64+
preset7 {
65+
apple,config-index = <0>;
66+
apple,input-size = <1920 1080>;
67+
apple,output-size = <320 180>;
68+
apple,crop = <0 0 1920 1080>;
69+
};
70+
};
71+
};

0 commit comments

Comments
 (0)