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>
This commit is contained in:
Hannu Nyman 2016-11-17 14:02:57 +02:00 committed by Stijn Tintel
parent d723f2573a
commit 8459d85fa3
14 changed files with 25 additions and 50 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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";
};
};

View file

@ -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>,

View file

@ -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>;
};

View file

@ -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>;

View file

@ -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";
};

View file

@ -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";
};

View file

@ -8,7 +8,7 @@
};
qcom,l2 {
@@ -276,17 +277,28 @@
@@ -277,17 +278,28 @@
};
saw0: regulator@2089000 {

View file

@ -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 @@

View file

@ -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 @@

View file

@ -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 @@

View file

@ -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";
};