diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-03 13:06:42 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-03 13:06:42 +0000 |
| commit | 60dd4429b71227cbecf22892b26e125fedd4159d (patch) | |
| tree | a2fd41a346c7726c17f980ae49a6e74216a33741 /target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch | |
| parent | 5617993e1059509ab09b1f3f210634c1f6a48af8 (diff) | |
| download | master-31e0f0ae-60dd4429b71227cbecf22892b26e125fedd4159d.tar.gz master-31e0f0ae-60dd4429b71227cbecf22892b26e125fedd4159d.tar.bz2 master-31e0f0ae-60dd4429b71227cbecf22892b26e125fedd4159d.zip | |
imx6: update upstream pcie patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38298
Diffstat (limited to 'target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch')
| -rw-r--r-- | target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch b/target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch new file mode 100644 index 0000000000..25f207af07 --- /dev/null +++ b/target/linux/imx6/patches-3.10/0013-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch @@ -0,0 +1,38 @@ +From 4f6723e8ff497e35c8f2fb20886fccc533c58cdb Mon Sep 17 00:00:00 2001 +From: Sean Cross <xobs@kosagi.com> +Date: Thu, 26 Sep 2013 10:45:35 +0800 +Subject: [PATCH] ARM: imx6q: clock and Kconfig update for PCIe support + +Update imx6q clock initialization and Kconfig for PCIe support. + +Signed-off-by: Sean Cross <xobs@kosagi.com> +Signed-off-by: Shawn Guo <shawn.guo@linaro.org> +--- + arch/arm/mach-imx/Kconfig | 2 ++ + arch/arm/mach-imx/clk-imx6q.c | 4 ++++ + 2 files changed, 6 insertions(+) + +--- a/arch/arm/mach-imx/Kconfig ++++ b/arch/arm/mach-imx/Kconfig +@@ -806,6 +806,8 @@ config SOC_IMX6Q + select HAVE_IMX_SRC + select HAVE_SMP + select MFD_SYSCON ++ select MIGHT_HAVE_PCI ++ select PCI_DOMAINS if PCI + select PINCTRL + select PINCTRL_IMX6Q + select PL310_ERRATA_588369 if CACHE_PL310 +--- a/arch/arm/mach-imx/clk-imx6q.c ++++ b/arch/arm/mach-imx/clk-imx6q.c +@@ -586,6 +586,10 @@ int __init mx6q_clocks_init(void) + clk_prepare_enable(clk[usbphy2_gate]); + } + ++ /* All existing boards with PCIe use LVDS1 */ ++ if (IS_ENABLED(CONFIG_PCI_IMX6)) ++ clk_set_parent(clk[lvds1_sel], clk[sata_ref]); ++ + /* Set initial power mode */ + imx6q_set_lpm(WAIT_CLOCKED); + |