diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:42 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:42 -0800 |
commit | 8f620400861a313cfb59a43651a92f815de0da93 (patch) | |
tree | cef912db5cf7b7c17bb6e6d40ca51fa8cfe6575d /include | |
parent | 7a103f02250092df7f25e2a41917e02bf27e2b96 (diff) | |
parent | 7066fdd0d7427f1ba455d186e75213c442c9663b (diff) | |
download | linux-8f620400861a313cfb59a43651a92f815de0da93.tar.bz2 |
Merge branch 'clk-qcom' into clk-next
* clk-qcom:
clk: qcom: clk-smd-rpm: add msm8996 rpmclks
clk: qcom: Implement RPM clocks for MSM8660/APQ8060
clk: qcom: Update DT bindings for the MSM8660/APQ8060 RPMCC
clk: qcom: Elaborate on "active" clocks in the RPM clock bindings
clk: qcom: Remove unused RCG ops
Diffstat (limited to 'include')
-rw-r--r-- | include/dt-bindings/clock/qcom,rpmcc.h | 17 | ||||
-rw-r--r-- | include/linux/soc/qcom/smd-rpm.h | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h index 96b63c00249e..b8337a5fa347 100644 --- a/include/dt-bindings/clock/qcom,rpmcc.h +++ b/include/dt-bindings/clock/qcom,rpmcc.h @@ -37,6 +37,9 @@ #define RPM_SYS_FABRIC_A_CLK 19 #define RPM_SFPB_CLK 20 #define RPM_SFPB_A_CLK 21 +#define RPM_SMI_CLK 22 +#define RPM_SMI_A_CLK 23 +#define RPM_PLL4_CLK 24 /* SMD RPM clocks */ #define RPM_SMD_XO_CLK_SRC 0 @@ -101,5 +104,19 @@ #define RPM_SMD_CXO_A1_A_PIN 59 #define RPM_SMD_CXO_A2_PIN 60 #define RPM_SMD_CXO_A2_A_PIN 61 +#define RPM_SMD_AGGR1_NOC_CLK 62 +#define RPM_SMD_AGGR1_NOC_A_CLK 63 +#define RPM_SMD_AGGR2_NOC_CLK 64 +#define RPM_SMD_AGGR2_NOC_A_CLK 65 +#define RPM_SMD_MMAXI_CLK 66 +#define RPM_SMD_MMAXI_A_CLK 67 +#define RPM_SMD_IPA_CLK 68 +#define RPM_SMD_IPA_A_CLK 69 +#define RPM_SMD_CE1_CLK 70 +#define RPM_SMD_CE1_A_CLK 71 +#define RPM_SMD_DIV_CLK3 72 +#define RPM_SMD_DIV_A_CLK3 73 +#define RPM_SMD_LN_BB_CLK 74 +#define RPM_SMD_LN_BB_A_CLK 75 #endif diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h index 2a53dcaeeeed..ebdabd669d93 100644 --- a/include/linux/soc/qcom/smd-rpm.h +++ b/include/linux/soc/qcom/smd-rpm.h @@ -26,6 +26,10 @@ struct qcom_smd_rpm; #define QCOM_SMD_RPM_SMPB 0x62706d73 #define QCOM_SMD_RPM_SPDM 0x63707362 #define QCOM_SMD_RPM_VSA 0x00617376 +#define QCOM_SMD_RPM_MMAXI_CLK 0x69786d6d +#define QCOM_SMD_RPM_IPA_CLK 0x617069 +#define QCOM_SMD_RPM_CE_CLK 0x6563 +#define QCOM_SMD_RPM_AGGR_CLK 0x72676761 int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm, int state, |