Skip to content

arm64: dts: apple: t6040: make the J616s tree validate (SMC, DockChannel HID, PCIe) #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanTheTide merged 3 commits into from
Oct 23, 2026
Merged

arm64: dts: apple: t6040: make the J616s tree validate (SMC, DockChannel HID, PCIe) #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2788d5
dt-bindings: mfd: apple,smc: Add apple,t6041-smc
RyanTheTide Oct 23, 2026
1bf2cc6
dt-bindings: input: apple,dockchannel-hid: Add apple,t6041-dockchanne…
RyanTheTide Oct 23, 2026
5bc9bdd
arm64: dts: apple: t6040: Match the SMC and PCIe nodes to their bindings
RyanTheTide Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ description: |

properties:
compatible:
const: apple,dockchannel-hid
oneOf:
- const: apple,dockchannel-hid
- items:
- const: apple,t6041-dockchannel-hid
- const: apple,dockchannel-hid

reg:
minItems: 4
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mfd/apple,smc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ properties:
- items:
- enum:
- apple,t6020-smc
- apple,t6041-smc
- apple,t8122-smc
- apple,t8140-smc
- apple,t8142-smc
Expand Down
15 changes: 13 additions & 2 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,19 @@
/ {
pcie0: pcie@1cb0000000 {
compatible = "apple,t6041-pcie", "apple,t6020-pcie";
reg = <0x1c 0xb0000000 0 0x1000000 4 0x14000000 0 0x4000 4 0x10028000 0 0x4000 4 0x17020000 0 0x4000>;
reg-names = "config", "rc", "port0", "phy0";
reg = <0x1c 0xb0000000 0x0 0x1000000>, /* config */
<0x4 0x14000000 0x0 0x4000>, /* rc */
<0x4 0x10028000 0x0 0x4000>, /* port0 */
<0x4 0x11028000 0x0 0x4000>, /* port1 */
<0x4 0x12028000 0x0 0x4000>, /* port2 */
<0x4 0x13028000 0x0 0x4000>, /* port3 */
<0x4 0x17020000 0x0 0x4000>, /* phy0 */
<0x4 0x17024000 0x0 0x4000>, /* phy1 */
<0x4 0x17028000 0x0 0x4000>, /* phy2 */
<0x4 0x1702c000 0x0 0x4000>; /* phy3 */
reg-names = "config", "rc",
"port0", "port1", "port2", "port3",
"phy0", "phy1", "phy2", "phy3";
ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_clkreq>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/apple/t6040.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@
};

smc: smc@50c600000 {
compatible = "apple,t6041-smc", "apple,t8103-smc", "apple,smc";
compatible = "apple,t6041-smc", "apple,t8103-smc";
reg = <0x5 0x0c600000 0x0 0x4000>,
<0x5 0x0de70000 0x0 0x100000>;
reg-names = "smc", "sram";
Expand Down