Skip to content

Commit e5e080c

Browse files
jannaujannau
committed
Merge branch 'bits/000-devicetree' into asahi-wip
2 parents 9c5a72f + 1f815c7 commit e5e080c

62 files changed

Lines changed: 12989 additions & 50 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
@@ -11,5 +11,14 @@ dtb-$(CONFIG_ARCH_APPLE) += t6001-j316c.dtb
1111
dtb-$(CONFIG_ARCH_APPLE) += t6001-j375c.dtb
1212
dtb-$(CONFIG_ARCH_APPLE) += t6002-j375d.dtb
1313
dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
14+
dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
1415
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
1516
dtb-$(CONFIG_ARCH_APPLE) += t8112-j493.dtb
17+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j414s.dtb
18+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j414c.dtb
19+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j416s.dtb
20+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j416c.dtb
21+
dtb-$(CONFIG_ARCH_APPLE) += t6020-j474s.dtb
22+
dtb-$(CONFIG_ARCH_APPLE) += t6021-j475c.dtb
23+
dtb-$(CONFIG_ARCH_APPLE) += t6022-j475d.dtb
24+
dtb-$(CONFIG_ARCH_APPLE) += t6022-j180d.dtb

‎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+
};

‎arch/arm64/boot/dts/apple/isp-imx558-cfg0.dtsi‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* ISP configuration for platforms with IMX558 sensor in
4+
* config #0 mode.
5+
*
6+
* These platforms enable MLVNR for all configs except
7+
* #0, which we don't support. Config #0 is an uncropped
8+
* square 1920x1920 sensor, with dark corners.
9+
* Therefore, we synthesize common resolutions by using
10+
* crop/scale while always choosing config #0.
11+
*
12+
* Copyright The Asahi Linux Contributors
13+
*/
14+
15+
#include "isp-common.dtsi"
16+
17+
&isp {
18+
apple,temporal-filter = <0>;
19+
20+
sensor-presets {
21+
/* 1920x1080 */
22+
preset0 {
23+
apple,config-index = <0>;
24+
apple,input-size = <1920 1920>;
25+
apple,output-size = <1920 1080>;
26+
apple,crop = <0 420 1920 1080>;
27+
};
28+
/* 1080x1920 */
29+
preset1 {
30+
apple,config-index = <0>;
31+
apple,input-size = <1920 1920>;
32+
apple,output-size = <1080 1920>;
33+
apple,crop = <420 0 1080 1920>;
34+
};
35+
/* 1920x1440 */
36+
preset2 {
37+
apple,config-index = <0>;
38+
apple,input-size = <1920 1920>;
39+
apple,output-size = <1920 1440>;
40+
apple,crop = <0 240 1920 1440>;
41+
};
42+
/* 1440x1920 */
43+
preset3 {
44+
apple,config-index = <0>;
45+
apple,input-size = <1920 1920>;
46+
apple,output-size = <1440 1920>;
47+
apple,crop = <240 0 1440 1920>;
48+
};
49+
/* 1280x720 */
50+
preset4 {
51+
apple,config-index = <0>;
52+
apple,input-size = <1920 1920>;
53+
apple,output-size = <1280 720>;
54+
apple,crop = <0 420 1920 1080>;
55+
};
56+
/* 720x1280 */
57+
preset5 {
58+
apple,config-index = <0>;
59+
apple,input-size = <1920 1920>;
60+
apple,output-size = <720 1280>;
61+
apple,crop = <420 0 1080 1920>;
62+
};
63+
/* 1280x960 */
64+
preset6 {
65+
apple,config-index = <0>;
66+
apple,input-size = <1920 1920>;
67+
apple,output-size = <1280 960>;
68+
apple,crop = <0 240 1920 1440>;
69+
};
70+
/* 960x1280 */
71+
preset7 {
72+
apple,config-index = <0>;
73+
apple,input-size = <1920 1920>;
74+
apple,output-size = <960 1280>;
75+
apple,crop = <240 0 1440 1920>;
76+
};
77+
/* 640x480 */
78+
preset8 {
79+
apple,config-index = <0>;
80+
apple,input-size = <1920 1920>;
81+
apple,output-size = <640 480>;
82+
apple,crop = <0 240 1920 1440>;
83+
};
84+
/* 480x640 */
85+
preset9 {
86+
apple,config-index = <0>;
87+
apple,input-size = <1920 1920>;
88+
apple,output-size = <480 640>;
89+
apple,crop = <240 0 1440 1920>;
90+
};
91+
};
92+
};

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

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* ISP configuration for platforms with IMX558 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 = <1>;
17+
apple,input-size = <1920 1080>;
18+
apple,output-size = <1920 1080>;
19+
apple,crop = <0 0 1920 1080>;
20+
};
21+
/* 1080x1920 */
22+
preset1 {
23+
apple,config-index = <2>;
24+
apple,input-size = <1080 1920>;
25+
apple,output-size = <1080 1920>;
26+
apple,crop = <0 0 1080 1920>;
27+
};
28+
/* 1760x1328 */
29+
preset2 {
30+
apple,config-index = <3>;
31+
apple,input-size = <1760 1328>;
32+
apple,output-size = <1760 1328>;
33+
apple,crop = <0 0 1760 1328>;
34+
};
35+
/* 1328x1760 */
36+
preset3 {
37+
apple,config-index = <4>;
38+
apple,input-size = <1328 1760>;
39+
apple,output-size = < 1328 1760>;
40+
apple,crop = <0 0 1328 1760>;
41+
};
42+
/* 1152x1152 */
43+
preset4 {
44+
apple,config-index = <5>;
45+
apple,input-size = <1152 1152>;
46+
apple,output-size = <1152 1152>;
47+
apple,crop = <0 0 1152 1152>;
48+
};
49+
/* 1280x720 */
50+
preset5 {
51+
apple,config-index = <1>;
52+
apple,input-size = <1920 1080>;
53+
apple,output-size = <1280 720>;
54+
apple,crop = <0 0 1920 1080>;
55+
};
56+
/* 720x1280 */
57+
preset6 {
58+
apple,config-index = <2>;
59+
apple,input-size = <1080 1920>;
60+
apple,output-size = <720 1280>;
61+
apple,crop = <0 0 1080 1920>;
62+
};
63+
/* 1280x960 */
64+
preset7 {
65+
apple,config-index = <3>;
66+
apple,input-size = <1760 1328>;
67+
apple,output-size = <1280 960>;
68+
apple,crop = <0 4 1760 1320>;
69+
};
70+
/* 960x1280 */
71+
preset8 {
72+
apple,config-index = <4>;
73+
apple,input-size = <1328 1760>;
74+
apple,output-size = <960 1280>;
75+
apple,crop = <4 0 1320 1760>;
76+
};
77+
/* 640x480 */
78+
preset9 {
79+
apple,config-index = <3>;
80+
apple,input-size = <1760 1328>;
81+
apple,output-size = <640 480>;
82+
apple,crop = <0 4 1760 1320>;
83+
};
84+
/* 480x640 */
85+
preset10 {
86+
apple,config-index = <4>;
87+
apple,input-size = <1328 1760>;
88+
apple,output-size = <480 640>;
89+
apple,crop = <4 0 1320 1760>;
90+
};
91+
};
92+
};

0 commit comments

Comments
 (0)