[GIT PULL] phy: for 4.7 -rc cycle

[GIT PULL] phy: for 4.7 -rc cycle

[Kishon Vijay Abraham I]

Hi Greg,

Please find the pull request for this -rc cycle below. It consists of a
couple of fixes in the phy drivers. Consider merging this in this -rc.

Let me know if you want me to change something.

Cheers
Kishon

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

  Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

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-rc

for you to fetch changes up to 31b2a32f708bb33b3f35b03ce3d2cb31f7d1e684:

  phy: ti-pipe3: Program the DPLL even if it was already locked (2016-06-03 12:06:41 +0530)

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

*) Fix compiler warning in exynos-mipi-video
*) Fix in ti-pipe3 PHY to program the DPLL
   even if it was already locked

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

----------------------------------------------------------------
Arnd Bergmann (1):
      phy: exynos-mipi-video: avoid uninitialized variable use

Roger Quadros (1):
      phy: ti-pipe3: Program the DPLL even if it was already locked

 drivers/phy/phy-exynos-mipi-video.c |    6 +++++-
 drivers/phy/phy-ti-pipe3.c          |   15 +++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] phy: exynos-mipi-video: avoid uninitialized variable use

[Kishon Vijay Abraham I]

From: Arnd Bergmann <arnd@arndb.de>

A rework of the exynos-mipi-video driver caused a warning
about the new __set_phy_state function potentially accessing
a variable before its initialization:

drivers/phy/phy-exynos-mipi-video.c: In function '__set_phy_state':
drivers/phy/phy-exynos-mipi-video.c:238:13: error: 'val' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  return val & data->resetn_val;
         ~~~~^~~~~~~~~~~~~~~~~~
drivers/phy/phy-exynos-mipi-video.c:235:6: note: 'val' was declared here
  u32 val;

The failure scenario here is the offset passed into a the
stub regmap_read() function that does not modify its output,
however regmap_read() can also fail for other reasons, so
adding error handling (in this case, returning zero from
is_running) seems the best solution.

Note that this warning showed up with the ARM s5pv210_defconfig,
indicating that we most likely want to either enable CONFIG_REGMAP
in that defconfig as well, or disable the phy-exynos-mipi-video
driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 97a3042f7616 ("phy: exynos-mipi-video: Rewrite handling of phy registers")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-exynos-mipi-video.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/phy/phy-exynos-mipi-video.c b/drivers/phy/phy-exynos-mipi-video.c
index cc093eb..8b851f7 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -233,8 +233,12 @@ static inline int __is_running(const struct exynos_mipi_phy_desc *data,
 			struct exynos_mipi_video_phy *state)
 {
 	u32 val;
+	int ret;
+
+	ret = regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
+	if (ret)
+		return 0;
 
-	regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
 	return val & data->resetn_val;
 }
 
-- 
1.7.9.5

[PATCH 2/2] phy: ti-pipe3: Program the DPLL even if it was already locked

[Kishon Vijay Abraham I]

From: Roger Quadros <rogerq@ti.com>

If bootloader has set a wrong DPLL then we must trash those values
and re-program it anyways. This fixes USB3 devices not being enumerated
on beagle-x15 if usb was started in u-boot.

We don't re-program SATA DPLL if it is locked as it was causing
SATA failures if device was hotpluged after boot.

Reported-by: Robert Nelson <robertcnelson@gmail.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-ti-pipe3.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c
index 0a477d2..bf46844 100644
--- a/drivers/phy/phy-ti-pipe3.c
+++ b/drivers/phy/phy-ti-pipe3.c
@@ -293,11 +293,18 @@ static int ti_pipe3_init(struct phy *x)
 		ret = ti_pipe3_dpll_wait_lock(phy);
 	}
 
-	/* Program the DPLL only if not locked */
+	/* SATA has issues if re-programmed when locked */
 	val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-	if (!(val & PLL_LOCK))
-		if (ti_pipe3_dpll_program(phy))
-			return -EINVAL;
+	if ((val & PLL_LOCK) && of_device_is_compatible(phy->dev->of_node,
+							"ti,phy-pipe3-sata"))
+		return ret;
+
+	/* Program the DPLL */
+	ret = ti_pipe3_dpll_program(phy);
+	if (ret) {
+		ti_pipe3_disable_clocks(phy);
+		return -EINVAL;
+	}
 
 	return ret;
 }
-- 
1.7.9.5

Re: [GIT PULL] phy: for 4.7 -rc cycle

[Greg KH]

On Fri, Jun 10, 2016 at 01:51:51PM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Please find the pull request for this -rc cycle below. It consists of a
> couple of fixes in the phy drivers. Consider merging this in this -rc.
> 
> Let me know if you want me to change something.
> 
> Cheers
> Kishon
> 
> The following changes since commit 1a695a905c18548062509178b98bc91e67510864:
> 
>   Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)
> 
> 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-rc

Pulled and pushed out, thanks.

greg k-h

Re: [GIT PULL] phy: for 4.7 -rc cycle

[Greg KH]

On Thu, Jun 23, 2016 at 11:32:18AM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Please find the 2nd pull request for the -rc cycle. This contains minor
> fixes in various phy drivers. I've listed the changes in the tag message.
> Consider merging it in this -rc cyle.
> 
> Please let me know if I have to change something.
> 
> Thanks
> Kishon
> 
> The following changes since commit 31b2a32f708bb33b3f35b03ce3d2cb31f7d1e684:
> 
>   phy: ti-pipe3: Program the DPLL even if it was already locked (2016-06-03 12:06:41 +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-rc5

Pulled and pushed out, thanks.

greg k-h

[GIT PULL] phy: for 4.7 -rc cycle

[Kishon Vijay Abraham I]

Hi Greg,

Please find the 2nd pull request for the -rc cycle. This contains minor
fixes in various phy drivers. I've listed the changes in the tag message.
Consider merging it in this -rc cyle.

Please let me know if I have to change something.

Thanks
Kishon

The following changes since commit 31b2a32f708bb33b3f35b03ce3d2cb31f7d1e684:

  phy: ti-pipe3: Program the DPLL even if it was already locked (2016-06-03 12:06:41 +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-rc5

for you to fetch changes up to 04e59a0211ff012ba60c00baca673482570784e9:

  phy-sun4i-usb: Fix irq free conditions to match request conditions (2016-06-22 11:33:46 +0530)

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

*) Fix in sun4i-usb phy driver to properly handle the return value of
   gpiod_to_irq
*) Fix a sparse warning in sun4i-usb phy driver
*) Fix bcm-ns-usb2 phy driver to check the correct variable
*) Fix spurious interrupts during VBUS change in rcar-gen3-usb2 phy
   driver

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

----------------------------------------------------------------
Ben Dooks (1):
      phy-sun4i-usb: fix missing __iomem *

Dan Carpenter (1):
      phy: bcm-ns-usb2: checking the wrong variable

Hans de Goede (1):
      phy-sun4i-usb: Fix irq free conditions to match request conditions

Quentin Schulz (1):
      phy: phy-sun4i-usb: Fix optional gpios failing probe

Wei Yongjun (1):
      phy: rockchip-dp: fix return value check in rockchip_dp_phy_probe()

Yoshihiro Shimoda (1):
      phy: rcar-gen3-usb2: fix unexpected repeat interrupts of VBUS change

 drivers/phy/phy-bcm-ns-usb2.c    |    4 ++--
 drivers/phy/phy-rcar-gen3-usb2.c |   14 +-------------
 drivers/phy/phy-rockchip-dp.c    |    2 +-
 drivers/phy/phy-sun4i-usb.c      |   14 +++++++-------
 4 files changed, 11 insertions(+), 23 deletions(-)

-- 
1.7.9.5