clk: qcom: gdsc: Add GDSCs in msm8916 GCC

Add all data for the GDSCs which are part of msm8916 GCC block.

Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
index d3a695b97aa0a6278450d7f67dad87ef5421d6e3..abec45a6444c2cdba2a7af2b659fc80e3cc8ecb3 100644 (file)
--- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@ -53,6 +53,7 @@ config MSM_GCC_8660
 
 config MSM_GCC_8916
        tristate "MSM8916 Global Clock Controller"
+       select QCOM_GDSC
        depends on COMMON_CLK_QCOM
        help
          Support for the global clock controller on msm8916 devices.

diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c
index 3de282365d8d667a4db2d071b49de2db0c204376..83871b663e2199ca421da25a25faa6ffd1a579f3 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8916.c
+++ b/drivers/clk/qcom/gcc-msm8916.c
@@ -31,6 +31,7 @@
 #include "clk-rcg.h"
 #include "clk-branch.h"
 #include "reset.h"
+#include "gdsc.h"
 
 enum {
        P_XO,
@@ -2550,6 +2551,46 @@ static struct clk_branch gcc_venus0_vcodec0_clk = {
        },
 };
 
+static struct gdsc venus_gdsc = {
+       .gdscr = 0x4c018,
+       .pd = {
+               .name = "venus",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc mdss_gdsc = {
+       .gdscr = 0x4d078,
+       .pd = {
+               .name = "mdss",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc jpeg_gdsc = {
+       .gdscr = 0x5701c,
+       .pd = {
+               .name = "jpeg",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc vfe_gdsc = {
+       .gdscr = 0x58034,
+       .pd = {
+               .name = "vfe",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc oxili_gdsc = {
+       .gdscr = 0x5901c,
+       .pd = {
+               .name = "oxili",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
 static struct clk_regmap *gcc_msm8916_clocks[] = {
        [GPLL0] = &gpll0.clkr,
        [GPLL0_VOTE] = &gpll0_vote,
@@ -2691,6 +2732,14 @@ static struct clk_regmap *gcc_msm8916_clocks[] = {
        [GCC_VENUS0_VCODEC0_CLK] = &gcc_venus0_vcodec0_clk.clkr,
 };
 
+static struct gdsc *gcc_msm8916_gdscs[] = {
+       [VENUS_GDSC] = &venus_gdsc,
+       [MDSS_GDSC] = &mdss_gdsc,
+       [JPEG_GDSC] = &jpeg_gdsc,
+       [VFE_GDSC] = &vfe_gdsc,
+       [OXILI_GDSC] = &oxili_gdsc,
+};
+
 static const struct qcom_reset_map gcc_msm8916_resets[] = {
        [GCC_BLSP1_BCR] = { 0x01000 },
        [GCC_BLSP1_QUP1_BCR] = { 0x02000 },
@@ -2798,6 +2847,8 @@ static const struct qcom_cc_desc gcc_msm8916_desc = {
        .num_clks = ARRAY_SIZE(gcc_msm8916_clocks),
        .resets = gcc_msm8916_resets,
        .num_resets = ARRAY_SIZE(gcc_msm8916_resets),
+       .gdscs = gcc_msm8916_gdscs,
+       .num_gdscs = ARRAY_SIZE(gcc_msm8916_gdscs),
 };
 
 static const struct of_device_id gcc_msm8916_match_table[] = {

diff --git a/include/dt-bindings/clock/qcom,gcc-msm8916.h b/include/dt-bindings/clock/qcom,gcc-msm8916.h
index e430f644dd6cd679138f1bb1e5500cabfa0550fd..11566c5673569cf7bd77ab200357317f71182a13 100644 (file)
--- a/include/dt-bindings/clock/qcom,gcc-msm8916.h
+++ b/include/dt-bindings/clock/qcom,gcc-msm8916.h
@@ -153,4 +153,12 @@
 #define GCC_VENUS0_AXI_CLK                     136
 #define GCC_VENUS0_VCODEC0_CLK                 137
 
+/* Indexes for GDSCs */
+#define BIMC_GDSC                              0
+#define VENUS_GDSC                             1
+#define MDSS_GDSC                              2
+#define JPEG_GDSC                              3
+#define VFE_GDSC                               4
+#define OXILI_GDSC                             5
+
 #endif