imx6: switch to 3.14
[15.05/openwrt.git] / target / linux / imx6 / patches-3.10 / 0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch
1 From 4f6723e8ff497e35c8f2fb20886fccc533c58cdb Mon Sep 17 00:00:00 2001
2 From: Sean Cross <xobs@kosagi.com>
3 Date: Thu, 26 Sep 2013 10:45:35 +0800
4 Subject: [PATCH] ARM: imx6q: clock and Kconfig update for PCIe support
5
6 Update imx6q clock initialization and Kconfig for PCIe support.
7
8 Signed-off-by: Sean Cross <xobs@kosagi.com>
9 Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
10 ---
11  arch/arm/mach-imx/Kconfig     | 2 ++
12  arch/arm/mach-imx/clk-imx6q.c | 4 ++++
13  2 files changed, 6 insertions(+)
14
15 --- a/arch/arm/mach-imx/Kconfig
16 +++ b/arch/arm/mach-imx/Kconfig
17 @@ -806,6 +806,8 @@ config SOC_IMX6Q
18         select HAVE_IMX_SRC
19         select HAVE_SMP
20         select MFD_SYSCON
21 +       select MIGHT_HAVE_PCI
22 +       select PCI_DOMAINS if PCI
23         select PINCTRL
24         select PINCTRL_IMX6Q
25         select PL310_ERRATA_588369 if CACHE_PL310
26 --- a/arch/arm/mach-imx/clk-imx6q.c
27 +++ b/arch/arm/mach-imx/clk-imx6q.c
28 @@ -586,6 +586,10 @@ int __init mx6q_clocks_init(void)
29                 clk_prepare_enable(clk[usbphy2_gate]);
30         }
31  
32 +       /* All existing boards with PCIe use LVDS1 */
33 +       if (IS_ENABLED(CONFIG_PCI_IMX6))
34 +               clk_set_parent(clk[lvds1_sel], clk[sata_ref]);
35 +
36         /* Set initial power mode */
37         imx6q_set_lpm(WAIT_CLOCKED);
38