target/linux/ipq806x/patches-5.4/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 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
  14 +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
  15 @@ -16,6 +16,7 @@ Required properties :
  16                         "qcom,rpmcc-msm8974", "qcom,rpmcc"
  17                         "qcom,rpmcc-apq8064", "qcom,rpmcc"
  18                         "qcom,rpmcc-msm8996", "qcom,rpmcc"
  19 +                       "qcom,rpmcc-ipq806x", "qcom,rpmcc"
  20                         "qcom,rpmcc-msm8998", "qcom,rpmcc"
  21                         "qcom,rpmcc-qcs404", "qcom,rpmcc"
  22
  23 --- a/include/dt-bindings/clock/qcom,rpmcc.h
  24 +++ b/include/dt-bindings/clock/qcom,rpmcc.h
  25 @@ -37,6 +37,10 @@
  26  #define RPM_XO_A0                              27
  27  #define RPM_XO_A1                              28
  28  #define RPM_XO_A2                              29
  29 +#define RPM_NSS_FABRIC_0_CLK                   30
  30 +#define RPM_NSS_FABRIC_0_A_CLK                 31
  31 +#define RPM_NSS_FABRIC_1_CLK                   32
  32 +#define RPM_NSS_FABRIC_1_A_CLK                 33
  33
  34  /* SMD RPM clocks */
  35  #define RPM_SMD_XO_CLK_SRC                             0
  36 --- a/drivers/clk/qcom/clk-rpm.c
  37 +++ b/drivers/clk/qcom/clk-rpm.c
  38 @@ -512,6 +512,16 @@ DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a0_
  39  DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a1_clk, xo_a1_a_clk, 24);
  40  DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a2_clk, xo_a2_a_clk, 28);
  41
  42 +/* ipq806x */
  43 +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
  44 +DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);
  45 +DEFINE_CLK_RPM(ipq806x, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK);
  46 +DEFINE_CLK_RPM(ipq806x, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK);
  47 +DEFINE_CLK_RPM(ipq806x, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
  48 +DEFINE_CLK_RPM(ipq806x, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  49 +DEFINE_CLK_RPM(ipq806x, nss_fabric_0_clk, nss_fabric_0_a_clk, QCOM_RPM_NSS_FABRIC_0_CLK);
  50 +DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK);
  51 +
  52  static struct clk_rpm *apq8064_clks[] = {
  53         [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
  54         [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
  55 @@ -538,15 +548,40 @@ static struct clk_rpm *apq8064_clks[] =
  56         [RPM_XO_A2] = &apq8064_xo_a2_clk,
  57  };
  58
  59 +static struct clk_rpm *ipq806x_clks[] = {
  60 +       [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk,
  61 +       [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk,
  62 +       [RPM_CFPB_CLK] = &ipq806x_cfpb_clk,
  63 +       [RPM_CFPB_A_CLK] = &ipq806x_cfpb_a_clk,
  64 +       [RPM_DAYTONA_FABRIC_CLK] = &ipq806x_daytona_clk,
  65 +       [RPM_DAYTONA_FABRIC_A_CLK] = &ipq806x_daytona_a_clk,
  66 +       [RPM_EBI1_CLK] = &ipq806x_ebi1_clk,
  67 +       [RPM_EBI1_A_CLK] = &ipq806x_ebi1_a_clk,
  68 +       [RPM_SYS_FABRIC_CLK] = &ipq806x_sfab_clk,
  69 +       [RPM_SYS_FABRIC_A_CLK] = &ipq806x_sfab_a_clk,
  70 +       [RPM_SFPB_CLK] = &ipq806x_sfpb_clk,
  71 +       [RPM_SFPB_A_CLK] = &ipq806x_sfpb_a_clk,
  72 +       [RPM_NSS_FABRIC_0_CLK] = &ipq806x_nss_fabric_0_clk,
  73 +       [RPM_NSS_FABRIC_0_A_CLK] = &ipq806x_nss_fabric_0_a_clk,
  74 +       [RPM_NSS_FABRIC_1_CLK] = &ipq806x_nss_fabric_1_clk,
  75 +       [RPM_NSS_FABRIC_1_A_CLK] = &ipq806x_nss_fabric_1_a_clk,
  76 +};
  77 +
  78  static const struct rpm_clk_desc rpm_clk_apq8064 = {
  79         .clks = apq8064_clks,
  80         .num_clks = ARRAY_SIZE(apq8064_clks),
  81  };
  82
  83 +static const struct rpm_clk_desc rpm_clk_ipq806x = {
  84 +       .clks = ipq806x_clks,
  85 +       .num_clks = ARRAY_SIZE(ipq806x_clks),
  86 +};
  87 +
  88  static const struct of_device_id rpm_clk_match_table[] = {
  89         { .compatible = "qcom,rpmcc-msm8660", .data = &rpm_clk_msm8660 },
  90         { .compatible = "qcom,rpmcc-apq8060", .data = &rpm_clk_msm8660 },
  91         { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
  92 +       { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x },
  93         { }
  94  };
  95  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);