From: Greg Kroah-Hartman Date: Tue, 30 Jun 2015 00:45:13 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v3.10.83~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90bca0c84d07a3495d55ff2b1e85d3a623fb4a1f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: arm-clk-imx6q-refine-sata-s-parent.patch --- diff --git a/queue-3.14/arm-clk-imx6q-refine-sata-s-parent.patch b/queue-3.14/arm-clk-imx6q-refine-sata-s-parent.patch new file mode 100644 index 00000000000..32228c94569 --- /dev/null +++ b/queue-3.14/arm-clk-imx6q-refine-sata-s-parent.patch @@ -0,0 +1,36 @@ +From da946aeaeadcd24ff0cda9984c6fb8ed2bfd462a Mon Sep 17 00:00:00 2001 +From: Sebastien Szymanski +Date: Wed, 20 May 2015 16:30:37 +0200 +Subject: ARM: clk-imx6q: refine sata's parent +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sebastien Szymanski + +commit da946aeaeadcd24ff0cda9984c6fb8ed2bfd462a upstream. + +According to IMX6D/Q RM, table 18-3, sata clock's parent is ahb, not ipg. + +Signed-off-by: Sebastien Szymanski +Reviewed-by: Fabio Estevam +Signed-off-by: Shawn Guo +[dirk.behme: Adjust moved file] +Signed-off-by: Dirk Behme +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-imx/clk-imx6q.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/mach-imx/clk-imx6q.c ++++ b/arch/arm/mach-imx/clk-imx6q.c +@@ -406,7 +406,7 @@ static void __init imx6q_clocks_init(str + 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); diff --git a/queue-3.14/series b/queue-3.14/series index 23be11d3e9d..4c7fd46f12b 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -12,3 +12,4 @@ x86-microcode-intel-guard-against-stack-overflow-in-the-loader.patch btrfs-make-xattr-replace-operations-atomic.patch net-mlx4_en-don-t-attempt-to-tx-offload-the-outer-udp-checksum-for-vxlan.patch splice-apply-generic-position-and-size-checks-to-each-write.patch +arm-clk-imx6q-refine-sata-s-parent.patch