clk: qcom: gcc-msm8939: Point MM peripherals to system_mm_noc clock
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>
Wed, 4 May 2022 16:38:35 +0000 (17:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:46 +0000 (14:23 +0200)
[ Upstream commit 05eed0990927aa9634682fec58660e30f7b7ae30 ]

Qcom docs indciate the following peripherals operating from System NOC
MM not from System NOC clocks.

- MDP
- VFE
- JPEGe
- Venus

Switch over the relevant parent pointers.

Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller")
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220504163835.40130-5-bryan.odonoghue@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/qcom/gcc-msm8939.c

index 12bab90..c7377ec 100644 (file)
@@ -2453,7 +2453,7 @@ static struct clk_branch gcc_camss_jpeg_axi_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_camss_jpeg_axi_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -2657,7 +2657,7 @@ static struct clk_branch gcc_camss_vfe_axi_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_camss_vfe_axi_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -2813,7 +2813,7 @@ static struct clk_branch gcc_mdss_axi_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_mdss_axi_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -3205,7 +3205,7 @@ static struct clk_branch gcc_mdp_tbu_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_mdp_tbu_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -3223,7 +3223,7 @@ static struct clk_branch gcc_venus_tbu_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_venus_tbu_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -3241,7 +3241,7 @@ static struct clk_branch gcc_vfe_tbu_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_vfe_tbu_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -3259,7 +3259,7 @@ static struct clk_branch gcc_jpeg_tbu_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_jpeg_tbu_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,
@@ -3496,7 +3496,7 @@ static struct clk_branch gcc_venus0_axi_clk = {
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_venus0_axi_clk",
                        .parent_data = &(const struct clk_parent_data){
-                               .hw = &system_noc_bfdcd_clk_src.clkr.hw,
+                               .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw,
                        },
                        .num_parents = 1,
                        .flags = CLK_SET_RATE_PARENT,