linux-next: manual merge of the usb tree with the qcom tree
Subsystems (5)
Device tree bindings Arm Qualcomm mailing list Linux-next tree Arm Qualcomm support +1 more subsystems
Mark Brown
maintainerHi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/sc7280-idp.dts
between commit:
7dfb52dcc5a4 ("arm64: dts: qcom: sc7280: Remove pm8350 and pmr735b for sc7280-idp")
from the qcom tree and commit:
73cb0912894b ("arm64: dts: qcom: sc7280: Add USB nodes for IDP board")
from the usb tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
arch/arm64/boot/dts/qcom/sc7280-idp.dts +59 -0
@@ -68,3 +68,62 @@ qcom,pre-scaling = <1 1>; }; }; + +&uart5 { + status = "okay"; +}; + +&usb_1 { + status = "okay"; +}; + +&usb_1_dwc3 { + dr_mode = "host"; +}; + +&usb_1_hsphy { + status = "okay"; + + vdda-pll-supply = <&vreg_l10c_0p8>; + vdda33-supply = <&vreg_l2b_3p0>; + vdda18-supply = <&vreg_l1c_1p8>; +}; + +&usb_1_qmpphy { + status = "okay"; + + vdda-phy-supply = <&vreg_l6b_1p2>; + vdda-pll-supply = <&vreg_l1b_0p8>; +}; + +&usb_2 { + status = "okay"; +}; + +&usb_2_dwc3 { + dr_mode = "peripheral"; +}; + +&usb_2_hsphy { + status = "okay"; + + vdda-pll-supply = <&vreg_l10c_0p8>; + vdda33-supply = <&vreg_l2b_3p0>; + vdda18-supply = <&vreg_l1c_1p8>; +}; + +/* PINCTRL - additions to nodes defined in sc7280.dtsi */ + +&qup_uart5_default { + tx { + pins = "gpio46"; + drive-strength = <2>; + bias-disable; + }; + + rx { + pins = "gpio47"; + drive-strength = <2>; + bias-pull-up; + }; +};