Skip to content

Commit

Permalink
arm64: dts: mediatek: mt8516: harmonize node names and compatibles
Browse files Browse the repository at this point in the history
This is used to fix dtbs_check warning:
  harmonize node names and compatibles;
  add property "usb-role-switch" for connector dependence.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/20210316092232.9806-8-chunfeng.yun@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
  • Loading branch information
Chunfeng Yun authored and Matthias Brugger committed Mar 29, 2021
1 parent 357c5f7 commit 86c5ed1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/arm64/boot/dts/mediatek/mt8516.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
};

usb0: usb@11100000 {
compatible = "mediatek,mtk-musb";
compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
reg = <0 0x11100000 0 0x1000>;
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "mc";
Expand All @@ -493,7 +493,7 @@
};

usb1: usb@11190000 {
compatible = "mediatek,mtk-musb";
compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
reg = <0 0x11190000 0 0x1000>;
interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "mc";
Expand All @@ -506,8 +506,9 @@
status = "disabled";
};

usb_phy: usb@11110000 {
compatible = "mediatek,generic-tphy-v1";
usb_phy: t-phy@11110000 {
compatible = "mediatek,mt8516-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x11110000 0 0x800>;
#address-cells = <2>;
#size-cells = <2>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
&usb0 {
status = "okay";
dr_mode = "peripheral";
usb-role-switch;

usb_con: connector {
compatible = "usb-c-connector";
Expand Down

0 comments on commit 86c5ed1

Please sign in to comment.