Skip to content

Commit a85dd75

Browse files
committed
arm64: dts: apple: Enable DockChannel HID on M2 and later laptops
On M2 and later chipsets, the nodes required to enable communication with the internal keyboard and trackpad are disabled by default, this patch enables them only on laptop (MacBook) variants where this hardware is actually present. Co-developed-by: Hector Martin <[email protected]> Signed-off-by: Hector Martin <[email protected]> Signed-off-by: Michael Reeves <[email protected]>
1 parent 9fd44b4 commit a85dd75

4 files changed

Lines changed: 102 additions & 1 deletion

File tree

arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616

1717
#include "t600x-j314-j316.dtsi"
1818

19+
/ {
20+
aliases {
21+
keyboard = &keyboard;
22+
};
23+
};
24+
1925
&framebuffer0 {
2026
power-domains = <&ps_disp0_cpu0>, <&ps_dptx_phy_ps>;
2127
};
@@ -43,3 +49,26 @@
4349
&bluetooth0 {
4450
compatible = "pci14e4,5f72";
4551
};
52+
53+
&mtp {
54+
status = "okay";
55+
};
56+
57+
&mtp_mbox {
58+
status = "okay";
59+
};
60+
61+
&mtp_dart {
62+
status = "okay";
63+
};
64+
65+
&mtp_dockchannel {
66+
status = "okay";
67+
};
68+
69+
&mtp_hid {
70+
keyboard: keyboard {
71+
/* Filled by bootloader */
72+
hid-country-code = <0>;
73+
};
74+
};

arch/arm64/boot/dts/apple/t8112-j413.dts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
aliases {
2121
bluetooth0 = &bluetooth0;
2222
wifi0 = &wifi0;
23+
keyboard = &keyboard;
2324
};
2425

2526
led-controller {
@@ -78,3 +79,26 @@
7879
&fpwm1 {
7980
status = "okay";
8081
};
82+
83+
&mtp {
84+
status = "okay";
85+
};
86+
87+
&mtp_mbox {
88+
status = "okay";
89+
};
90+
91+
&mtp_dart {
92+
status = "okay";
93+
};
94+
95+
&mtp_dockchannel {
96+
status = "okay";
97+
};
98+
99+
&mtp_hid {
100+
keyboard: keyboard {
101+
/* Filled by bootloader */
102+
hid-country-code = <0>;
103+
};
104+
};

arch/arm64/boot/dts/apple/t8112-j415.dts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
aliases {
2121
bluetooth0 = &bluetooth0;
2222
wifi0 = &wifi0;
23+
keyboard = &keyboard;
2324
};
2425

2526
led-controller {
@@ -78,3 +79,26 @@
7879
&fpwm1 {
7980
status = "okay";
8081
};
82+
83+
&mtp {
84+
status = "okay";
85+
};
86+
87+
&mtp_mbox {
88+
status = "okay";
89+
};
90+
91+
&mtp_dart {
92+
status = "okay";
93+
};
94+
95+
&mtp_dockchannel {
96+
status = "okay";
97+
};
98+
99+
&mtp_hid {
100+
keyboard: keyboard {
101+
/* Filled by bootloader */
102+
hid-country-code = <0>;
103+
};
104+
};

arch/arm64/boot/dts/apple/t8112-j493.dts

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+ OR MIT
22
/*
3-
* Apple MacBook Pro (13-inch, M1, 2022)
3+
* Apple MacBook Pro (13-inch, M2, 2022)
44
*
55
* target-type: J493
66
*
@@ -25,6 +25,7 @@
2525
bluetooth0 = &bluetooth0;
2626
touchbar0 = &touchbar0;
2727
wifi0 = &wifi0;
28+
keyboard = &keyboard;
2829
};
2930

3031
led-controller {
@@ -133,3 +134,26 @@
133134
touchscreen-inverted-y;
134135
};
135136
};
137+
138+
&mtp {
139+
status = "okay";
140+
};
141+
142+
&mtp_mbox {
143+
status = "okay";
144+
};
145+
146+
&mtp_dart {
147+
status = "okay";
148+
};
149+
150+
&mtp_dockchannel {
151+
status = "okay";
152+
};
153+
154+
&mtp_hid {
155+
keyboard: keyboard {
156+
/* Filled by bootloader */
157+
hid-country-code = <0>;
158+
};
159+
};

0 commit comments

Comments
 (0)