From: Rosen Penev Date: Fri, 29 Nov 2024 04:21:20 +0000 (-0800) Subject: ath79: usb: remove usb- from reset-names X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dcef169319a4b90160c1d52ee6c1ddb6c3c6fe2c;p=openwrt%2Fstaging%2Fblocktrron.git ath79: usb: remove usb- from reset-names This matches the upstream PHY driver, which removed it. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/17118 Signed-off-by: John Crispin --- diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index 5237157458..bac27d9284 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -54,7 +54,7 @@ compatible = "qca,ar7100-usb-phy"; 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>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index eb4b2e4aa3..23409b25d6 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -6,7 +6,7 @@ usb_phy: 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>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 8d0e60da40..3dd0740025 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -6,7 +6,7 @@ usb_phy: usb-phy { compatible = "qca,ar7200-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi index aab6c28f7b..9b4cc9920a 100644 --- a/target/linux/ath79/dts/ar7242.dtsi +++ b/target/linux/ath79/dts/ar7242.dtsi @@ -6,7 +6,7 @@ usb_phy: usb-phy { compatible = "qca,ar7200-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi index 71181c46de..2ea689fac1 100644 --- a/target/linux/ath79/dts/ar9132.dtsi +++ b/target/linux/ath79/dts/ar9132.dtsi @@ -188,7 +188,7 @@ usb_phy: usb-phy { compatible = "qca,ar7200-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 466e0fb25d..5b53ec1e4f 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -166,7 +166,7 @@ usb_phy: usb-phy { compatible = "qca,ar7200-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index 98cd76629f..c3bdfc916d 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -216,7 +216,7 @@ usb_phy: 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>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index 0e52a80f6e..ccfc3380be 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -60,7 +60,7 @@ reg = <0x18030000 0x100>; #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>; status = "disabled"; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index f8318b8f65..719b965d1c 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -64,7 +64,7 @@ compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; 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>; #phy-cells = <0>; @@ -76,7 +76,7 @@ compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; 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>; #phy-cells = <0>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index de685d053c..9581e87421 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -254,7 +254,7 @@ usb_phy0: 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>; #phy-cells = <0>; @@ -265,7 +265,7 @@ usb_phy1: 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>; #phy-cells = <0>; diff --git a/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch index 98c399c9e0..98879927cb 100644 --- a/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch +++ b/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch @@ -128,7 +128,7 @@ Signed-off-by: John Crispin + if (IS_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)) + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing"); + @@ -250,17 +250,17 @@ Signed-off-by: John Crispin + if (!priv) + 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)) + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing"); + + 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)) + return PTR_ERR(priv->rst_phy_analog); + + priv->suspend_override = devm_reset_control_get_optional( -+ &pdev->dev, "usb-suspend-override"); ++ &pdev->dev, "suspend-override"); + if (IS_ERR(priv->suspend_override)) + return PTR_ERR(priv->suspend_override); +