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

Commit e5c6cac6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-3.16-2' of... 

Merge tag 'imx-fixes-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Merge "ARM: imx: fixes for 3.16, 2nd take" from Shawn Guo:

The i.MX fixes for 3.16, 2nd take:

It fixes a hard machine hang regression for boards where only pcie is
active but no sata, as the latest imx6-pcie driver is no longer enabling
the upstream clock directly but only lvds clk out.

* tag 'imx-fixes-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: clk-imx6q: parent lvds_sel input from upstream clock gates

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 05438894 03e97220

arch/arm/mach-imx/clk-imx6q.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static const char *cko_sels[] = { "cko1", "cko2", }; 
static const char *lvds_sels[] = {

	"dummy", "dummy", "dummy", "dummy", "dummy", "dummy",

	"pll4_audio", "pll5_video", "pll8_mlb", "enet_ref",

	"pcie_ref", "sata_ref",

	"pcie_ref_125m", "sata_ref_100m",

};



enum mx6q_clks {
@@ -491,7 +491,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 


	/* All existing boards with PCIe use LVDS1 */

	if (IS_ENABLED(CONFIG_PCI_IMX6))

		clk_set_parent(clk[lvds1_sel], clk[sata_ref]);

		clk_set_parent(clk[lvds1_sel], clk[sata_ref_100m]);



	/* Set initial power mode */

	imx6q_set_lpm(WAIT_CLOCKED);