Skip to content

Commit 8bb629c

Browse files
xdarklightjbrun3t
authored andcommitted
clk: meson: meson8b: Fix the vclk_div{1, 2, 4, 6, 12}_en gate bits
The DIV{1,2,4,6,12}_EN bits are actually located in HHI_VID_CLK_CNTL register: - HHI_VID_CLK_CNTL[0] = DIV1_EN - HHI_VID_CLK_CNTL[1] = DIV2_EN - HHI_VID_CLK_CNTL[2] = DIV4_EN - HHI_VID_CLK_CNTL[3] = DIV6_EN - HHI_VID_CLK_CNTL[4] = DIV12_EN Update the bits accordingly so we will enable the bits in the correct register once we switch these clocks to be mutable. Fixes: 6cb57c6 ("clk: meson: meson8b: add the read-only video clock trees") Signed-off-by: Martin Blumenstingl <[email protected]> Signed-off-by: Jerome Brunet <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0d3051c commit 8bb629c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/clk/meson/meson8b.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ static struct clk_regmap meson8b_vclk_in_en = {
12131213

12141214
static struct clk_regmap meson8b_vclk_div1_gate = {
12151215
.data = &(struct clk_regmap_gate_data){
1216-
.offset = HHI_VID_CLK_DIV,
1216+
.offset = HHI_VID_CLK_CNTL,
12171217
.bit_idx = 0,
12181218
},
12191219
.hw.init = &(struct clk_init_data){
@@ -1243,7 +1243,7 @@ static struct clk_fixed_factor meson8b_vclk_div2_div = {
12431243

12441244
static struct clk_regmap meson8b_vclk_div2_div_gate = {
12451245
.data = &(struct clk_regmap_gate_data){
1246-
.offset = HHI_VID_CLK_DIV,
1246+
.offset = HHI_VID_CLK_CNTL,
12471247
.bit_idx = 1,
12481248
},
12491249
.hw.init = &(struct clk_init_data){
@@ -1273,7 +1273,7 @@ static struct clk_fixed_factor meson8b_vclk_div4_div = {
12731273

12741274
static struct clk_regmap meson8b_vclk_div4_div_gate = {
12751275
.data = &(struct clk_regmap_gate_data){
1276-
.offset = HHI_VID_CLK_DIV,
1276+
.offset = HHI_VID_CLK_CNTL,
12771277
.bit_idx = 2,
12781278
},
12791279
.hw.init = &(struct clk_init_data){
@@ -1303,7 +1303,7 @@ static struct clk_fixed_factor meson8b_vclk_div6_div = {
13031303

13041304
static struct clk_regmap meson8b_vclk_div6_div_gate = {
13051305
.data = &(struct clk_regmap_gate_data){
1306-
.offset = HHI_VID_CLK_DIV,
1306+
.offset = HHI_VID_CLK_CNTL,
13071307
.bit_idx = 3,
13081308
},
13091309
.hw.init = &(struct clk_init_data){
@@ -1333,7 +1333,7 @@ static struct clk_fixed_factor meson8b_vclk_div12_div = {
13331333

13341334
static struct clk_regmap meson8b_vclk_div12_div_gate = {
13351335
.data = &(struct clk_regmap_gate_data){
1336-
.offset = HHI_VID_CLK_DIV,
1336+
.offset = HHI_VID_CLK_CNTL,
13371337
.bit_idx = 4,
13381338
},
13391339
.hw.init = &(struct clk_init_data){

0 commit comments

Comments
 (0)