Mark titan_top_gdsc as parent to all other camera GDSCs.
Signed-off-by: Taniya Das <[email protected]>
---
drivers/clk/qcom/camcc-sc7180.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
index e2b4804695f3..8a4ba7a19ed1 100644
--- a/drivers/clk/qcom/camcc-sc7180.c
+++ b/drivers/clk/qcom/camcc-sc7180.c
@@ -1480,12 +1480,21 @@ static struct clk_branch cam_cc_sys_tmr_clk = {
},
};
+static struct gdsc titan_top_gdsc = {
+ .gdscr = 0xb134,
+ .pd = {
+ .name = "titan_top_gdsc",
+ },
+ .pwrsts = PWRSTS_OFF_ON,
+};
+
static struct gdsc bps_gdsc = {
.gdscr = 0x6004,
.pd = {
.name = "bps_gdsc",
},
.pwrsts = PWRSTS_OFF_ON,
+ .parent = &titan_top_gdsc.pd,
.flags = HW_CTRL,
};
@@ -1495,6 +1504,7 @@ static struct gdsc ife_0_gdsc = {
.name = "ife_0_gdsc",
},
.pwrsts = PWRSTS_OFF_ON,
+ .parent = &titan_top_gdsc.pd,
};
static struct gdsc ife_1_gdsc = {
@@ -1503,6 +1513,7 @@ static struct gdsc ife_1_gdsc = {
.name = "ife_1_gdsc",
},
.pwrsts = PWRSTS_OFF_ON,
+ .parent = &titan_top_gdsc.pd,
};
static struct gdsc ipe_0_gdsc = {
@@ -1512,15 +1523,9 @@ static struct gdsc ipe_0_gdsc = {
},
.pwrsts = PWRSTS_OFF_ON,
.flags = HW_CTRL,
+ .parent = &titan_top_gdsc.pd,
};
-static struct gdsc titan_top_gdsc = {
- .gdscr = 0xb134,
- .pd = {
- .name = "titan_top_gdsc",
- },
- .pwrsts = PWRSTS_OFF_ON,
-};
static struct clk_hw *cam_cc_sc7180_hws[] = {
[CAM_CC_PLL2_OUT_EARLY] = &cam_cc_pll2_out_early.hw,
--
2.17.1
On Thu, 20 Apr 2023 at 14:55, Taniya Das <[email protected]> wrote:
>
> Mark titan_top_gdsc as parent to all other camera GDSCs.
Please expand the commit message. Your text describes what the patch
does, but it can be observed from the patch itself. Please describe
why it is done.
>
> Signed-off-by: Taniya Das <[email protected]>
> ---
> drivers/clk/qcom/camcc-sc7180.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
> index e2b4804695f3..8a4ba7a19ed1 100644
> --- a/drivers/clk/qcom/camcc-sc7180.c
> +++ b/drivers/clk/qcom/camcc-sc7180.c
> @@ -1480,12 +1480,21 @@ static struct clk_branch cam_cc_sys_tmr_clk = {
> },
> };
>
> +static struct gdsc titan_top_gdsc = {
> + .gdscr = 0xb134,
> + .pd = {
> + .name = "titan_top_gdsc",
> + },
> + .pwrsts = PWRSTS_OFF_ON,
> +};
> +
> static struct gdsc bps_gdsc = {
> .gdscr = 0x6004,
> .pd = {
> .name = "bps_gdsc",
> },
> .pwrsts = PWRSTS_OFF_ON,
> + .parent = &titan_top_gdsc.pd,
> .flags = HW_CTRL,
> };
>
> @@ -1495,6 +1504,7 @@ static struct gdsc ife_0_gdsc = {
> .name = "ife_0_gdsc",
> },
> .pwrsts = PWRSTS_OFF_ON,
> + .parent = &titan_top_gdsc.pd,
> };
>
> static struct gdsc ife_1_gdsc = {
> @@ -1503,6 +1513,7 @@ static struct gdsc ife_1_gdsc = {
> .name = "ife_1_gdsc",
> },
> .pwrsts = PWRSTS_OFF_ON,
> + .parent = &titan_top_gdsc.pd,
> };
>
> static struct gdsc ipe_0_gdsc = {
> @@ -1512,15 +1523,9 @@ static struct gdsc ipe_0_gdsc = {
> },
> .pwrsts = PWRSTS_OFF_ON,
> .flags = HW_CTRL,
> + .parent = &titan_top_gdsc.pd,
> };
>
> -static struct gdsc titan_top_gdsc = {
> - .gdscr = 0xb134,
> - .pd = {
> - .name = "titan_top_gdsc",
> - },
> - .pwrsts = PWRSTS_OFF_ON,
> -};
>
> static struct clk_hw *cam_cc_sc7180_hws[] = {
> [CAM_CC_PLL2_OUT_EARLY] = &cam_cc_pll2_out_early.hw,
> --
> 2.17.1
>
--
With best wishes
Dmitry
Quoting Dmitry Baryshkov (2023-04-21 06:42:06)
> On Thu, 20 Apr 2023 at 14:55, Taniya Das <[email protected]> wrote:
> >
> > Mark titan_top_gdsc as parent to all other camera GDSCs.
>
> Please expand the commit message. Your text describes what the patch
> does, but it can be observed from the patch itself. Please describe
> why it is done.
+1 and also add a Fixes tag because I'm guessing this is a fix.