Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1606650 > unrolled thread

[GIT PULL] phy: for 4.11 -rc cycle

Back to article view | Back to linux.kernel

Contents

  [GIT PULL] phy: for 4.11 -rc cycle Kishon Vijay Abraham I <kishon@ti.com> - 2017-03-22 16:10 +0100
    [PATCH 2/4] Revert "dt-bindings: phy: Add documentation for NSP USB3 PHY" Kishon Vijay Abraham I <kishon@ti.com> - 2017-03-22 16:10 +0100
    Re: [GIT PULL] phy: for 4.11 -rc cycle Greg KH <gregkh@linuxfoundation.org> - 2017-03-23 22:10 +0100

#1606650 — [GIT PULL] phy: for 4.11 -rc cycle

Hi Greg,

Please find the pull request for this -rc cycle below.

The major change is removing USB3 PHY driver for Broadcom NSP merged
during the last merge window. It is found there already exists a PHY
driver (used by NS) and it can be shared with NSP as well. So in the
coming merge windows the existing USB3 PHY for NS will be adapted to
work for NSP. Apart from that, no major changes and includes a error
handling fix in phy-exynos-pcie and compiler error fix with EXTCON
is not selected.

Consider merging it in this -rc cycle and let me know If I have to
make any changes.

Thanks
Kishon

The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:

  Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.11-rc

for you to fetch changes up to 1a09b6a7c10e22c489a8b212dd6862b1fd9674ad:

  phy: qcom-usb-hs: Add depends on EXTCON (2017-03-09 15:29:57 +0530)

----------------------------------------------------------------
phy: for 4.11-rc

 *) Revert USB3 PHY support for Broadcom NSP SoC
 *) Fix compiler error on qcom-usb-hs when depends on EXTCON
    is not added
 *) Fix error handling in phy-exynos-pcie

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

----------------------------------------------------------------
Jaehoon Chung (1):
      phy: phy-exynos-pcie: fix the wrong error return

Rafał Miłecki (2):
      Revert "phy: Add USB3 PHY support for Broadcom NSP SoC"
      Revert "dt-bindings: phy: Add documentation for NSP USB3 PHY"

Stephen Boyd (1):
      phy: qcom-usb-hs: Add depends on EXTCON

 Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt |  39 ------------------------------
 drivers/phy/Kconfig                                         |   9 +------
 drivers/phy/Makefile                                        |   1 -
 drivers/phy/phy-bcm-nsp-usb3.c                              | 177 -----------------------------------------------------------------------------------------------------------------------------------------
 drivers/phy/phy-exynos-pcie.c                               |   4 ++--
 5 files changed, 3 insertions(+), 227 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
 delete mode 100644 drivers/phy/phy-bcm-nsp-usb3.c

-- 
2.11.0

[toc] | [next] | [standalone]

#1606654 — [PATCH 2/4] Revert "dt-bindings: phy: Add documentation for NSP USB3 PHY"

From: Rafał Miłecki <rafal@milecki.pl>

This reverts commit c8ca631f9480 ("dt-bindings: phy: Add documentation
for NSP USB3 PHY") to match reverting commit adding the new PHY driver.
Please note we revert this commit before it reached stable release.

If new compatible string is needed it should be added to the existing
bcm-ns-usb3-phy.txt which already describes this PHY.

Acked-by: Jon Mason <jon.mason@broadcom.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 .../devicetree/bindings/phy/brcm,nsp-usb3-phy.txt  | 39 ----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt

diff --git a/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt b/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
deleted file mode 100644
index e68ae5dec9c9..000000000000
--- a/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Broadcom USB3 phy binding for northstar plus SoC
-The USB3 phy is internal to the SoC and is accessed using mdio interface.
-
-Required mdio bus properties:
-- reg: Should be 0x0 for SoC internal USB3 phy
-- #address-cells: must be 1
-- #size-cells: must be 0
-
-Required USB3 PHY properties:
-- compatible: should be "brcm,nsp-usb3-phy"
-- reg: USB3 Phy address on SoC internal MDIO bus and it should be 0x10.
-- usb3-ctrl-syscon: handler of syscon node defining physical address
-  of usb3 control register.
-- #phy-cells: must be 0
-
-Required usb3 control properties:
-- compatible: should be "brcm,nsp-usb3-ctrl"
-- reg: offset and length of the control registers
-
-Example:
-
-	mdio@0 {
-		reg = <0x0>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		usb3_phy: usb-phy@10 {
-			compatible = "brcm,nsp-usb3-phy";
-			reg = <0x10>;
-			usb3-ctrl-syscon = <&usb3_ctrl>;
-			#phy-cells = <0>;
-			status = "disabled";
-		};
-	};
-
-	usb3_ctrl: syscon@104408 {
-		compatible = "brcm,nsp-usb3-ctrl", "syscon";
-		reg = <0x104408 0x3fc>;
-	};
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1607916

On Wed, Mar 22, 2017 at 08:30:32PM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Please find the pull request for this -rc cycle below.
> 
> The major change is removing USB3 PHY driver for Broadcom NSP merged
> during the last merge window. It is found there already exists a PHY
> driver (used by NS) and it can be shared with NSP as well. So in the
> coming merge windows the existing USB3 PHY for NS will be adapted to
> work for NSP. Apart from that, no major changes and includes a error
> handling fix in phy-exynos-pcie and compiler error fix with EXTCON
> is not selected.
> 
> Consider merging it in this -rc cycle and let me know If I have to
> make any changes.

Pulled and pushed out, thanks.

greg k-h

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web