aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-12-17 02:47:15 +0000
committerLuka Perkov <luka@openwrt.org>2013-12-17 02:47:15 +0000
commitccf1ee93d9ce2361496b5955b832d74ab1613287 (patch)
tree21c9f017c5d630235a50c278cd879d6f3ba55fa9 /target/linux
parent0b4e8c4c364368491714d80e465c71625e4116b4 (diff)
downloadupstream-ccf1ee93d9ce2361496b5955b832d74ab1613287.tar.gz
upstream-ccf1ee93d9ce2361496b5955b832d74ab1613287.tar.bz2
upstream-ccf1ee93d9ce2361496b5955b832d74ab1613287.zip
imx6: drop upstreamed patch
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 39109
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/imx6/patches-3.10/0062-ARM-i.MX6q-fix-the-wrong-parent-of-can_root-clock.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/target/linux/imx6/patches-3.10/0062-ARM-i.MX6q-fix-the-wrong-parent-of-can_root-clock.patch b/target/linux/imx6/patches-3.10/0062-ARM-i.MX6q-fix-the-wrong-parent-of-can_root-clock.patch
deleted file mode 100644
index 8ea02f6dc6..0000000000
--- a/target/linux/imx6/patches-3.10/0062-ARM-i.MX6q-fix-the-wrong-parent-of-can_root-clock.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9b3d423707c3b1f6633be1be7e959623e10c596b Mon Sep 17 00:00:00 2001
-From: Jiada Wang <jiada_wang@mentor.com>
-Date: Wed, 30 Oct 2013 04:25:51 -0700
-Subject: [PATCH] ARM: i.MX6q: fix the wrong parent of can_root clock
-
-instead of pll3_usb_otg the parent of can_root clock
-should be pll3_60m.
-
-Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
-Signed-off-by: Shawn Guo <shawn.guo@linaro.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
-@@ -442,7 +442,7 @@ int __init mx6q_clocks_init(void)
- clk[asrc_podf] = imx_clk_divider("asrc_podf", "asrc_pred", base + 0x30, 9, 3);
- clk[spdif_pred] = imx_clk_divider("spdif_pred", "spdif_sel", base + 0x30, 25, 3);
- clk[spdif_podf] = imx_clk_divider("spdif_podf", "spdif_pred", base + 0x30, 22, 3);
-- clk[can_root] = imx_clk_divider("can_root", "pll3_usb_otg", base + 0x20, 2, 6);
-+ clk[can_root] = imx_clk_divider("can_root", "pll3_60m", base + 0x20, 2, 6);
- clk[ecspi_root] = imx_clk_divider("ecspi_root", "pll3_60m", base + 0x38, 19, 6);
- clk[gpu2d_core_podf] = imx_clk_divider("gpu2d_core_podf", "gpu2d_core_sel", base + 0x18, 23, 3);
- clk[gpu3d_core_podf] = imx_clk_divider("gpu3d_core_podf", "gpu3d_core_sel", base + 0x18, 26, 3);