aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-11 10:09:23 +0000
committerJohn Crispin <john@openwrt.org>2015-02-11 10:09:23 +0000
commit88ddb3746188037afd38d631f7a893587fa8bdf0 (patch)
treedf4684db63441435126c4b6ff1fda4ce615e1ff0 /target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch
parentddcbef5766fa18f52e7a7d1928b25edc63e73937 (diff)
downloadupstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.gz
upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.bz2
upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.zip
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The newest patch at the time was from June, so we can safely assume that either the patches have been merged, or they have been rejected for a good reason. If patches are seen missing, we'll cherry-pick them on a per-needed basis. This new kernel have been tested on AP148, which seems to works fine. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 44386
Diffstat (limited to 'target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch')
-rw-r--r--target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch b/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch
deleted file mode 100644
index e2e313ca65..0000000000
--- a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ae0e9ee3bcfafc5bd5932b544e0a5c107948fc97 Mon Sep 17 00:00:00 2001
-From: Andy Gross <agross@codeaurora.org>
-Date: Mon, 30 Jun 2014 21:17:26 -0500
-Subject: [PATCH 181/182] mtd: nand: qcom: Align clk and reset names
-
-This patch aligns the clk and reset names to the same ones that the dmaengine
-driver uses.
-
-Signed-off-by: Andy Gross <agross@codeaurora.org>
----
- drivers/mtd/nand/qcom_adm_dma.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/nand/qcom_adm_dma.c
-+++ b/drivers/mtd/nand/qcom_adm_dma.c
-@@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct p
- int adm = (pdev->id >= 0) ? pdev->id : 0;
- int ret;
-
-- dmov_conf[adm].clk = devm_clk_get(&pdev->dev, "core_clk");
-+ dmov_conf[adm].clk = devm_clk_get(&pdev->dev, "core");
- if (IS_ERR(dmov_conf[adm].clk)) {
- printk(KERN_ERR "%s: Error getting adm_clk\n", __func__);
- dmov_conf[adm].clk = NULL;
- return -ENOENT;
- }
-
-- dmov_conf[adm].pclk = devm_clk_get(&pdev->dev, "iface_clk");
-+ dmov_conf[adm].pclk = devm_clk_get(&pdev->dev, "iface");
- if (IS_ERR(dmov_conf[adm].pclk)) {
- dmov_conf[adm].pclk = NULL;
- /* pclk not present on all SoCs, don't bail on failure */
-@@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platfor
- }
-
- /* get resets */
-- dmov_conf[adm].adm_reset = devm_reset_control_get(&pdev->dev, "adm");
-+ dmov_conf[adm].adm_reset = devm_reset_control_get(&pdev->dev, "clk");
- if (IS_ERR(dmov_conf[adm].adm_reset)) {
- dev_err(&pdev->dev, "failed to get adm reset\n");
- ret = PTR_ERR(dmov_conf[adm].adm_reset);