Skip to content

Commit 05b0fdf

Browse files
superna9999robclark
authored andcommitted
drm/msm/dpu: sm8550: remove unused VIG and DMA clock controls entries
The SM8550 has the SSPP clk_ctrl in the SSPP registers, remove the duplicate clock controls from the MDP top. Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/562330/ Signed-off-by: Rob Clark <[email protected]>
1 parent 346faac commit 05b0fdf

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ static const struct dpu_mdp_cfg sm8550_mdp = {
2424
.base = 0, .len = 0x494,
2525
.features = BIT(DPU_MDP_PERIPH_0_REMOVED),
2626
.clk_ctrls = {
27-
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x4330, .bit_off = 0 },
28-
[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x6330, .bit_off = 0 },
29-
[DPU_CLK_CTRL_VIG2] = { .reg_off = 0x8330, .bit_off = 0 },
30-
[DPU_CLK_CTRL_VIG3] = { .reg_off = 0xa330, .bit_off = 0 },
31-
[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x24330, .bit_off = 0 },
32-
[DPU_CLK_CTRL_DMA1] = { .reg_off = 0x26330, .bit_off = 0 },
33-
[DPU_CLK_CTRL_DMA2] = { .reg_off = 0x28330, .bit_off = 0 },
34-
[DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2a330, .bit_off = 0 },
35-
[DPU_CLK_CTRL_DMA4] = { .reg_off = 0x2c330, .bit_off = 0 },
36-
[DPU_CLK_CTRL_DMA5] = { .reg_off = 0x2e330, .bit_off = 0 },
3727
[DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2bc, .bit_off = 20 },
3828
},
3929
};
@@ -81,79 +71,69 @@ static const struct dpu_sspp_cfg sm8550_sspp[] = {
8171
.sblk = &sm8550_vig_sblk_0,
8272
.xin_id = 0,
8373
.type = SSPP_TYPE_VIG,
84-
.clk_ctrl = DPU_CLK_CTRL_VIG0,
8574
}, {
8675
.name = "sspp_1", .id = SSPP_VIG1,
8776
.base = 0x6000, .len = 0x344,
8877
.features = VIG_SC7180_MASK,
8978
.sblk = &sm8550_vig_sblk_1,
9079
.xin_id = 4,
9180
.type = SSPP_TYPE_VIG,
92-
.clk_ctrl = DPU_CLK_CTRL_VIG1,
9381
}, {
9482
.name = "sspp_2", .id = SSPP_VIG2,
9583
.base = 0x8000, .len = 0x344,
9684
.features = VIG_SC7180_MASK,
9785
.sblk = &sm8550_vig_sblk_2,
9886
.xin_id = 8,
9987
.type = SSPP_TYPE_VIG,
100-
.clk_ctrl = DPU_CLK_CTRL_VIG2,
10188
}, {
10289
.name = "sspp_3", .id = SSPP_VIG3,
10390
.base = 0xa000, .len = 0x344,
10491
.features = VIG_SC7180_MASK,
10592
.sblk = &sm8550_vig_sblk_3,
10693
.xin_id = 12,
10794
.type = SSPP_TYPE_VIG,
108-
.clk_ctrl = DPU_CLK_CTRL_VIG3,
10995
}, {
11096
.name = "sspp_8", .id = SSPP_DMA0,
11197
.base = 0x24000, .len = 0x344,
11298
.features = DMA_SDM845_MASK,
11399
.sblk = &sdm845_dma_sblk_0,
114100
.xin_id = 1,
115101
.type = SSPP_TYPE_DMA,
116-
.clk_ctrl = DPU_CLK_CTRL_DMA0,
117102
}, {
118103
.name = "sspp_9", .id = SSPP_DMA1,
119104
.base = 0x26000, .len = 0x344,
120105
.features = DMA_SDM845_MASK,
121106
.sblk = &sdm845_dma_sblk_1,
122107
.xin_id = 5,
123108
.type = SSPP_TYPE_DMA,
124-
.clk_ctrl = DPU_CLK_CTRL_DMA1,
125109
}, {
126110
.name = "sspp_10", .id = SSPP_DMA2,
127111
.base = 0x28000, .len = 0x344,
128112
.features = DMA_SDM845_MASK,
129113
.sblk = &sdm845_dma_sblk_2,
130114
.xin_id = 9,
131115
.type = SSPP_TYPE_DMA,
132-
.clk_ctrl = DPU_CLK_CTRL_DMA2,
133116
}, {
134117
.name = "sspp_11", .id = SSPP_DMA3,
135118
.base = 0x2a000, .len = 0x344,
136119
.features = DMA_SDM845_MASK,
137120
.sblk = &sdm845_dma_sblk_3,
138121
.xin_id = 13,
139122
.type = SSPP_TYPE_DMA,
140-
.clk_ctrl = DPU_CLK_CTRL_DMA3,
141123
}, {
142124
.name = "sspp_12", .id = SSPP_DMA4,
143125
.base = 0x2c000, .len = 0x344,
144126
.features = DMA_CURSOR_SDM845_MASK,
145127
.sblk = &sm8550_dma_sblk_4,
146128
.xin_id = 14,
147129
.type = SSPP_TYPE_DMA,
148-
.clk_ctrl = DPU_CLK_CTRL_DMA4,
149130
}, {
150131
.name = "sspp_13", .id = SSPP_DMA5,
151132
.base = 0x2e000, .len = 0x344,
152133
.features = DMA_CURSOR_SDM845_MASK,
153134
.sblk = &sm8550_dma_sblk_5,
154135
.xin_id = 15,
155136
.type = SSPP_TYPE_DMA,
156-
.clk_ctrl = DPU_CLK_CTRL_DMA5,
157137
},
158138
};
159139

0 commit comments

Comments
 (0)