target/linux/ipq806x/patches-4.9/0064-clk-clk-rpm-fixes.patch

   1 From d30840e2b1cf79d90392e6051b0c0b6006d29d8b Mon Sep 17 00:00:00 2001
   2 From: John Crispin <john@phrozen.org>
   3 Date: Thu, 9 Mar 2017 09:32:40 +0100
   4 Subject: [PATCH 64/69] clk: clk-rpm fixes
   5
   6 Signed-off-by: John Crispin <john@phrozen.org>
   7 ---
   8  .../devicetree/bindings/clock/qcom,rpmcc.txt       |  1 +
   9  drivers/clk/qcom/clk-rpm.c                         | 35 ++++++++++++++++++++++
  10  include/dt-bindings/clock/qcom,rpmcc.h             |  4 +++
  11  3 files changed, 40 insertions(+)
  12
  13 diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
  14 index 87d3714b956a..94899339a26b 100644
  15 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
  16 +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
  17 @@ -12,6 +12,7 @@ Required properties :
  18
  19                         "qcom,rpmcc-msm8916", "qcom,rpmcc"
  20                         "qcom,rpmcc-apq8064", "qcom,rpmcc"
  21 +                       "qcom,rpmcc-ipq806x", "qcom,rpmcc"
  22
  23  - #clock-cells : shall contain 1
  24
  25 diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c
  26 index df3e5fe8442a..17622365157f 100644
  27 --- a/drivers/clk/qcom/clk-rpm.c
  28 +++ b/drivers/clk/qcom/clk-rpm.c
  29 @@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
  30  DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  31  DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK);
  32
  33 +/* ipq806x */
  34 +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
  35 +DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);
  36 +DEFINE_CLK_RPM(ipq806x, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK);
  37 +DEFINE_CLK_RPM(ipq806x, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK);
  38 +DEFINE_CLK_RPM(ipq806x, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
  39 +DEFINE_CLK_RPM(ipq806x, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  40 +DEFINE_CLK_RPM(ipq806x, nss_fabric_0_clk, nss_fabric_0_a_clk, QCOM_RPM_NSS_FABRIC_0_CLK);
  41 +DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK);
  42 +
  43  static struct clk_rpm *apq8064_clks[] = {
  44         [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
  45         [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
  46 @@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] = {
  47         [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk,
  48  };
  49
  50 +static struct clk_rpm *ipq806x_clks[] = {
  51 +       [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk,
  52 +       [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk,
  53 +       [RPM_CFPB_CLK] = &ipq806x_cfpb_clk,
  54 +       [RPM_CFPB_A_CLK] = &ipq806x_cfpb_a_clk,
  55 +       [RPM_DAYTONA_FABRIC_CLK] = &ipq806x_daytona_clk,
  56 +       [RPM_DAYTONA_FABRIC_A_CLK] = &ipq806x_daytona_a_clk,
  57 +       [RPM_EBI1_CLK] = &ipq806x_ebi1_clk,
  58 +       [RPM_EBI1_A_CLK] = &ipq806x_ebi1_a_clk,
  59 +       [RPM_SYS_FABRIC_CLK] = &ipq806x_sfab_clk,
  60 +       [RPM_SYS_FABRIC_A_CLK] = &ipq806x_sfab_a_clk,
  61 +       [RPM_SFPB_CLK] = &ipq806x_sfpb_clk,
  62 +       [RPM_SFPB_A_CLK] = &ipq806x_sfpb_a_clk,
  63 +       [RPM_NSS_FABRIC_0_CLK] = &ipq806x_nss_fabric_0_clk,
  64 +       [RPM_NSS_FABRIC_0_A_CLK] = &ipq806x_nss_fabric_0_a_clk,
  65 +       [RPM_NSS_FABRIC_1_CLK] = &ipq806x_nss_fabric_1_clk,
  66 +       [RPM_NSS_FABRIC_1_A_CLK] = &ipq806x_nss_fabric_1_a_clk,
  67 +};
  68 +
  69  static const struct rpm_clk_desc rpm_clk_apq8064 = {
  70         .clks = apq8064_clks,
  71         .num_clks = ARRAY_SIZE(apq8064_clks),
  72  };
  73
  74 +static const struct rpm_clk_desc rpm_clk_ipq806x = {
  75 +       .clks = ipq806x_clks,
  76 +       .num_clks = ARRAY_SIZE(ipq806x_clks),
  77 +};
  78 +
  79  static const struct of_device_id rpm_clk_match_table[] = {
  80         { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
  81 +       { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x },
  82         { }
  83  };
  84  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
  85 diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h
  86 index 5924cdb71336..7390308d3536 100644
  87 --- a/include/dt-bindings/clock/qcom,rpmcc.h
  88 +++ b/include/dt-bindings/clock/qcom,rpmcc.h
  89 @@ -37,6 +37,10 @@
  90  #define RPM_SYS_FABRIC_A_CLK                   19
  91  #define RPM_SFPB_CLK                           20
  92  #define RPM_SFPB_A_CLK                         21
  93 +#define RPM_NSS_FABRIC_0_CLK                           22
  94 +#define RPM_NSS_FABRIC_0_A_CLK                         23
  95 +#define RPM_NSS_FABRIC_1_CLK                           24
  96 +#define RPM_NSS_FABRIC_1_A_CLK                         25
  97
  98  /* msm8916 */
  99  #define RPM_SMD_XO_CLK_SRC                             0
 100 --
 101 2.11.0
 102