From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f182.google.com ([209.85.212.182]:37920 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752660AbbF0IMb (ORCPT ); Sat, 27 Jun 2015 04:12:31 -0400 Received: by wibdq8 with SMTP id dq8so34449531wib.1 for ; Sat, 27 Jun 2015 01:12:29 -0700 (PDT) From: Dirk Behme To: stable@vger.kernel.org Cc: Sebastien Szymanski , Shawn Guo , Dirk Behme Subject: [PATCH v3.10.y .. v3.14.y] ARM: clk-imx6q: refine sata's parent Date: Sat, 27 Jun 2015 10:12:25 +0200 Message-Id: <1435392745-8179-1-git-send-email-dirk.behme@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: 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 and context] Signed-off-by: Dirk Behme -- Index: github_linux.git/arch/arm/mach-imx/clk-imx6q.c =================================================================== --- github_linux.git.orig/arch/arm/mach-imx/clk-imx6q.c 2015-06-13 08:03:18.874108966 +0200 +++ github_linux.git/arch/arm/mach-imx/clk-imx6q.c 2015-06-13 08:04:01.582110737 +0200 @@ -406,7 +406,7 @@ 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);