From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 15 Mar 2021 19:30:21 +0000 (+0100)
Subject: bcm4908: backport first PHY 5.13 patches
X-Git-Tag: v22.03.0-rc1~3086
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d7c8ca4d0b5c18c08e645f010fd0012f54c1c102;p=openwrt%2Fopenwrt.git

bcm4908: backport first PHY 5.13 patches

1. Upstream accepted version of Kconfig change
2. Documentation binding fix

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/bcm4908/patches-5.4/086-v5.13-0001-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch b/target/linux/bcm4908/patches-5.4/086-v5.13-0001-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch
new file mode 100644
index 0000000000..a341326ef4
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/086-v5.13-0001-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch
@@ -0,0 +1,35 @@
+From 261ab1fd5c5d2d7ff7d5bab3f5db3c69c4bcea58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Fri, 5 Mar 2021 16:24:06 +0100
+Subject: [PATCH] phy: phy-brcm-usb: select SOC_BRCMSTB on brcmstb only
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+phy-brcm-usb has some conditional init code required on selected brcmstb
+devices. Execution of that code depends on family / product detected by
+brcmstb soc code.
+
+For ARCH_BCM4908 brcmstb soc code always return 0 values as ids. Don't
+bother selecting & compiling that redundant driver.
+
+Depends-on: 149ae80b1d50 ("soc: bcm: brcmstb: add stubs for getting platform IDs")
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Link: https://lore.kernel.org/r/20210305152406.2588-1-zajec5@gmail.com
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+---
+ drivers/phy/broadcom/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/phy/broadcom/Kconfig
++++ b/drivers/phy/broadcom/Kconfig
+@@ -86,7 +86,7 @@ config PHY_BRCM_USB
+ 	depends on ARCH_BCM4908 || ARCH_BRCMSTB
+ 	depends on OF
+ 	select GENERIC_PHY
+-	select SOC_BRCMSTB
++	select SOC_BRCMSTB if ARCH_BRCMSTB
+ 	default ARCH_BCM4908
+ 	default ARCH_BRCMSTB
+ 	help
diff --git a/target/linux/bcm4908/patches-5.4/086-v5.13-0002-dt-bindings-phy-brcm-brcmstb-usb-phy-add-power-domai.patch b/target/linux/bcm4908/patches-5.4/086-v5.13-0002-dt-bindings-phy-brcm-brcmstb-usb-phy-add-power-domai.patch
new file mode 100644
index 0000000000..4db442c0ae
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/086-v5.13-0002-dt-bindings-phy-brcm-brcmstb-usb-phy-add-power-domai.patch
@@ -0,0 +1,31 @@
+From d9de0cbd5b1f6b51c92a40937945f26a35d848ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Tue, 9 Mar 2021 19:26:16 +0100
+Subject: [PATCH] dt-bindings: phy: brcm,brcmstb-usb-phy: add power-domains
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On BCM4908 USB PHY is managed using power controller so it needs
+describing properly using the power-domains.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Link: https://lore.kernel.org/r/20210309182616.25783-1-zajec5@gmail.com
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+---
+ .../devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml          | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml
++++ b/Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml
+@@ -42,6 +42,9 @@ properties:
+       - const: usb_mdio
+       - const: bdc_ec
+ 
++  power-domains:
++    maxItems: 1
++
+   clocks:
+     minItems: 1
+     maxItems: 2
diff --git a/target/linux/bcm4908/patches-5.4/800-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch b/target/linux/bcm4908/patches-5.4/800-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch
deleted file mode 100644
index 965d60c18e..0000000000
--- a/target/linux/bcm4908/patches-5.4/800-phy-phy-brcm-usb-select-SOC_BRCMSTB-on-brcmstb-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 73f63c66bf80bebd46d38a2660078dbe3fe11170 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 14 Jan 2021 12:02:28 +0100
-Subject: [PATCH] phy: phy-brcm-usb: select SOC_BRCMSTB on brcmstb only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-BCM4908 doesn't need brcmstb SoC stuff compiled.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- drivers/phy/broadcom/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/phy/broadcom/Kconfig
-+++ b/drivers/phy/broadcom/Kconfig
-@@ -86,7 +86,7 @@ config PHY_BRCM_USB
- 	depends on ARCH_BCM4908 || ARCH_BRCMSTB
- 	depends on OF
- 	select GENERIC_PHY
--	select SOC_BRCMSTB
-+	select SOC_BRCMSTB if ARCH_BRCMSTB
- 	default ARCH_BCM4908
- 	default ARCH_BRCMSTB
- 	help