ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 13:48:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ath79: usb: remove usb- from reset-names

Browse Source 
This matches the upstream PHY driver, which removed it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17118
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
Rosen Penev 2024-11-28 20:21:20 -08:00 committed by John Crispin
parent 76fabd909e
commit dcef169319
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/dts/ar7100.dtsi
View File

@ -54,7 +54,7 @@
compatible = "qca,ar7100-usb-phy"; compatible = "qca,ar7100-usb-phy";
reg = <0x18030000 0x10>; reg = <0x18030000 0x10>;
reset-names = "usb-phy", "usb-host", "usb-ohci-dll"; reset-names = "phy", "usb-host", "usb-ohci-dll";
resets = <&rst 4>, <&rst 5>, <&rst 6>; resets = <&rst 4>, <&rst 5>, <&rst 6>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar7240.dtsi
View File

@ -6,7 +6,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar7200-usb-phy"; compatible = "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-ohci-dll"; reset-names = "phy", "usb-ohci-dll";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar7241.dtsi
View File

@ -6,7 +6,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar7200-usb-phy"; compatible = "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar7242.dtsi
View File

@ -6,7 +6,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar7200-usb-phy"; compatible = "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar9132.dtsi
View File

@ -188,7 +188,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar7200-usb-phy"; compatible = "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar9330.dtsi
View File

@ -166,7 +166,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar7200-usb-phy"; compatible = "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/ar934x.dtsi
View File

@ -216,7 +216,7 @@
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "qca,ar9340-usb-phy", "qca,ar7200-usb-phy"; compatible = "qca,ar9340-usb-phy", "qca,ar7200-usb-phy";
reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override"; reset-names = "phy-analog", "phy", "suspend-override";
resets = <&rst 11>, <&rst 4>, <&rst 3>; resets = <&rst 11>, <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;

2
target/linux/ath79/dts/qca953x.dtsi
View File

@ -60,7 +60,7 @@
reg = <0x18030000 0x100>; reg = <0x18030000 0x100>;
#phy-cells = <0>; #phy-cells = <0>;
reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override"; reset-names = "phy-analog", "phy", "suspend-override";
resets = <&rst 11>, <&rst 4>, <&rst 3>; resets = <&rst 11>, <&rst 4>, <&rst 3>;
status = "disabled"; status = "disabled";

4
target/linux/ath79/dts/qca955x.dtsi
View File

@ -64,7 +64,7 @@
compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
reg = <0x18030000 4>, <0x18030004 4>; reg = <0x18030000 4>, <0x18030004 4>;
reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override"; reset-names = "phy-analog", "phy", "suspend-override";
resets = <&rst 11>, <&rst 4>, <&rst 3>; resets = <&rst 11>, <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;
@ -76,7 +76,7 @@
compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
reg = <0x18030010 4>, <0x18030014 4>; reg = <0x18030010 4>, <0x18030014 4>;
reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override"; reset-names = "phy-analog", "phy", "suspend-override";
resets = <&rst2 11>, <&rst2 4>, <&rst2 3>; resets = <&rst2 11>, <&rst2 4>, <&rst2 3>;
#phy-cells = <0>; #phy-cells = <0>;

4
target/linux/ath79/dts/qca956x.dtsi
View File

@ -254,7 +254,7 @@
usb_phy0: usb-phy { usb_phy0: usb-phy {
compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy"; compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst 4>, <&rst 3>; resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>; #phy-cells = <0>;
@ -265,7 +265,7 @@
usb_phy1: usb-phy { usb_phy1: usb-phy {
compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy"; compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy";
reset-names = "usb-phy", "usb-suspend-override"; reset-names = "phy", "suspend-override";
resets = <&rst2 4>, <&rst2 3>; resets = <&rst2 4>, <&rst2 3>;
#phy-cells = <0>; #phy-cells = <0>;

8
target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch
View File

@ -128,7 +128,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+ if (IS_ERR(priv->io_base)) + if (IS_ERR(priv->io_base))
+ return PTR_ERR(priv->io_base); + return PTR_ERR(priv->io_base);
+ +
+ priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy"); + priv->rst_phy = devm_reset_control_get(&pdev->dev, "phy");
+ if (IS_ERR(priv->rst_phy)) + if (IS_ERR(priv->rst_phy))
+ return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing"); + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing");
+ +
@ -250,17 +250,17 @@ Signed-off-by: John Crispin <john@phrozen.org>
+ if (!priv) + if (!priv)
+ return -ENOMEM; + return -ENOMEM;
+ +
+ priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy"); + priv->rst_phy = devm_reset_control_get(&pdev->dev, "phy");
+ if (IS_ERR(priv->rst_phy)) + if (IS_ERR(priv->rst_phy))
+ return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing"); + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing");
+ +
+ priv->rst_phy_analog = devm_reset_control_get_optional( + priv->rst_phy_analog = devm_reset_control_get_optional(
+ &pdev->dev, "usb-phy-analog"); + &pdev->dev, "phy-analog");
+ if (IS_ERR(priv->rst_phy_analog)) + if (IS_ERR(priv->rst_phy_analog))
+ return PTR_ERR(priv->rst_phy_analog); + return PTR_ERR(priv->rst_phy_analog);
+ +
+ priv->suspend_override = devm_reset_control_get_optional( + priv->suspend_override = devm_reset_control_get_optional(
+ &pdev->dev, "usb-suspend-override"); + &pdev->dev, "suspend-override");
+ if (IS_ERR(priv->suspend_override)) + if (IS_ERR(priv->suspend_override))
+ return PTR_ERR(priv->suspend_override); + return PTR_ERR(priv->suspend_override);
+ +