kernel: update 3.14 to 3.14.18

[openwrt/staging/luka.git] / target / linux / ipq806x / patches / 0078-clk-qcom-Consolidate-common-probe-code.patch

diff --git a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch
index c801ed5b35cdff9d58c1ab1711cd8f156b64fdd1..dc0408c1662f48ad0e5ffd7392757641248fdf79 100644 (file)
--- a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch
+++ b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch
@@ -23,8 +23,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  create mode 100644 drivers/clk/qcom/common.c
  create mode 100644 drivers/clk/qcom/common.h
 
-diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
-index f60db2e..689e05b 100644
 --- a/drivers/clk/qcom/Makefile
 +++ b/drivers/clk/qcom/Makefile
 @@ -1,5 +1,6 @@
@@ -34,9 +32,6 @@ index f60db2e..689e05b 100644
  clk-qcom-y += clk-regmap.o
  clk-qcom-y += clk-pll.o
  clk-qcom-y += clk-rcg.o
-diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
-new file mode 100644
-index 0000000..86b45fb
 --- /dev/null
 +++ b/drivers/clk/qcom/common.c
 @@ -0,0 +1,99 @@
@@ -139,9 +134,6 @@ index 0000000..86b45fb
 +      reset_controller_unregister(platform_get_drvdata(pdev));
 +}
 +EXPORT_SYMBOL_GPL(qcom_cc_remove);
-diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h
-new file mode 100644
-index 0000000..2c3cfc8
 --- /dev/null
 +++ b/drivers/clk/qcom/common.h
 @@ -0,0 +1,34 @@
@@ -179,8 +171,6 @@ index 0000000..2c3cfc8
 +extern void qcom_cc_remove(struct platform_device *pdev);
 +
 +#endif
-diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c
-index bc0b7f1..44bc6fa 100644
 --- a/drivers/clk/qcom/gcc-msm8660.c
 +++ b/drivers/clk/qcom/gcc-msm8660.c
 @@ -25,6 +25,7 @@
@@ -191,7 +181,7 @@ index bc0b7f1..44bc6fa 100644
  #include "clk-regmap.h"
  #include "clk-pll.h"
  #include "clk-rcg.h"
-@@ -2701,94 +2702,28 @@ static const struct regmap_config gcc_msm8660_regmap_config = {
+@@ -2701,94 +2702,28 @@ static const struct regmap_config gcc_ms
        .fast_io        = true,
  };
  
@@ -296,8 +286,6 @@ index bc0b7f1..44bc6fa 100644
        return 0;
  }
  
-diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
-index fd446ab..633b019 100644
 --- a/drivers/clk/qcom/gcc-msm8960.c
 +++ b/drivers/clk/qcom/gcc-msm8960.c
 @@ -25,6 +25,7 @@
@@ -308,7 +296,7 @@ index fd446ab..633b019 100644
  #include "clk-regmap.h"
  #include "clk-pll.h"
  #include "clk-rcg.h"
-@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_msm8960_regmap_config = {
+@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_ms
        .fast_io        = true,
  };
  
@@ -369,7 +357,7 @@ index fd446ab..633b019 100644
  
        /* Temporary until RPM clocks supported */
        clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
-@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct platform_device *pdev)
+@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct plat
        if (IS_ERR(clk))
                return PTR_ERR(clk);
  
@@ -411,8 +399,6 @@ index fd446ab..633b019 100644
        return 0;
  }
  
-diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c
-index 51d457e..0d1edc1 100644
 --- a/drivers/clk/qcom/gcc-msm8974.c
 +++ b/drivers/clk/qcom/gcc-msm8974.c
 @@ -25,6 +25,7 @@
@@ -423,7 +409,7 @@ index 51d457e..0d1edc1 100644
  #include "clk-regmap.h"
  #include "clk-pll.h"
  #include "clk-rcg.h"
-@@ -2574,51 +2575,24 @@ static const struct regmap_config gcc_msm8974_regmap_config = {
+@@ -2574,51 +2575,24 @@ static const struct regmap_config gcc_ms
        .fast_io        = true,
  };
  
@@ -484,7 +470,7 @@ index 51d457e..0d1edc1 100644
  
        /* Temporary until RPM clocks supported */
        clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000);
-@@ -2631,39 +2605,12 @@ static int gcc_msm8974_probe(struct platform_device *pdev)
+@@ -2631,39 +2605,12 @@ static int gcc_msm8974_probe(struct plat
        if (IS_ERR(clk))
                return PTR_ERR(clk);
  
@@ -526,8 +512,6 @@ index 51d457e..0d1edc1 100644
        return 0;
  }
  
-diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c
-index f9b59c7..12f3c0b 100644
 --- a/drivers/clk/qcom/mmcc-msm8960.c
 +++ b/drivers/clk/qcom/mmcc-msm8960.c
 @@ -26,6 +26,7 @@
@@ -538,7 +522,7 @@ index f9b59c7..12f3c0b 100644
  #include "clk-regmap.h"
  #include "clk-pll.h"
  #include "clk-rcg.h"
-@@ -2222,85 +2223,28 @@ static const struct regmap_config mmcc_msm8960_regmap_config = {
+@@ -2222,85 +2223,28 @@ static const struct regmap_config mmcc_m
        .fast_io        = true,
  };
  
@@ -634,8 +618,6 @@ index f9b59c7..12f3c0b 100644
        return 0;
  }
  
-diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c
-index c957745..60b7c24 100644
 --- a/drivers/clk/qcom/mmcc-msm8974.c
 +++ b/drivers/clk/qcom/mmcc-msm8974.c
 @@ -25,6 +25,7 @@
@@ -646,7 +628,7 @@ index c957745..60b7c24 100644
  #include "clk-regmap.h"
  #include "clk-pll.h"
  #include "clk-rcg.h"
-@@ -2524,88 +2525,39 @@ static const struct regmap_config mmcc_msm8974_regmap_config = {
+@@ -2527,88 +2528,39 @@ static const struct regmap_config mmcc_m
        .fast_io        = true,
  };
  
@@ -750,6 +732,3 @@ index c957745..60b7c24 100644
        return 0;
  }
  
--- 
-1.7.10.4
-