diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2022-11-28 20:16:23 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2022-12-06 01:35:46 +0300 |
| commit | 08b37b2a9b1a9e4dcdd810e514e3f60f54338fa9 (patch) | |
| tree | a2a9a696e5efc50c405f54813d2a2c28e7bb9e6b /arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | |
| parent | 1477cca86492a58177a2afe2837494301e97f6ff (diff) | |
| download | linux-08b37b2a9b1a9e4dcdd810e514e3f60f54338fa9.tar.xz | |
ARM: dts: qcom: msm8974: clean up USB nodes
Rename "otg" label to "usb" to group it with other usb nodes and also
because "usb" makes more sense for a USB controller.
And now we can also better use the usb_hsX_phy labels instead of having
the ulpi -> phy@X structure in every dts.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221128171623.825572-1-luca@z3ntu.xyz
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index 52ece17986e4..b9698ffb66ca 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -376,28 +376,6 @@ status = "okay"; }; -&otg { - status = "okay"; - - phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; - - hnp-disable; - srp-disable; - adp-disable; - - ulpi { - phy@a { - status = "okay"; - - v1p8-supply = <&pma8084_l6>; - v3p3-supply = <&pma8084_l24>; - - qcom,init-seq = /bits/ 8 <0x1 0x64>; - }; - }; -}; - &pma8084_gpios { gpio_keys_pin_a: gpio-keys-active-state { pins = "gpio2", "gpio3", "gpio5"; @@ -814,3 +792,23 @@ bias-disable; }; }; + +&usb { + status = "okay"; + + phys = <&usb_hs1_phy>; + phy-select = <&tcsr 0xb000 0>; + + hnp-disable; + srp-disable; + adp-disable; +}; + +&usb_hs1_phy { + status = "okay"; + + v1p8-supply = <&pma8084_l6>; + v3p3-supply = <&pma8084_l24>; + + qcom,init-seq = /bits/ 8 <0x1 0x64>; +}; |