3.16.7-ckt15 -stable review patch. If anyone has any objections, please let me
know.
------------------
From: Sebastien Szymanski <sebastien.szyman...@armadeus.com>
commit da946aeaeadcd24ff0cda9984c6fb8ed2bfd462a upstream.
According to IMX6D/Q RM, table 18-3, sata clock's parent is ahb, not ipg.
Signed-off-by: Sebastien Szymanski <sebastien.szyman...@armadeus.com>
Reviewed-by: Fabio Estevam <fabio.este...@freescale.com>
Signed-off-by: Shawn Guo <shawn....@linaro.org>
[dirk.behme: Adjust moved file and context]
Signed-off-by: Dirk Behme <dirk.be...@gmail.com>
Signed-off-by: Luis Henriques <luis.henriq...@canonical.com>
---
arch/arm/mach-imx/clk-imx6q.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 3433b10ca968..032d1b958889 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -413,7 +413,7 @@ static void __init imx6q_clocks_init(struct device_node
*ccm_node)
clk[gpmi_io] = imx_clk_gate2("gpmi_io", "enfc",
base + 0x78, 28);
clk[gpmi_apb] = imx_clk_gate2("gpmi_apb", "usdhc3",
base + 0x78, 30);
clk[rom] = imx_clk_gate2("rom", "ahb",
base + 0x7c, 0);
- clk[sata] = imx_clk_gate2("sata", "ipg",
base + 0x7c, 4);
+ clk[sata] = imx_clk_gate2("sata", "ahb",
base + 0x7c, 4);
clk[sdma] = imx_clk_gate2("sdma", "ahb",
base + 0x7c, 6);
clk[spba] = imx_clk_gate2("spba", "ipg",
base + 0x7c, 12);
clk[spdif] = imx_clk_gate2("spdif", "spdif_podf",
base + 0x7c, 14);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
