From 481bf5805a5961ba154826d24d40587058066773 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 29 Nov 2024 14:24:38 -0800 Subject: [PATCH] ath79: usb: remove reset names Upstream uses devm_reset_control_array_get_optional_shared, which does not use names. reset-names is also not specified in the documentation. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/17118 Signed-off-by: John Crispin --- target/linux/ath79/dts/ar7100.dtsi | 2 +- target/linux/ath79/dts/ar7240.dtsi | 1 - target/linux/ath79/dts/ar7241.dtsi | 1 - target/linux/ath79/dts/ar7242.dtsi | 1 - target/linux/ath79/dts/ar9330.dtsi | 1 - target/linux/ath79/dts/ar934x.dtsi | 1 - target/linux/ath79/dts/qca953x.dtsi | 1 - target/linux/ath79/dts/qca955x.dtsi | 2 -- target/linux/ath79/dts/qca956x.dtsi | 2 -- target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch | 2 +- 10 files changed, 2 insertions(+), 12 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index a23b61c935a..1cfe82ded89 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 = "phy", "usb-host", "usb-ohci-dll"; + reset-names = "phy", "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 9d6e56b7a47..d51bd701e57 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -27,7 +27,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; phy-names = "usb"; phys = <&usb_phy>; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index e5813db9782..3eb0b17e79e 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -27,7 +27,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi index 14609a54f24..414e9676160 100644 --- a/target/linux/ath79/dts/ar7242.dtsi +++ b/target/linux/ath79/dts/ar7242.dtsi @@ -27,7 +27,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 976529bd3ff..e13e3fd5aa1 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -120,7 +120,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; phy-names = "usb"; phys = <&usb_phy>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index c490f051bb7..b2106fcdaa0 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -166,7 +166,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index e7feeded7bc..0e982016f42 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -193,7 +193,6 @@ interrupts = <3>; resets = <&rst 5>; - reset-names = "usb-host"; dr_mode = "host"; has-transaction-translator; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index de27b0e7d2e..d697b047690 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -273,7 +273,6 @@ interrupt-parent = <&intc3>; interrupts = <1>; resets = <&rst 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; @@ -299,7 +298,6 @@ interrupt-parent = <&intc3>; interrupts = <2>; resets = <&rst2 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index e9f443cbef9..8070fefbb71 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -192,7 +192,6 @@ interrupts = <1>; resets = <&rst 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; @@ -219,7 +218,6 @@ interrupts = <2>; resets = <&rst2 5>; - reset-names = "usb-host"; has-transaction-translator; caps-offset = <0x100>; 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 98879927cbe..b50e4b51a45 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 @@ -132,7 +132,7 @@ Signed-off-by: John Crispin + if (IS_ERR(priv->rst_phy)) + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing"); + -+ priv->rst_host = devm_reset_control_get(&pdev->dev, "usb-host"); ++ priv->rst_host = devm_reset_control_get(&pdev->dev, "host"); + if (IS_ERR(priv->rst_host)) + return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_host), "host reset is missing"); +