4.0-stable patches

added patches:
	arm-clk-imx6q-refine-sata-s-parent.patch

diff --git a/queue-4.0/arm-clk-imx6q-refine-sata-s-parent.patch b/queue-4.0/arm-clk-imx6q-refine-sata-s-parent.patch
new file mode 100644 (file)
index 0000000..5e69eee
--- /dev/null
+++ b/queue-4.0/arm-clk-imx6q-refine-sata-s-parent.patch
@@ -0,0 +1,36 @@
+From da946aeaeadcd24ff0cda9984c6fb8ed2bfd462a Mon Sep 17 00:00:00 2001
+From: Sebastien Szymanski <sebastien.szymanski@armadeus.com>
+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 <sebastien.szymanski@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.szymanski@armadeus.com>
+Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+[dirk.behme: Adjust moved file]
+Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -439,7 +439,7 @@ static void __init imx6q_clocks_init(str
+       clk[IMX6QDL_CLK_GPMI_IO]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);
+       clk[IMX6QDL_CLK_GPMI_APB]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);
+       clk[IMX6QDL_CLK_ROM]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);
+-      clk[IMX6QDL_CLK_SATA]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
++      clk[IMX6QDL_CLK_SATA]         = imx_clk_gate2("sata",          "ahb",               base + 0x7c, 4);
+       clk[IMX6QDL_CLK_SDMA]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
+       clk[IMX6QDL_CLK_SPBA]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
+       clk[IMX6QDL_CLK_SPDIF]        = imx_clk_gate2("spdif",         "spdif_podf",        base + 0x7c, 14);

diff --git a/queue-4.0/series b/queue-4.0/series
index fe60ea9fc0213a7c718da501545daad270fe39cb..b7475a03ba3487ae6d7c3ee7a37c17b9ee232156 100644 (file)
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -1,2 +1,3 @@
 config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch
 netfilter-nft_rbtree-fix-locking.patch
+arm-clk-imx6q-refine-sata-s-parent.patch