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