ipq806x: refresh patches

This patch refreshes the ipq806x kernel patches.

There was a large PR for ipq806x in the queue when the kernel patches
were refreshed for 4.4.32, so currently there is quite much fuzz for
ipq806x.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/target/linux/ipq806x/patches-4.4/003-mv-cxo-pxo-xo-into-DT.patch b/target/linux/ipq806x/patches-4.4/003-mv-cxo-pxo-xo-into-DT.patch
index 60505e100bdf29c932174821e1352366decfe260..4932e702a23bba4f52d5814e0af88bcadcd39510 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/003-mv-cxo-pxo-xo-into-DT.patch
+++ b/target/linux/ipq806x/patches-4.4/003-mv-cxo-pxo-xo-into-DT.patch
@@ -21,11 +21,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  drivers/clk/qcom/gcc-msm8974.c | 17 +++++++----------
  5 files changed, 33 insertions(+), 43 deletions(-)
 
-diff --git a/drivers/clk/qcom/gcc-apq8084.c b/drivers/clk/qcom/gcc-apq8084.c
-index 1567c3a..070037a 100644
 --- a/drivers/clk/qcom/gcc-apq8084.c
 +++ b/drivers/clk/qcom/gcc-apq8084.c
-@@ -3607,18 +3607,16 @@ MODULE_DEVICE_TABLE(of, gcc_apq8084_match_table);
+@@ -3607,18 +3607,16 @@ MODULE_DEVICE_TABLE(of, gcc_apq8084_matc
  
  static int gcc_apq8084_probe(struct platform_device *pdev)
  {
@@ -51,11 +49,9 @@ index 1567c3a..070037a 100644
  
        return qcom_cc_probe(pdev, &gcc_apq8084_desc);
  }
-diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
-index 16fc64c..dd5402b 100644
 --- a/drivers/clk/qcom/gcc-ipq806x.c
 +++ b/drivers/clk/qcom/gcc-ipq806x.c
-@@ -3023,19 +3023,17 @@ MODULE_DEVICE_TABLE(of, gcc_ipq806x_match_table);
+@@ -3023,19 +3023,17 @@ MODULE_DEVICE_TABLE(of, gcc_ipq806x_matc
  
  static int gcc_ipq806x_probe(struct platform_device *pdev)
  {
@@ -81,11 +77,9 @@ index 16fc64c..dd5402b 100644
  
        ret = qcom_cc_probe(pdev, &gcc_ipq806x_desc);
        if (ret)
-diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c
-index f110bb5..ad41303 100644
 --- a/drivers/clk/qcom/gcc-msm8660.c
 +++ b/drivers/clk/qcom/gcc-msm8660.c
-@@ -2720,17 +2720,16 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_match_table);
+@@ -2720,17 +2720,16 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_matc
  
  static int gcc_msm8660_probe(struct platform_device *pdev)
  {
@@ -110,11 +104,9 @@ index f110bb5..ad41303 100644
  
        return qcom_cc_probe(pdev, &gcc_msm8660_desc);
  }
-diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
-index 66c18bc..983dd7d 100644
 --- a/drivers/clk/qcom/gcc-msm8960.c
 +++ b/drivers/clk/qcom/gcc-msm8960.c
-@@ -3503,7 +3503,6 @@ MODULE_DEVICE_TABLE(of, gcc_msm8960_match_table);
+@@ -3503,7 +3503,6 @@ MODULE_DEVICE_TABLE(of, gcc_msm8960_matc
  
  static int gcc_msm8960_probe(struct platform_device *pdev)
  {
@@ -122,7 +114,7 @@ index 66c18bc..983dd7d 100644
        struct device *dev = &pdev->dev;
        const struct of_device_id *match;
        struct platform_device *tsens;
-@@ -3513,14 +3512,13 @@ static int gcc_msm8960_probe(struct platform_device *pdev)
+@@ -3513,14 +3512,13 @@ static int gcc_msm8960_probe(struct plat
        if (!match)
                return -EINVAL;
  
@@ -143,11 +135,9 @@ index 66c18bc..983dd7d 100644
  
        ret = qcom_cc_probe(pdev, match->data);
        if (ret)
-diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c
-index 28abb8f..335952d 100644
 --- a/drivers/clk/qcom/gcc-msm8974.c
 +++ b/drivers/clk/qcom/gcc-msm8974.c
-@@ -2717,7 +2717,7 @@ static void msm8974_pro_clock_override(void)
+@@ -2717,7 +2717,7 @@ static void msm8974_pro_clock_override(v
  
  static int gcc_msm8974_probe(struct platform_device *pdev)
  {
@@ -156,7 +146,7 @@ index 28abb8f..335952d 100644
        struct device *dev = &pdev->dev;
        bool pro;
        const struct of_device_id *id;
-@@ -2730,16 +2730,13 @@ static int gcc_msm8974_probe(struct platform_device *pdev)
+@@ -2730,16 +2730,13 @@ static int gcc_msm8974_probe(struct plat
        if (pro)
                msm8974_pro_clock_override();
  
@@ -164,20 +154,19 @@ index 28abb8f..335952d 100644
 -      clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000);
 -      if (IS_ERR(clk))
 -              return PTR_ERR(clk);
-+      ret = qcom_cc_register_board_clk(dev, "xo_board", "xo", 19200000);
-+      if (ret)
-+              return ret;
- 
+-
 -      /* Should move to DT node? */
 -      clk = clk_register_fixed_rate(dev, "sleep_clk_src", NULL,
 -                                    CLK_IS_ROOT, 32768);
 -      if (IS_ERR(clk))
 -              return PTR_ERR(clk);
++      ret = qcom_cc_register_board_clk(dev, "xo_board", "xo", 19200000);
++      if (ret)
++              return ret;
++
 +      ret = qcom_cc_register_sleep_clk(dev);
 +      if (ret)
 +              return ret;
  
        return qcom_cc_probe(pdev, &gcc_msm8974_desc);
  }
--- 
-cgit v0.12

diff --git a/target/linux/ipq806x/patches-4.4/005-mfd-qcom_rpm-Add-missing-of_node_put-after-calling-of_parse_phandle.patch b/target/linux/ipq806x/patches-4.4/005-mfd-qcom_rpm-Add-missing-of_node_put-after-calling-of_parse_phandle.patch
index c80bbd5a01c0a51ffc729ac13b8d0dc06ff260af..b3cef7b3fd3bf199dc29e7c0fb94575388e06bf5 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/005-mfd-qcom_rpm-Add-missing-of_node_put-after-calling-of_parse_phandle.patch
+++ b/target/linux/ipq806x/patches-4.4/005-mfd-qcom_rpm-Add-missing-of_node_put-after-calling-of_parse_phandle.patch
@@ -13,11 +13,9 @@ Signed-off-by: Lee Jones <lee.jones@linaro.org>
  drivers/mfd/qcom_rpm.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
-index a74210d..d330071 100644
 --- a/drivers/mfd/qcom_rpm.c
 +++ b/drivers/mfd/qcom_rpm.c
-@@ -589,6 +589,7 @@ static int qcom_rpm_probe(struct platform_device *pdev)
+@@ -538,6 +538,7 @@ static int qcom_rpm_probe(struct platfor
        }
  
        rpm->ipc_regmap = syscon_node_to_regmap(syscon_np);
@@ -25,5 +23,3 @@ index a74210d..d330071 100644
        if (IS_ERR(rpm->ipc_regmap))
                return PTR_ERR(rpm->ipc_regmap);
  
--- 
-cgit v0.12

diff --git a/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch b/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch
index 01168bbb121a7e1e102f7e83db1f74b1771bd459..96b768d97cfe5f23ff9de7c50f87767a86b2d848 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch
+++ b/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch
@@ -37,8 +37,6 @@ Signed-off-by: Lee Jones <lee.jones@linaro.org>
  drivers/mfd/qcom_rpm.c | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
-index d330071..52fafea 100644
 --- a/drivers/mfd/qcom_rpm.c
 +++ b/drivers/mfd/qcom_rpm.c
 @@ -21,6 +21,7 @@
@@ -57,7 +55,7 @@ index d330071..52fafea 100644
  
        struct completion ack;
        struct mutex lock;
-@@ -552,6 +554,20 @@ static int qcom_rpm_probe(struct platform_device *pdev)
+@@ -503,6 +505,20 @@ static int qcom_rpm_probe(struct platfor
        mutex_init(&rpm->lock);
        init_completion(&rpm->ack);
  
@@ -78,7 +76,7 @@ index d330071..52fafea 100644
        irq_ack = platform_get_irq_byname(pdev, "ack");
        if (irq_ack < 0) {
                dev_err(&pdev->dev, "required ack interrupt missing\n");
-@@ -672,7 +688,11 @@ static int qcom_rpm_probe(struct platform_device *pdev)
+@@ -621,7 +637,11 @@ static int qcom_rpm_probe(struct platfor
  
  static int qcom_rpm_remove(struct platform_device *pdev)
  {
@@ -90,5 +88,3 @@ index d330071..52fafea 100644
        return 0;
  }
  
--- 
-cgit v0.12

diff --git a/target/linux/ipq806x/patches-4.4/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.4/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch
index 31a384f499be66e87cd4164da73a716159f84445..ff17370c00179638c2e131a847389fcc6288b8b6 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch
+++ b/target/linux/ipq806x/patches-4.4/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch
@@ -98,7 +98,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                intc: interrupt-controller@2000000 {
-@@ -417,6 +447,144 @@
+@@ -417,6 +448,144 @@
                                dr_mode = "host";
                        };
                };

diff --git a/target/linux/ipq806x/patches-4.4/115-add-pcie-aux-clk-dts.patch b/target/linux/ipq806x/patches-4.4/115-add-pcie-aux-clk-dts.patch
index 8ceace9523ad1ad738bd8ec1f095eae0a718ee97..af6e21559655f1aefeb782c434bd6d5bb3709d5f 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/115-add-pcie-aux-clk-dts.patch
+++ b/target/linux/ipq806x/patches-4.4/115-add-pcie-aux-clk-dts.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -476,15 +476,21 @@
+@@ -477,15 +477,21 @@
  
                        clocks = <&gcc PCIE_A_CLK>,
                                 <&gcc PCIE_H_CLK>,
@@ -26,7 +26,7 @@
  
                        pinctrl-0 = <&pcie0_pins>;
                        pinctrl-names = "default";
-@@ -522,15 +528,21 @@
+@@ -523,15 +529,21 @@
  
                        clocks = <&gcc PCIE_1_A_CLK>,
                                 <&gcc PCIE_1_H_CLK>,
@@ -52,7 +52,7 @@
  
                        pinctrl-0 = <&pcie1_pins>;
                        pinctrl-names = "default";
-@@ -568,15 +580,21 @@
+@@ -569,15 +581,21 @@
  
                        clocks = <&gcc PCIE_2_A_CLK>,
                                 <&gcc PCIE_2_H_CLK>,

diff --git a/target/linux/ipq806x/patches-4.4/126-add-rpm-to-ipq8064-dts.patch b/target/linux/ipq806x/patches-4.4/126-add-rpm-to-ipq8064-dts.patch
index 7daa93163bd108f721f32baf7f099dc62a42679c..6e589d26ae054dabadbb2d51927d148e340a15d1 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/126-add-rpm-to-ipq8064-dts.patch
+++ b/target/linux/ipq806x/patches-4.4/126-add-rpm-to-ipq8064-dts.patch
@@ -72,7 +72,7 @@
                qcom_pinmux: pinmux@800000 {
                        compatible = "qcom,ipq8064-pinctrl";
                        reg = <0x800000 0x4000>;
-@@ -164,6 +222,12 @@
+@@ -165,6 +223,12 @@
                        reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
                };
  

diff --git a/target/linux/ipq806x/patches-4.4/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch b/target/linux/ipq806x/patches-4.4/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
index 6ca3c62e4e724c3e6ec4c3042560aa7bfbd68f29..45870c436aee73d7664a4d2834fae0f2a2620302 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
+++ b/target/linux/ipq806x/patches-4.4/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
@@ -80,7 +80,7 @@
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
-@@ -215,11 +268,13 @@
+@@ -216,11 +269,13 @@
                acc0: clock-controller@2088000 {
                        compatible = "qcom,kpss-acc-v1";
                        reg = <0x02088000 0x1000>, <0x02008000 0x1000>;

diff --git a/target/linux/ipq806x/patches-4.4/157-ARM-DT-ipq8064-Add-ADM-device-node.patch b/target/linux/ipq806x/patches-4.4/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
index 5fc2a3da551402d8b7674c3e152c42eee0b2907c..3c3212b26df5370e2b8da3431d56b89df10ca90e 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
+++ b/target/linux/ipq806x/patches-4.4/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
@@ -13,7 +13,7 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -722,6 +722,26 @@
+@@ -723,6 +723,26 @@
  
                        status = "disabled";
                };

diff --git a/target/linux/ipq806x/patches-4.4/164-arm-qcom-dts-Add-NAND-controller-node-for-ipq806x.patch b/target/linux/ipq806x/patches-4.4/164-arm-qcom-dts-Add-NAND-controller-node-for-ipq806x.patch
index bd8c7e752c00847cbfeab6654a22d27b2ae73260..27662d0552f0d5c518948bab24bf5cc6a5409ea9 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/164-arm-qcom-dts-Add-NAND-controller-node-for-ipq806x.patch
+++ b/target/linux/ipq806x/patches-4.4/164-arm-qcom-dts-Add-NAND-controller-node-for-ipq806x.patch
@@ -26,7 +26,7 @@ arch/arm/boot/dts/qcom-ipq8064.dtsi | 15 +++++++++++++++
 
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -742,6 +742,22 @@
+@@ -743,6 +743,22 @@
  
                        status = "disabled";
                };

diff --git a/target/linux/ipq806x/patches-4.4/303-add-saw_l2-and-sns-into-ipq8064-DT.patch b/target/linux/ipq806x/patches-4.4/303-add-saw_l2-and-sns-into-ipq8064-DT.patch
index d4f6c68a7434d5961ce1fd4cfa8c951733eb9145..f7ea6fd252f50b1414db4dcfa5e816ed728fabf7 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/303-add-saw_l2-and-sns-into-ipq8064-DT.patch
+++ b/target/linux/ipq806x/patches-4.4/303-add-saw_l2-and-sns-into-ipq8064-DT.patch
@@ -8,7 +8,7 @@
                };
  
                qcom,l2 {
-@@ -276,17 +277,28 @@
+@@ -277,17 +278,28 @@
                };
  
                saw0: regulator@2089000 {

diff --git a/target/linux/ipq806x/patches-4.4/304-add-cpu-idle-state-into-ipq8064-DT.patch b/target/linux/ipq806x/patches-4.4/304-add-cpu-idle-state-into-ipq8064-DT.patch
index 9a8795a3aebebfb254fc618f196c7215b0de9545..42b37ca2c23235ef1d88aaa8768db74a28e75c9f 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/304-add-cpu-idle-state-into-ipq8064-DT.patch
+++ b/target/linux/ipq806x/patches-4.4/304-add-cpu-idle-state-into-ipq8064-DT.patch
@@ -8,8 +8,6 @@ Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
  arch/arm/boot/dts/qcom-ipq8064.dtsi | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index cb9c41d..8c989c0 100644
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -18,7 +18,7 @@

diff --git a/target/linux/ipq806x/patches-4.4/305-add-board-clocks-and-rpmcc-into-DT.patch b/target/linux/ipq806x/patches-4.4/305-add-board-clocks-and-rpmcc-into-DT.patch
index d8bbcf057cee0ce2b110bd1997b6be4c18fa44d7..be45895824064270f8bb6c89165aa7ef4db926e5 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/305-add-board-clocks-and-rpmcc-into-DT.patch
+++ b/target/linux/ipq806x/patches-4.4/305-add-board-clocks-and-rpmcc-into-DT.patch
@@ -8,8 +8,6 @@ Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
  arch/arm/boot/dts/qcom-ipq8064.dtsi | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index 8c989c0..6b06118 100644
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -92,6 +92,18 @@

diff --git a/target/linux/ipq806x/patches-4.4/306-add-RPM-msg-RAM-into-DT.patch b/target/linux/ipq806x/patches-4.4/306-add-RPM-msg-RAM-into-DT.patch
index 60cfac974cf2a81af31e610acd7154626c0803a7..005f980ebae27b5daec8f7a522a8a44345232e14 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/306-add-RPM-msg-RAM-into-DT.patch
+++ b/target/linux/ipq806x/patches-4.4/306-add-RPM-msg-RAM-into-DT.patch
@@ -8,8 +8,6 @@ Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
  arch/arm/boot/dts/qcom-ipq8064.dtsi | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index 6b06118..d1ff9d0 100644
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -184,6 +184,9 @@

diff --git a/target/linux/ipq806x/patches-4.4/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.4/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
index dcdec6660395a2f4eaf3f8e980839222fb639451..4a0528885fafd98cf7729d95c6d112be866ca295 100644 (file)
--- a/target/linux/ipq806x/patches-4.4/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
+++ b/target/linux/ipq806x/patches-4.4/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
@@ -121,7 +121,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
  };
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -762,6 +762,92 @@
+@@ -795,6 +795,92 @@
  
                        status = "disabled";
                };