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

Groups > linux.kernel > #1391970 > unrolled thread

[GIT PULL] phy: for 4.7

Back to article view | Back to linux.kernel

Contents

  [GIT PULL] phy: for 4.7 Kishon Vijay Abraham I <kishon@ti.com> - 2016-05-02 06:30 +0200
    [PATCH 07/16] phy: rcar-gen3-usb2: remove unnecesary struct rcar_gen3_data Kishon Vijay Abraham I <kishon@ti.com> - 2016-05-02 06:30 +0200
    Re: [GIT PULL] phy: for 4.7 Greg KH <gregkh@linuxfoundation.org> - 2016-05-04 00:00 +0200

#1391970 — [GIT PULL] phy: for 4.7

Hi Greg,

Please find below the pull request for 4.7 merge window.

It adds a new PHY driver for USB2 PHY on Northstar SoC and
reuses existing PHY drivers to add support for Broadcom NS2
SATA3 PHY, MIPI DPHYs in Exynos542x/Exynos5433 SoCs and
USB3 PHY on mt2701.

Let me know if I have to change something.

Thanks
Kishon

The following changes since commit 5128de85124c728cdbb6b35bd9dc7410f02c0ca1:

  phy: rockchip-emmc: adapt binding to specifiy register offset and length (2016-04-13 18:33:05 +0530)

are available in the git repository at:

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

for you to fetch changes up to 71f5c63c07e5be7abdce40891778ffbf3cec04f0:

  phy: exynos-mipi-video: Add support for Exynos 5420 and 5433 SoCs (2016-04-30 20:12:30 +0530)

----------------------------------------------------------------
phy: for 4.7

*) Add a new PHY driver for USB2 PHY on Northstar SoC
*) Add support for Broadcom NS2 SATA3 PHY in existing
   Broadcom SATA3 PHY driver
*) Add support for MIPI DPHYs in Exynos5420-compatible
   (5420, 5422 and 5800) and Exynos5433 SoCs
*) Add support for USB3 PHY on mt2701
*) Add extcon support for Renesas R-car USB2 PHY driver
*) Misc cleanups

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

----------------------------------------------------------------

Anup Patel (3):
  phy: Rename phy-brcmstb-sata driver to phy-brcm-sata driver
  phy: Add support for NS2 SATA3 PHY in Broadcom SATA3 PHY driver
  dt-bindings: phy: bindings document for common Broadcom SATA3 PHY
    driver

Chunfeng Yun (2):
  dt-bindings: phy-mt65xx-usb: add support for mt2701 platform
  phy: phy-mt65xx-usb3: add support for mt2701 platform

Marek Szyprowski (2):
  phy: exynos-mipi-video: Rewrite handling of phy registers
  phy: exynos-mipi-video: Add support for Exynos 5420 and 5433 SoCs

Rafał Miłecki (1):
  phy: bcm-ns-usb2: new driver for USB 2.0 PHY on Northstar

Simon Horman (3):
  phy: rcar-gen2: add fallback binding
  phy: rcar-gen3-usb2: add fallback binding
  phy: rcar-gen3-usb2, rcar-gen2: Use ARCH_RENESAS

Stephen Boyd (1):
  phy: rockhip-usb: Remove CLK_IS_ROOT

Sylwester Nawrocki (1):
  phy: exynos-mipi-video: Drop support for direct access to PMU

Yoshihiro Shimoda (3):
  phy: rcar-gen3-usb2: remove unnecesary struct rcar_gen3_data
  phy: rcar-gen3-usb2: Add vbus-supply to handle VBUS on/off
  phy: rcar-gen3-usb2: add extcon support

 .../devicetree/bindings/phy/bcm-ns-usb2-phy.txt    |   21 +
 ...brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} |   15 +-
 .../devicetree/bindings/phy/phy-mt65xx-usb.txt     |    4 +-
 .../devicetree/bindings/phy/rcar-gen2-phy.txt      |    8 +-
 .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt |   12 +-
 .../devicetree/bindings/phy/samsung-phy.txt        |   18 +-
 drivers/phy/Kconfig                                |   30 +-
 drivers/phy/Makefile                               |    3 +-
 drivers/phy/phy-bcm-ns-usb2.c                      |  137 +++++++
 drivers/phy/phy-brcm-sata.c                        |  412 ++++++++++++++++++++
 drivers/phy/phy-brcmstb-sata.c                     |  250 ------------
 drivers/phy/phy-exynos-mipi-video.c                |  321 ++++++++++++---
 drivers/phy/phy-mt65xx-usb3.c                      |   77 ++--
 drivers/phy/phy-rcar-gen2.c                        |    1 +
 drivers/phy/phy-rcar-gen3-usb2.c                   |   88 ++++-
 drivers/phy/phy-rockchip-usb.c                     |    2 +-
 include/linux/bcma/bcma.h                          |    1 +
 include/linux/bcma/bcma_driver_arm_c9.h            |   15 +
 include/linux/mfd/syscon/exynos5-pmu.h             |    3 +
 19 files changed, 1035 insertions(+), 383 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt
 rename Documentation/devicetree/bindings/phy/{brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} (69%)
 create mode 100644 drivers/phy/phy-bcm-ns-usb2.c
 create mode 100644 drivers/phy/phy-brcm-sata.c
 delete mode 100644 drivers/phy/phy-brcmstb-sata.c
 create mode 100644 include/linux/bcma/bcma_driver_arm_c9.h

-- 
1.7.9.5

[toc] | [next] | [standalone]

#1391971 — [PATCH 07/16] phy: rcar-gen3-usb2: remove unnecesary struct rcar_gen3_data

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Since this driver uses the struct rcar_gen3_data in struct rcar_gen3_chan
only, we can remove the rcar_gen3_data.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-rcar-gen3-usb2.c |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index 257be74..3c647cd 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -74,20 +74,15 @@
 #define USB2_ADPCTRL_IDPULLUP		BIT(5)	/* 1 = ID sampling is enabled */
 #define USB2_ADPCTRL_DRVVBUS		BIT(4)
 
-struct rcar_gen3_data {
-	void __iomem *base;
-	struct clk *clk;
-};
-
 struct rcar_gen3_chan {
-	struct rcar_gen3_data usb2;
+	void __iomem *base;
 	struct phy *phy;
 	bool has_otg;
 };
 
 static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)
 {
-	void __iomem *usb2_base = ch->usb2.base;
+	void __iomem *usb2_base = ch->base;
 	u32 val = readl(usb2_base + USB2_COMMCTRL);
 
 	dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, host);
@@ -100,7 +95,7 @@ static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)
 
 static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)
 {
-	void __iomem *usb2_base = ch->usb2.base;
+	void __iomem *usb2_base = ch->base;
 	u32 val = readl(usb2_base + USB2_LINECTRL1);
 
 	dev_vdbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);
@@ -114,7 +109,7 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)
 
 static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
 {
-	void __iomem *usb2_base = ch->usb2.base;
+	void __iomem *usb2_base = ch->base;
 	u32 val = readl(usb2_base + USB2_ADPCTRL);
 
 	dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, vbus);
@@ -141,13 +136,13 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
 
 static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch)
 {
-	return !!(readl(ch->usb2.base + USB2_ADPCTRL) &
+	return !!(readl(ch->base + USB2_ADPCTRL) &
 		  USB2_ADPCTRL_OTGSESSVLD);
 }
 
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
-	return !!(readl(ch->usb2.base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
+	return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
 }
 
 static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch)
@@ -166,7 +161,7 @@ static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch)
 
 static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
 {
-	void __iomem *usb2_base = ch->usb2.base;
+	void __iomem *usb2_base = ch->base;
 	u32 val;
 
 	val = readl(usb2_base + USB2_VBCTRL);
@@ -187,7 +182,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
 static int rcar_gen3_phy_usb2_init(struct phy *p)
 {
 	struct rcar_gen3_chan *channel = phy_get_drvdata(p);
-	void __iomem *usb2_base = channel->usb2.base;
+	void __iomem *usb2_base = channel->base;
 
 	/* Initialize USB2 part */
 	writel(USB2_INT_ENABLE_INIT, usb2_base + USB2_INT_ENABLE);
@@ -205,7 +200,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p)
 {
 	struct rcar_gen3_chan *channel = phy_get_drvdata(p);
 
-	writel(0, channel->usb2.base + USB2_INT_ENABLE);
+	writel(0, channel->base + USB2_INT_ENABLE);
 
 	return 0;
 }
@@ -213,7 +208,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p)
 static int rcar_gen3_phy_usb2_power_on(struct phy *p)
 {
 	struct rcar_gen3_chan *channel = phy_get_drvdata(p);
-	void __iomem *usb2_base = channel->usb2.base;
+	void __iomem *usb2_base = channel->base;
 	u32 val;
 
 	val = readl(usb2_base + USB2_USBCTR);
@@ -235,7 +230,7 @@ static struct phy_ops rcar_gen3_phy_usb2_ops = {
 static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
 {
 	struct rcar_gen3_chan *ch = _ch;
-	void __iomem *usb2_base = ch->usb2.base;
+	void __iomem *usb2_base = ch->base;
 	u32 status = readl(usb2_base + USB2_OBINTSTA);
 	irqreturn_t ret = IRQ_NONE;
 
@@ -274,9 +269,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	channel->usb2.base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(channel->usb2.base))
-		return PTR_ERR(channel->usb2.base);
+	channel->base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(channel->base))
+		return PTR_ERR(channel->base);
 
 	/* call request_irq for OTG */
 	irq = platform_get_irq(pdev, 0);
-- 
1.7.9.5

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

#1393846

On Mon, May 02, 2016 at 09:52:51AM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Please find below the pull request for 4.7 merge window.
> 
> It adds a new PHY driver for USB2 PHY on Northstar SoC and
> reuses existing PHY drivers to add support for Broadcom NS2
> SATA3 PHY, MIPI DPHYs in Exynos542x/Exynos5433 SoCs and
> USB3 PHY on mt2701.
> 
> Let me know if I have to change something.
> 
> Thanks
> Kishon
> 
> The following changes since commit 5128de85124c728cdbb6b35bd9dc7410f02c0ca1:
> 
>   phy: rockchip-emmc: adapt binding to specifiy register offset and length (2016-04-13 18:33:05 +0530)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.7

Pulled and pushed out, thanks.

greg k-h

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web