github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: dts: qcom: msm8974: clean up USB nodes

Browse Source 
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
This commit is contained in:
Luca Weiss 2022-11-28 18:16:23 +01:00 committed by Bjorn Andersson
parent 1477cca864
commit 08b37b2a9b
7 changed files with 135 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
View File

@ -35,28 +35,6 @@ eeprom: eeprom@52 {
};
};
&otg {
status = "okay";
phys = <&usb_hs2_phy>;
phy-select = <&tcsr 0xb000 1>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@b {
status = "okay";
v3p3-supply = <&pm8941_l24>;
v1p8-supply = <&pm8941_l6>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x63>;
};
};
};
&rpm_requests {
regulators-0 {
compatible = "qcom,rpm-pm8841-regulators";
@ -307,3 +285,23 @@ cd-pins {
};
};
};
&usb {
status = "okay";
phys = <&usb_hs2_phy>;
phy-select = <&tcsr 0xb000 1>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
};
&usb_hs2_phy {
status = "okay";
v3p3-supply = <&pm8941_l24>;
v1p8-supply = <&pm8941_l6>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x63>;
};

48
arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
View File

@ -248,31 +248,6 @@ &mdss {
status = "okay";
};
&otg {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&charger>, <&usb_id>;
vbus-supply = <&usb_otg_vbus>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
&pm8941_gpios {
gpio_keys_pin_a: gpio-keys-active-state {
pins = "gpio2", "gpio3";
@ -652,3 +627,26 @@ shutdown-pins {
};
};
};
&usb {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&charger>, <&usb_id>;
vbus-supply = <&usb_otg_vbus>;
hnp-disable;
srp-disable;
adp-disable;
};
&usb_hs1_phy {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};

48
arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
View File

@ -132,31 +132,6 @@ &blsp2_i2c5 {
/* sii8334 MHL HDMI bridge */
};
&otg {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
&pm8941_coincell {
status = "okay";
qcom,rset-ohms = <2100>;
@ -485,3 +460,26 @@ cd-pins {
};
};
};
&usb {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
};
&usb_hs1_phy {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};

6
arch/arm/boot/dts/qcom-msm8974.dtsi
View File

@ -653,7 +653,7 @@ blsp2_i2c6: i2c@f9968000 {
#size-cells = <0>;
};
otg: usb@f9a55000 {
usb: usb@f9a55000 {
compatible = "qcom,ci-hdrc";
reg = <0xf9a55000 0x200>,
<0xf9a55200 0x200>;
@ -679,7 +679,7 @@ usb_hs1_phy: phy@a {
#phy-cells = <0>;
clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
clock-names = "ref", "sleep";
resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>;
resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
reset-names = "phy", "por";
status = "disabled";
};
@ -690,7 +690,7 @@ usb_hs2_phy: phy@b {
#phy-cells = <0>;
clocks = <&xo_board>, <&gcc GCC_USB2B_PHY_SLEEP_CLK>;
clock-names = "ref", "sleep";
resets = <&gcc GCC_USB2B_PHY_BCR>, <&otg 1>;
resets = <&gcc GCC_USB2B_PHY_BCR>, <&usb 1>;
reset-names = "phy", "por";
status = "disabled";
};

48
arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
View File

@ -86,31 +86,6 @@ reboot-mode {
};
};
&otg {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
&pm8941_gpios {
gpio_keys_pin_a: gpio-keys-active-state {
pins = "gpio1", "gpio2", "gpio5";
@ -463,3 +438,26 @@ fm-pins {
};
};
};
&usb {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
};
&usb_hs1_phy {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};

42
arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
View File

@ -376,28 +376,6 @@ &mdss {
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 @@ panel_te_pin: panel-state {
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>;
};

48
arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
View File

@ -213,31 +213,6 @@ bluetooth {
};
};
&otg {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
&pm8941_coincell {
status = "okay";
@ -638,3 +613,26 @@ bt_dev_wake_pin: bt-dev-wake-state {
bias-disable;
};
};
&usb {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
};
&usb_hs1_phy {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};