summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Xu <xuwei5@hisilicon.com>2026-06-04 16:40:12 +0800
committerWei Xu <xuwei5@hisilicon.com>2026-06-04 16:40:12 +0800
commit6cdd694551d6a11fb03d154fd7e15ab2f9b3f1f9 (patch)
tree49a46ed84a75c028d23bfedfc3d89f6e56c94722
parent254f49634ee16a731174d2ae34bc50bd5f45e731 (diff)
parentb54fcf7a2df1124a21195afde508369e47067a1f (diff)
downloadlinux-next-6cdd694551d6a11fb03d154fd7e15ab2f9b3f1f9.tar.gz
linux-next-6cdd694551d6a11fb03d154fd7e15ab2f9b3f1f9.zip
Merge branch 'next/dt64' into for-next
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
-rw-r--r--arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts17
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index c6056a85ce80..27fb08d348c9 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -550,6 +550,12 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
+ port@0 {
+ reg = <0>;
+ usb_con_hs: endpoint {
+ remote-endpoint = <&dwc3_role_switch>;
+ };
+ };
port@1 {
reg = <1>;
usb_con_ss: endpoint {
@@ -558,15 +564,6 @@
};
};
};
- port {
- #address-cells = <1>;
- #size-cells = <0>;
-
- rt1711h_ep: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&dwc3_role_switch>;
- };
- };
};
adv7533: adv7533@39 {
@@ -683,7 +680,7 @@
#size-cells = <0>;
dwc3_role_switch: endpoint@0 {
reg = <0>;
- remote-endpoint = <&rt1711h_ep>;
+ remote-endpoint = <&usb_con_hs>;
};
dwc3_ss: endpoint@1 {