diff --git a/hardware_src/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-a00-00-base.dts b/hardware/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-a00-00-base.dts index ed560d3..87d57cc 100755 --- a/hardware_src/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-a00-00-base.dts +++ b/hardware/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-a00-00-base.dts @@ -81,35 +81,37 @@ usb_cd { status = "okay"; - phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(0)>; + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>; phy-names = "otg-phy"; }; xotg { status = "okay"; - phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(0)>; + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>; phy-names = "otg-usb2"; }; #if TEGRA_XUSB_PADCONTROL_VERSION >= DT_VERSION_2 xudc@3550000 { status = "okay"; - phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-0}>; - phy-names = "usb2"; + phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-1}>, + <&{/xusb_padctl@3520000/pads/usb3/lanes/usb3-1}>; + phy-names = "usb2", "usb3"; nvidia,boost-cpu-freq = <1200>; }; usb_cd { status = "okay"; - phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-0}>; + phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-1}>; phy-names = "otg-phy"; nvidia,xusb-padctl = <&xusb_padctl>; }; #else xudc@3550000 { status = "okay"; - phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(0)>; - phy-names = "usb2"; + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, + <&tegra_xusb_padctl TEGRA_PADCTL_PHY_USB3_P(1)>; + phy-names = "usb2", "usb3"; emc-frequency = <150000000>; nvidia,boost-cpu-freq = <1200>; }; @@ -118,19 +120,16 @@ #if TEGRA_XUSB_PADCONTROL_VERSION >= DT_VERSION_2 xhci@3530000 { status = "okay"; - phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-0}>, - <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-1}>, - <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-2}>, + phys = <&{/xusb_padctl@3520000/pads/usb2/lanes/usb2-1}>, <&{/xusb_padctl@3520000/pads/usb3/lanes/usb3-1}>; - phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-1"; + phy-names = "usb2-1", "usb3-1"; }; #else xhci@3530000 { status = "okay"; - phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(0)>, - <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, <&tegra_xusb_padctl TEGRA_PADCTL_PHY_USB3_P(1)>; - phy-names = "utmi-0", "utmi-1", "usb3-1"; + phy-names = "utmi-1", "usb3-1"; nvidia,boost_cpu_freq = <800>; }; #endif @@ -199,7 +198,7 @@ usb2-2 { status = "okay"; mode = "host"; - vbus-supply = <&vdd_usb2_5v>; + vbus-supply = <&battery_reg>; }; usb3-0 { nvidia,usb2-companion = <2>; @@ -226,21 +225,23 @@ "vbus_en0_default", "vbus_en1_default"; tegra_xusb_padctl_pinmux_default: pinmux { /* Quill does not support usb3-micro AB */ +/* usb2-micro-AB { nvidia,lanes = "otg-0"; nvidia,function = "xusb"; nvidia,port-cap = ; nvidia,oc-pin = <0>; }; +*/ usb2-std-A-port2 { nvidia,lanes = "otg-1"; nvidia,function = "xusb"; - nvidia,port-cap = ; + nvidia,port-cap = ; nvidia,oc-pin = <1>; }; usb3-std-A-port2 { nvidia,lanes = "usb3-1"; - nvidia,port-cap = ; + nvidia,port-cap = ; nvidia,oc-pin = <1>; }; diff --git a/hardware_src/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-c03-00-base.dts b/hardware/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-c03-00-base.dts index 844c670..91bf82f 100755 --- a/hardware_src/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-c03-00-base.dts +++ b/hardware/nvidia/platform/t18x/quill/kernel-dts/tegra186-quill-p3310-1000-c03-00-base.dts @@ -123,12 +123,17 @@ }; xhci@3530000 { - phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(0)>, - <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, <&tegra_xusb_padctl TEGRA_PADCTL_PHY_USB3_P(0)>; - phy-names = "utmi-0", "utmi-1", "usb3-0"; + phy-names = "utmi-1", "usb3-0"; }; + xudc@3550000 { + phys = <&tegra_xusb_padctl TEGRA_PADCTL_PHY_UTMI_P(1)>, + <&tegra_xusb_padctl TEGRA_PADCTL_PHY_USB3_P(0)>; + phy-names = "usb2", "usb3"; + }; + pinctrl@3520000 { pinmux { usb3-std-A-port2 {