kernel: bump 4.14 to 4.14.48 for 18.06

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0064-clk-clk-rpm-fixes.patch

diff --git a/target/linux/ipq806x/patches-4.14/0064-clk-clk-rpm-fixes.patch b/target/linux/ipq806x/patches-4.14/0064-clk-clk-rpm-fixes.patch
index 8a6bc1aca92b71859698d15f269d1e49afc3b050..167278a7015d48f485f8d18ed73b40b342d6e441 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0064-clk-clk-rpm-fixes.patch
+++ b/target/linux/ipq806x/patches-4.14/0064-clk-clk-rpm-fixes.patch
@@ -13,19 +13,19 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
 +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
 @@ -13,6 +13,7 @@ Required properties :
-                       "qcom,rpmcc-msm8916", "qcom,rpmcc"
-                       "qcom,rpmcc-msm8974", "qcom,rpmcc"
-                       "qcom,rpmcc-apq8064", "qcom,rpmcc"
+                       "qcom,rpmcc-msm8916", "qcom,rpmcc"
+                       "qcom,rpmcc-msm8974", "qcom,rpmcc"
+                       "qcom,rpmcc-apq8064", "qcom,rpmcc"
 +                      "qcom,rpmcc-ipq806x", "qcom,rpmcc"
-
+ 
  - #clock-cells : shall contain 1
-
+ 
 --- a/drivers/clk/qcom/clk-rpm.c
 +++ b/drivers/clk/qcom/clk-rpm.c
 @@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a
  DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK);
-
+ 
 +/* ipq806x */
 +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
 +DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);
@@ -37,12 +37,12 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK);
 +
  static struct clk_rpm *apq8064_clks[] = {
-       [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
-       [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
+       [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
+       [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
 @@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] =
-       [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk,
+       [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk,
  };
-
+ 
 +static struct clk_rpm *ipq806x_clks[] = {
 +      [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk,
 +      [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk,
@@ -63,19 +63,19 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +};
 +
  static const struct rpm_clk_desc rpm_clk_apq8064 = {
-       .clks = apq8064_clks,
-       .num_clks = ARRAY_SIZE(apq8064_clks),
+       .clks = apq8064_clks,
+       .num_clks = ARRAY_SIZE(apq8064_clks),
  };
-
+ 
 +static const struct rpm_clk_desc rpm_clk_ipq806x = {
 +      .clks = ipq806x_clks,
 +      .num_clks = ARRAY_SIZE(ipq806x_clks),
 +};
 +
  static const struct of_device_id rpm_clk_match_table[] = {
-       { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
+       { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
 +      { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x },
-       { }
+       { }
  };
  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
 --- a/include/dt-bindings/clock/qcom,rpmcc.h
@@ -88,6 +88,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +#define RPM_NSS_FABRIC_0_A_CLK                                23
 +#define RPM_NSS_FABRIC_1_CLK                          24
 +#define RPM_NSS_FABRIC_1_A_CLK                                25
-
+ 
  /* SMD RPM clocks */
  #define RPM_SMD_XO_CLK_SRC                            0