aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2018-03-02 02:36:31 -0500
committerHeiko Stuebner <heiko@sntech.de>2018-03-02 02:36:31 -0500
commit835a1d5cdefffe08bec46efff11daea9b389baa9 (patch)
tree018c49aaafafcf7543eb5d431827163cdfcefd65
parent2560da49de5d0cfec22e9564023aebfffa094732 (diff)
Revert "arm64: dts: rockchip: add usb3-phy otg-port support for rk3399"
This reverts commit c301b327aea898af558b2387252a2f5fc0117dee. While this works splendidly on rk3399-gru devices using the cros-ec extcon, other rk3399-based devices using the fusb302 or no power-delivery controller at all don't probe at all anymore, as the typec-phy currently always expects the extcon to be available and therefore defers probing indefinitly on these. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399.dtsi8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 2605118d4b4c..0b81ca1d07e7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -411,8 +411,8 @@
411 reg = <0x0 0xfe800000 0x0 0x100000>; 411 reg = <0x0 0xfe800000 0x0 0x100000>;
412 interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>; 412 interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
413 dr_mode = "otg"; 413 dr_mode = "otg";
414 phys = <&u2phy0_otg>, <&tcphy0_usb3>; 414 phys = <&u2phy0_otg>;
415 phy-names = "usb2-phy", "usb3-phy"; 415 phy-names = "usb2-phy";
416 phy_type = "utmi_wide"; 416 phy_type = "utmi_wide";
417 snps,dis_enblslpm_quirk; 417 snps,dis_enblslpm_quirk;
418 snps,dis-u2-freeclk-exists-quirk; 418 snps,dis-u2-freeclk-exists-quirk;
@@ -444,8 +444,8 @@
444 reg = <0x0 0xfe900000 0x0 0x100000>; 444 reg = <0x0 0xfe900000 0x0 0x100000>;
445 interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>; 445 interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>;
446 dr_mode = "otg"; 446 dr_mode = "otg";
447 phys = <&u2phy1_otg>, <&tcphy1_usb3>; 447 phys = <&u2phy1_otg>;
448 phy-names = "usb2-phy", "usb3-phy"; 448 phy-names = "usb2-phy";
449 phy_type = "utmi_wide"; 449 phy_type = "utmi_wide";
450 snps,dis_enblslpm_quirk; 450 snps,dis_enblslpm_quirk;
451 snps,dis-u2-freeclk-exists-quirk; 451 snps,dis-u2-freeclk-exists-quirk;