Skip to content

arm64: dts: apple: Enable dp-altmode for M1 Pro/Max MacBook Pro #476

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

Open
IntrestingBeing wants to merge 3 commits into
base: fairydust
Choose a base branch
from
Open

arm64: dts: apple: Enable dp-altmode for M1 Pro/Max MacBook Pro #476

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
4b8d979
arm64: dts: apple: t600x-j314-j316: Enable dp-altmode per machine
IntrestingBeing Mar 29, 2026
7eeff74
phy: apple-atc: Increase pipehandler lock timeout for hot-plug
IntrestingBeing Mar 29, 2026
c523abc
arm64: dts: apple: t600x-j314-j316: Move blessed port to right USB-C
IntrestingBeing Mar 29, 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
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/apple/t6000-j314s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

/dts-v1/;

#define ENABLE_DCPEXT_TYPEC

#include "t6000.dtsi"
#include "t600x-j314-j316.dtsi"

Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/apple/t6000-j316s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

/dts-v1/;

#define ENABLE_DCPEXT_TYPEC

#include "t6000.dtsi"
#include "t600x-j314-j316.dtsi"

Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/apple/t6001-j314c.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

/dts-v1/;

#define ENABLE_DCPEXT_TYPEC

#include "t6001.dtsi"
#include "t600x-j314-j316.dtsi"

Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/apple/t6001-j316c.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

/dts-v1/;

#define ENABLE_DCPEXT_TYPEC

#include "t6001.dtsi"
#include "t600x-j314-j316.dtsi"

Expand Down
22 changes: 10 additions & 12 deletions arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* Copyright The Asahi Linux Contributors
*/

#define ENABLE_DCPEXT_TYPEC

#include <dt-bindings/leds/common.h>

/ {
Expand Down Expand Up @@ -191,11 +189,6 @@
power-role = "dual";
data-role = "dual";

#ifdef ENABLE_DCPEXT_TYPEC
/* hacks */
displayport = <&dcpext1>;
#endif

ports {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -228,6 +221,11 @@
power-role = "dual";
data-role = "dual";

#ifdef ENABLE_DCPEXT_TYPEC
/* hacks */
displayport = <&dcpext1>;
#endif

ports {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -280,10 +278,10 @@
apple,connector-type = "DP";

/* hacks */
apple,dptx-phy = <1>;
phys = <&atcphy1 PHY_TYPE_DP>;
apple,dptx-phy = <2>;
phys = <&atcphy2 PHY_TYPE_DP>;
phy-names = "dp-phy";
mux-controls = <&atcphy1_xbar 0>;
mux-controls = <&atcphy2_xbar 0>;
mux-control-names = "dp-xbar";
mux-index = <2>;
};
Expand All @@ -292,11 +290,11 @@
status = "okay";
};

&atcphy1_xbar {
&atcphy2_xbar {
status = "okay";
};

&ps_atc1_common {
&ps_atc2_common {
apple,always-on; /* Needs to stay on for DP-alt suspend/resume */
};
#endif
Expand Down
2 changes: 1 addition & 1 deletion drivers/phy/apple/atc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ enum atcphy_lane_mode {
#define PIPEHANDLER_DUMMY_PHY_EN BIT(15)
#define PIPEHANDLER_NATIVE_POWER_DOWN GENMASK(3, 0)

#define PIPEHANDLER_LOCK_ACK_TIMEOUT_US 1000
#define PIPEHANDLER_LOCK_ACK_TIMEOUT_US 100000

/* USB2 PHY regs */
#define USB2PHY_USBCTL 0x00
Expand Down