Skip to content

Commit 94dd51c

Browse files
arndbarndb
committed
Merge tag 'asahi-soc-dt-6.13' of https://github.com/AsahiLinux/linux into soc/dt
Apple SoC DT updates for 6.13: - Added base DTs for a bunch of non-Mac Apple iDevices (pre-M1) * tag 'asahi-soc-dt-6.13' of https://github.com/AsahiLinux/linux: arm64: Kconfig: Update help text for CONFIG_ARCH_APPLE arm64: dts: apple: Add A11 devices arm64: dts: apple: Add A10X devices arm64: dts: apple: Add A10 devices arm64: dts: apple: Add A9X devices arm64: dts: apple: Add A9 devices arm64: dts: apple: Add A8X devices arm64: dts: apple: Add A8 devices arm64: dts: apple: Add A7 devices dt-bindings: arm: apple: Add A11 devices dt-bindings: arm: apple: Add A10X devices dt-bindings: arm: apple: Add A10 devices dt-bindings: arm: apple: Add A9X devices dt-bindings: arm: apple: Add A9 devices dt-bindings: arm: apple: Add A8X devices dt-bindings: arm: apple: Add A8 devices dt-bindings: arm: apple: Add A7 devices dt-bindings: pinctrl: apple,pinctrl: Add A7-A11 compatibles dt-bindings: watchdog: apple,wdt: Add A7-A11 compatibles dt-bindings: arm: cpus: Add Apple A7-A11 CPU cores Link: https://lore.kernel.org/r/a8a19596-5d46-4562-9555-3b3ae7a5a3e5@marcan.st Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 31257ea + 5c9de6f commit 94dd51c

94 files changed

Lines changed: 3298 additions & 4 deletions

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: 159 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,58 @@ maintainers:
1212
description: |
1313
ARM platforms using SoCs designed by Apple Inc., branded "Apple Silicon".
1414
15-
This currently includes devices based on the "M1" SoC:
15+
This currently includes devices based on the "A7" SoC:
16+
17+
- iPhone 5s
18+
- iPad Air (1)
19+
- iPad mini 2
20+
- iPad mini 3
21+
22+
Devices based on the "A8" SoC:
23+
24+
- iPhone 6
25+
- iPhone 6 Plus
26+
- iPad mini 4
27+
- iPod touch 6
28+
- Apple TV HD
29+
30+
Device based on the "A8X" SoC:
31+
32+
- iPad Air 2
33+
34+
Devices based on the "A9" SoC:
35+
36+
- iPhone 6s
37+
- iPhone 6s Plus
38+
- iPhone SE (2016)
39+
- iPad 5
40+
41+
Devices based on the "A9X" SoC:
42+
43+
- iPad Pro (9.7-inch)
44+
- iPad Pro (12.9-inch)
45+
46+
Devices based on the "A10" SoC:
47+
48+
- iPhone 7
49+
- iPhone 7 Plus
50+
- iPod touch 7
51+
- iPad 6
52+
- iPad 7
53+
54+
Devices based on the "A10X" SoC:
55+
56+
- Apple TV 4K (1st generation)
57+
- iPad Pro (2nd Generation) (10.5 Inch)
58+
- iPad Pro (2nd Generation) (12.9 Inch)
59+
60+
Devices based on the "A11" SoC:
61+
62+
- iPhone 8
63+
- iPhone 8 Plus
64+
- iPhone X
65+
66+
Devices based on the "M1" SoC:
1667
1768
- Mac mini (M1, 2020)
1869
- MacBook Pro (13-inch, M1, 2020)
@@ -65,6 +116,113 @@ properties:
65116
const: "/"
66117
compatible:
67118
oneOf:
119+
- description: Apple A7 SoC based platforms
120+
items:
121+
- enum:
122+
- apple,j71 # iPad Air (Wi-Fi)
123+
- apple,j72 # iPad Air (Cellular)
124+
- apple,j73 # iPad Air (Cellular, China)
125+
- apple,j85 # iPad mini 2 (Wi-Fi)
126+
- apple,j85m # iPad mini 3 (Wi-Fi)
127+
- apple,j86 # iPad mini 2 (Cellular)
128+
- apple,j86m # iPad mini 3 (Cellular)
129+
- apple,j87 # iPad mini 2 (Cellular, China)
130+
- apple,j87m # iPad mini 3 (Cellular, China)
131+
- apple,n51 # iPhone 5s (GSM)
132+
- apple,n53 # iPhone 5s (LTE)
133+
- const: apple,s5l8960x
134+
- const: apple,arm-platform
135+
136+
- description: Apple A8 SoC based platforms
137+
items:
138+
- enum:
139+
- apple,j42d # Apple TV HD
140+
- apple,j96 # iPad mini 4 (Wi-Fi)
141+
- apple,j97 # iPad mini 4 (Cellular)
142+
- apple,n56 # iPhone 6 Plus
143+
- apple,n61 # iPhone 6
144+
- apple,n102 # iPod touch 6
145+
- const: apple,t7000
146+
- const: apple,arm-platform
147+
148+
- description: Apple A8X SoC based platforms
149+
items:
150+
- enum:
151+
- apple,j81 # iPad Air 2 (Wi-Fi)
152+
- apple,j82 # iPad Air 2 (Cellular)
153+
- const: apple,t7001
154+
- const: apple,arm-platform
155+
156+
- description: Apple Samsung A9 SoC based platforms
157+
items:
158+
- enum:
159+
- apple,j71s # iPad 5 (Wi-Fi) (S8000)
160+
- apple,j72s # iPad 5 (Cellular) (S8000)
161+
- apple,n66 # iPhone 6s Plus (S8000)
162+
- apple,n69u # iPhone SE (S8000)
163+
- apple,n71 # iPhone 6S (S8000)
164+
- const: apple,s8000
165+
- const: apple,arm-platform
166+
167+
- description: Apple TSMC A9 SoC based platforms
168+
items:
169+
- enum:
170+
- apple,j71t # iPad 5 (Wi-Fi) (S8003)
171+
- apple,j72t # iPad 5 (Cellular) (S8003)
172+
- apple,n66m # iPhone 6s Plus (S8003)
173+
- apple,n69 # iPhone SE (S8003)
174+
- apple,n71m # iPhone 6S (S8003)
175+
- const: apple,s8003
176+
- const: apple,arm-platform
177+
178+
- description: Apple A9X SoC based platforms
179+
items:
180+
- enum:
181+
- apple,j127 # iPad Pro (9.7-inch) (Wi-Fi)
182+
- apple,j128 # iPad Pro (9.7-inch) (Cellular)
183+
- apple,j98a # iPad Pro (12.9-inch) (Wi-Fi)
184+
- apple,j99a # iPad Pro (12.9-inch) (Cellular)
185+
- const: apple,s8001
186+
- const: apple,arm-platform
187+
188+
- description: Apple A10 SoC based platforms
189+
items:
190+
- enum:
191+
- apple,d10 # iPhone 7 (Qualcomm)
192+
- apple,d11 # iPhone 7 (Intel)
193+
- apple,d101 # iPhone 7 Plus (Qualcomm)
194+
- apple,d111 # iPhone 7 Plus (Intel)
195+
- apple,j71b # iPad 6 (Wi-Fi)
196+
- apple,j72b # iPad 6 (Cellular)
197+
- apple,j171 # iPad 7 (Wi-Fi)
198+
- apple,j172 # iPad 7 (Cellular)
199+
- apple,n112 # iPod touch 7
200+
- const: apple,t8010
201+
- const: apple,arm-platform
202+
203+
- description: Apple A10X SoC based platforms
204+
items:
205+
- enum:
206+
- apple,j105a # Apple TV 4K (1st Generation)
207+
- apple,j120 # iPad Pro 2 (12.9-inch) (Wi-Fi)
208+
- apple,j121 # iPad Pro 2 (12.9-inch) (Cellular)
209+
- apple,j207 # iPad Pro 2 (10.5-inch) (Wi-Fi)
210+
- apple,j208 # iPad Pro 2 (10.5-inch) (Cellular)
211+
- const: apple,t8011
212+
- const: apple,arm-platform
213+
214+
- description: Apple A11 SoC based platforms
215+
items:
216+
- enum:
217+
- apple,d20 # iPhone 8 (Global)
218+
- apple,d21 # iPhone 8 Plus (Global)
219+
- apple,d22 # iPhone X (Global)
220+
- apple,d201 # iPhone 8 (GSM)
221+
- apple,d211 # iPhone 8 Plus (GSM)
222+
- apple,d221 # iPhone X (GSM)
223+
- const: apple,t8015
224+
- const: apple,arm-platform
225+
68226
- description: Apple M1 SoC based platforms
69227
items:
70228
- enum:

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ properties:
8787
enum:
8888
- apple,avalanche
8989
- apple,blizzard
90-
- apple,icestorm
90+
- apple,cyclone
9191
- apple,firestorm
92+
- apple,hurricane-zephyr
93+
- apple,icestorm
94+
- apple,mistral
95+
- apple,monsoon
96+
- apple,twister
97+
- apple,typhoon
9298
- arm,arm710t
9399
- arm,arm720t
94100
- arm,arm740t

‎Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ properties:
1818
compatible:
1919
items:
2020
- enum:
21+
- apple,s5l8960x-pinctrl
22+
- apple,t7000-pinctrl
23+
- apple,s8000-pinctrl
24+
- apple,t8010-pinctrl
25+
- apple,t8015-pinctrl
2126
- apple,t8103-pinctrl
2227
- apple,t8112-pinctrl
2328
- apple,t6000-pinctrl

‎Documentation/devicetree/bindings/watchdog/apple,wdt.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19+
- apple,s5l8960x-wdt
20+
- apple,t7000-wdt
21+
- apple,s8000-wdt
22+
- apple,t8010-wdt
23+
- apple,t8015-wdt
1924
- apple,t8103-wdt
2025
- apple,t8112-wdt
2126
- apple,t6000-wdt

‎arch/arm64/Kconfig.platforms‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ config ARCH_APPLE
3737
bool "Apple Silicon SoC family"
3838
select APPLE_AIC
3939
help
40-
This enables support for Apple's in-house ARM SoC family, starting
41-
with the Apple M1.
40+
This enables support for Apple's in-house ARM SoC family, such
41+
as the Apple M1.
4242

4343
menuconfig ARCH_BCM
4444
bool "Broadcom SoC Support"

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,57 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j71.dtb
3+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j73.dtb
4+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j85m.dtb
5+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j86m.dtb
6+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j87m.dtb
7+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-n53.dtb
8+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j72.dtb
9+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j85.dtb
10+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j86.dtb
11+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-j87.dtb
12+
dtb-$(CONFIG_ARCH_APPLE) += s5l8960x-n51.dtb
13+
dtb-$(CONFIG_ARCH_APPLE) += t7000-j42d.dtb
14+
dtb-$(CONFIG_ARCH_APPLE) += t7000-j96.dtb
15+
dtb-$(CONFIG_ARCH_APPLE) += t7000-j97.dtb
16+
dtb-$(CONFIG_ARCH_APPLE) += t7000-n102.dtb
17+
dtb-$(CONFIG_ARCH_APPLE) += t7000-n56.dtb
18+
dtb-$(CONFIG_ARCH_APPLE) += t7000-n61.dtb
19+
dtb-$(CONFIG_ARCH_APPLE) += t7001-j81.dtb
20+
dtb-$(CONFIG_ARCH_APPLE) += t7001-j82.dtb
21+
dtb-$(CONFIG_ARCH_APPLE) += s8000-j71s.dtb
22+
dtb-$(CONFIG_ARCH_APPLE) += s8000-j72s.dtb
23+
dtb-$(CONFIG_ARCH_APPLE) += s8000-n66.dtb
24+
dtb-$(CONFIG_ARCH_APPLE) += s8000-n69u.dtb
25+
dtb-$(CONFIG_ARCH_APPLE) += s8000-n71.dtb
26+
dtb-$(CONFIG_ARCH_APPLE) += s8003-j71t.dtb
27+
dtb-$(CONFIG_ARCH_APPLE) += s8003-j72t.dtb
28+
dtb-$(CONFIG_ARCH_APPLE) += s8003-n66m.dtb
29+
dtb-$(CONFIG_ARCH_APPLE) += s8003-n69.dtb
30+
dtb-$(CONFIG_ARCH_APPLE) += s8003-n71m.dtb
31+
dtb-$(CONFIG_ARCH_APPLE) += s8001-j127.dtb
32+
dtb-$(CONFIG_ARCH_APPLE) += s8001-j128.dtb
33+
dtb-$(CONFIG_ARCH_APPLE) += s8001-j98a.dtb
34+
dtb-$(CONFIG_ARCH_APPLE) += s8001-j99a.dtb
35+
dtb-$(CONFIG_ARCH_APPLE) += t8010-d101.dtb
36+
dtb-$(CONFIG_ARCH_APPLE) += t8010-d10.dtb
37+
dtb-$(CONFIG_ARCH_APPLE) += t8010-d111.dtb
38+
dtb-$(CONFIG_ARCH_APPLE) += t8010-d11.dtb
39+
dtb-$(CONFIG_ARCH_APPLE) += t8010-j171.dtb
40+
dtb-$(CONFIG_ARCH_APPLE) += t8010-j172.dtb
41+
dtb-$(CONFIG_ARCH_APPLE) += t8010-j71b.dtb
42+
dtb-$(CONFIG_ARCH_APPLE) += t8010-j72b.dtb
43+
dtb-$(CONFIG_ARCH_APPLE) += t8010-n112.dtb
44+
dtb-$(CONFIG_ARCH_APPLE) += t8011-j105a.dtb
45+
dtb-$(CONFIG_ARCH_APPLE) += t8011-j120.dtb
46+
dtb-$(CONFIG_ARCH_APPLE) += t8011-j121.dtb
47+
dtb-$(CONFIG_ARCH_APPLE) += t8011-j207.dtb
48+
dtb-$(CONFIG_ARCH_APPLE) += t8011-j208.dtb
49+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d201.dtb
50+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d20.dtb
51+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d211.dtb
52+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d21.dtb
53+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d221.dtb
54+
dtb-$(CONFIG_ARCH_APPLE) += t8015-d22.dtb
255
dtb-$(CONFIG_ARCH_APPLE) += t8103-j274.dtb
356
dtb-$(CONFIG_ARCH_APPLE) += t8103-j293.dtb
457
dtb-$(CONFIG_ARCH_APPLE) += t8103-j313.dtb

‎arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Apple iPhone 5s common device tree
4+
* Based on A7 (APL0698), up to 1.3GHz
5+
*
6+
* Copyright (c) 2022, Konrad Dybcio <konradybcio@kernel.org>
7+
*/
8+
9+
#include "s5l8960x.dtsi"
10+
#include "s5l8960x-common.dtsi"
11+
#include <dt-bindings/input/input.h>
12+
13+
/ {
14+
chassis-type = "handset";
15+
16+
gpio-keys {
17+
compatible = "gpio-keys";
18+
19+
button-home {
20+
label = "Home Button";
21+
gpios = <&pinctrl 2 GPIO_ACTIVE_LOW>;
22+
linux,code = <KEY_HOMEPAGE>;
23+
wakeup-source;
24+
};
25+
26+
button-power {
27+
label = "Power Button";
28+
gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>;
29+
linux,code = <KEY_POWER>;
30+
wakeup-source;
31+
};
32+
33+
button-voldown {
34+
label = "Volume Down";
35+
gpios = <&pinctrl 5 GPIO_ACTIVE_LOW>;
36+
linux,code = <KEY_VOLUMEDOWN>;
37+
};
38+
39+
button-volup {
40+
label = "Volume Up";
41+
gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>;
42+
linux,code = <KEY_VOLUMEUP>;
43+
};
44+
45+
switch-mute {
46+
label = "Mute Switch";
47+
gpios = <&pinctrl 16 GPIO_ACTIVE_LOW>;
48+
linux,code = <KEY_MUTE>;
49+
};
50+
};
51+
};

‎arch/arm64/boot/dts/apple/s5l8960x-air1.dtsi‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Apple iPad Air common device tree
4+
* Based on A7 (APL5698), up to 1.4GHz
5+
*
6+
* Copyright (c) 2022, Konrad Dybcio <konradybcio@kernel.org>
7+
*/
8+
9+
#include "s5l8960x.dtsi"
10+
#include "s5l8960x-common.dtsi"
11+
#include <dt-bindings/input/input.h>
12+
13+
/ {
14+
chassis-type = "tablet";
15+
16+
gpio-keys {
17+
compatible = "gpio-keys";
18+
19+
button-home {
20+
label = "Home Button";
21+
gpios = <&pinctrl 2 GPIO_ACTIVE_LOW>;
22+
linux,code = <KEY_HOMEPAGE>;
23+
wakeup-source;
24+
};
25+
26+
button-power {
27+
label = "Power Button";
28+
gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>;
29+
linux,code = <KEY_POWER>;
30+
wakeup-source;
31+
};
32+
33+
button-voldown {
34+
label = "Volume Down";
35+
gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>;
36+
linux,code = <KEY_VOLUMEDOWN>;
37+
};
38+
39+
button-volup {
40+
label = "Volume Up";
41+
gpios = <&pinctrl 5 GPIO_ACTIVE_LOW>;
42+
linux,code = <KEY_VOLUMEUP>;
43+
};
44+
45+
switch-mute {
46+
label = "Mute Switch";
47+
gpios = <&pinctrl 110 GPIO_ACTIVE_LOW>;
48+
linux,code = <KEY_MUTE>;
49+
};
50+
};
51+
};

0 commit comments

Comments
 (0)