target/linux/ipq806x/patches-4.9/311-add-rpmcc-for-ipq806x.patch

   1 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
   2 +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
   3 @@ -12,6 +12,7 @@ Required properties :
   4
   5                         "qcom,rpmcc-msm8916", "qcom,rpmcc"
   6                         "qcom,rpmcc-apq8064", "qcom,rpmcc"
   7 +                       "qcom,rpmcc-ipq806x", "qcom,rpmcc"
   8
   9  - #clock-cells : shall contain 1
  10
  11 --- a/drivers/clk/qcom/clk-rpm.c
  12 +++ b/drivers/clk/qcom/clk-rpm.c
  13 @@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a
  14  DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  15  DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK);
  16
  17 +/* ipq806x */
  18 +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
  19 +DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);
  20 +DEFINE_CLK_RPM(ipq806x, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK);
  21 +DEFINE_CLK_RPM(ipq806x, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK);
  22 +DEFINE_CLK_RPM(ipq806x, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
  23 +DEFINE_CLK_RPM(ipq806x, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
  24 +DEFINE_CLK_RPM(ipq806x, nss_fabric_0_clk, nss_fabric_0_a_clk, QCOM_RPM_NSS_FABRIC_0_CLK);
  25 +DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK);
  26 +
  27  static struct clk_rpm *apq8064_clks[] = {
  28         [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
  29         [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
  30 @@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] =
  31         [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk,
  32  };
  33
  34 +static struct clk_rpm *ipq806x_clks[] = {
  35 +       [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk,
  36 +       [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk,
  37 +       [RPM_CFPB_CLK] = &ipq806x_cfpb_clk,
  38 +       [RPM_CFPB_A_CLK] = &ipq806x_cfpb_a_clk,
  39 +       [RPM_DAYTONA_FABRIC_CLK] = &ipq806x_daytona_clk,
  40 +       [RPM_DAYTONA_FABRIC_A_CLK] = &ipq806x_daytona_a_clk,
  41 +       [RPM_EBI1_CLK] = &ipq806x_ebi1_clk,
  42 +       [RPM_EBI1_A_CLK] = &ipq806x_ebi1_a_clk,
  43 +       [RPM_SYS_FABRIC_CLK] = &ipq806x_sfab_clk,
  44 +       [RPM_SYS_FABRIC_A_CLK] = &ipq806x_sfab_a_clk,
  45 +       [RPM_SFPB_CLK] = &ipq806x_sfpb_clk,
  46 +       [RPM_SFPB_A_CLK] = &ipq806x_sfpb_a_clk,
  47 +       [RPM_NSS_FABRIC_0_CLK] = &ipq806x_nss_fabric_0_clk,
  48 +       [RPM_NSS_FABRIC_0_A_CLK] = &ipq806x_nss_fabric_0_a_clk,
  49 +       [RPM_NSS_FABRIC_1_CLK] = &ipq806x_nss_fabric_1_clk,
  50 +       [RPM_NSS_FABRIC_1_A_CLK] = &ipq806x_nss_fabric_1_a_clk,
  51 +};
  52 +
  53  static const struct rpm_clk_desc rpm_clk_apq8064 = {
  54         .clks = apq8064_clks,
  55         .num_clks = ARRAY_SIZE(apq8064_clks),
  56  };
  57
  58 +static const struct rpm_clk_desc rpm_clk_ipq806x = {
  59 +       .clks = ipq806x_clks,
  60 +       .num_clks = ARRAY_SIZE(ipq806x_clks),
  61 +};
  62 +
  63  static const struct of_device_id rpm_clk_match_table[] = {
  64         { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
  65 +       { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x },
  66         { }
  67  };
  68  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
  69 --- a/include/dt-bindings/clock/qcom,rpmcc.h
  70 +++ b/include/dt-bindings/clock/qcom,rpmcc.h
  71 @@ -37,6 +37,10 @@
  72  #define RPM_SYS_FABRIC_A_CLK                   19
  73  #define RPM_SFPB_CLK                           20
  74  #define RPM_SFPB_A_CLK                         21
  75 +#define RPM_NSS_FABRIC_0_CLK                           22
  76 +#define RPM_NSS_FABRIC_0_A_CLK                         23
  77 +#define RPM_NSS_FABRIC_1_CLK                           24
  78 +#define RPM_NSS_FABRIC_1_A_CLK                         25
  79
  80  /* msm8916 */
  81  #define RPM_SMD_XO_CLK_SRC                             0