diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-30 23:31:26 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-30 23:31:26 +0000 |
| commit | 672a8cd6ba72820f24a02dd237edaec3cd8973c5 (patch) | |
| tree | bc721f84fd39a89e6881ddf06389b8ac0ab87d5f /target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch | |
| parent | 8effe85ada423f2b61d863befd6e9b2430851d2d (diff) | |
| download | master-31e0f0ae-672a8cd6ba72820f24a02dd237edaec3cd8973c5.tar.gz master-31e0f0ae-672a8cd6ba72820f24a02dd237edaec3cd8973c5.tar.bz2 master-31e0f0ae-672a8cd6ba72820f24a02dd237edaec3cd8973c5.zip | |
imx6: update patches
Changes include PCI fixes and various upstream pending patches.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38624
Diffstat (limited to 'target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch')
| -rw-r--r-- | target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch b/target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch index 08e45dfaec..af955c96d3 100644 --- a/target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch +++ b/target/linux/imx6/patches-3.12/0006-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch @@ -12,11 +12,9 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org> arch/arm/mach-imx/clk-imx6q.c | 4 ++++ 2 files changed, 6 insertions(+) -diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig -index e017915..270f786 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig -@@ -802,6 +802,8 @@ config SOC_IMX6Q +@@ -801,6 +801,8 @@ config SOC_IMX6Q select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON @@ -25,11 +23,9 @@ index e017915..270f786 100644 select PINCTRL select PINCTRL_IMX6Q select PL310_ERRATA_588369 if CACHE_PL310 -diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c -index e8e5bad..07bc0d8 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c -@@ -623,6 +623,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) +@@ -623,6 +623,10 @@ static void __init imx6q_clocks_init(str if (ret) pr_warn("failed to set up CLKO: %d\n", ret); @@ -40,6 +36,3 @@ index e8e5bad..07bc0d8 100644 /* Set initial power mode */ imx6q_set_lpm(WAIT_CLOCKED); --- -1.8.4.1 - |