system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

phy: for 4.7-rc

Browse source 
*) 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>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJXWnWXAAoJEA5ceFyATYLZuPAP/0V/XbSQYq+lwOsSIgAN0q81
 gPf14fDjg/i8sLl5U8t632LCE93xB+eHukVaka/XA5Ri2kwVP+SyErJIw5rcqxmb
 HdEBY+8xw4uAS0oEr4rgbL/BBJMW5zl/+IeFL+VaUSH0uAW25hrNGGugnCOaFqNC
 zcwGJwYBt6w6i2g6L+Y59K/TslPRw/n/SX0e29op/eyssmLb6lgGVR8icANqz+rT
 CvgnghnRW8ljX4eJjQcp4WvVQcZRcHqNjX0jibf8TVrqY8ovL56kOzBSNfAkiGNj
 S7j12kBvU+BWKY1MwtcBE6EAvQin/Wgq9Gm1mpSigqEGCk98El5XMpsyjwfZlViR
 jD/bWhMuHojuN7tIWDsb2H6/sSJL9Fu94lVhGI6sLUs3fbV27P/qbeqox0aWJ8l8
 CyN3qNTd/4HEbo/ty6w3Yzfu8WWyE8LzlVEkmnlfVEKhh3TQaX6hjiCd+lD0RNXY
 nTvWMPzgOvENhLqRlKkUHJRuUTcTRFKgUHJVe82h8qHWqFRQN+0UfcUZ0Kosd2ms
 6gZg1LQgl/TxX8QkgdVB3Z+zy2tfeqU06CecV9/pyOKkCqDUXOXqKg4SQ35AY06Y
 PLLWCVyJhvkmW4ol35Atv9guRXrHZIyLEomhR4Qx5rzxxj1CekoJYVQr8D7ctwmV
 H8jLjQKScFW3GZscTozS
 =AmRN
 -----END PGP SIGNATURE-----

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: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Greg Kroah-Hartman 2016-06-10 23:06:21 -07:00
parent 11c011a5e7 31b2a32f70
commit e4600d5632
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/phy/phy-exynos-mipi-video.c
View file

@ -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;
}

15
drivers/phy/phy-ti-pipe3.c
View file

@ -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;
}