Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4600d56 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-4.7-rc' of... 

Merge tag 'phy-for-4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy

 into usb-linus

Kishon writes:

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: default avatarKishon Vijay Abraham I <kishon@ti.com>
parents 11c011a5 31b2a32f

drivers/phy/phy-exynos-mipi-video.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/phy/phy-ti-pipe3.c

+11 −4
Original line number Diff line number Diff line
@@ -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))

	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;

}