2017-07-27 13:09:54

by Jerome Brunet

Subject: [PATCH 0/2] clk: meson: gxbb: fix audio divider flags

Two audio clocks incorrectly set divider flags in the hw.init flag.
Just move these flags where they belong.

Jerome Brunet (2):
clk: meson: gxbb: fix meson cts_amclk divider flags
clk: meson: gxbb: fix clk_mclk_i958 divider flags

drivers/clk/meson/gxbb.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

--
2.9.4

2017-07-27 13:10:11

by Jerome Brunet

Subject: [PATCH 1/2] clk: meson: gxbb: fix meson cts_amclk divider flags

CLK_DIVIDER_ROUND_CLOSEST was incorrectly put in the hw.init flags
while it should have been in the divider flags

Fixes: 4087bd4b2170 ("clk: meson: gxbb: add cts_amclk")
Signed-off-by: Jerome Brunet <[email protected]>
---
drivers/clk/meson/gxbb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index a897ea45327c..b1b72524153b 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -845,13 +845,14 @@ static struct meson_clk_audio_divider gxbb_cts_amclk_div = {
.shift = 0,
.width = 8,
},
+ .flags = CLK_DIVIDER_ROUND_CLOSEST,
.lock = &clk_lock,
.hw.init = &(struct clk_init_data){
.name = "cts_amclk_div",
.ops = &meson_clk_audio_divider_ops,
.parent_names = (const char *[]){ "cts_amclk_sel" },
.num_parents = 1,
- .flags = CLK_SET_RATE_PARENT | CLK_DIVIDER_ROUND_CLOSEST,
+ .flags = CLK_SET_RATE_PARENT,
},
};

--
2.9.4

2017-07-27 13:10:10

by Jerome Brunet

Subject: [PATCH 2/2] clk: meson: gxbb: fix clk_mclk_i958 divider flags

CLK_DIVIDER_ROUND_CLOSEST was incorrectly put in the hw.init flags
while it should have been in the divider flags

Fixes: 3c277c247eab ("clk: meson: gxbb: add cts_mclk_i958")
Signed-off-by: Jerome Brunet <[email protected]>
---
drivers/clk/meson/gxbb.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index b1b72524153b..59a296b119ea 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -876,7 +876,7 @@ static struct clk_mux gxbb_cts_mclk_i958_sel = {
/* Default parent unknown (register reset value: 0) */
.table = (u32[]){ 1, 2, 3 },
.lock = &clk_lock,
- .hw.init = &(struct clk_init_data){
+ .hw.init = &(struct clk_init_data) {
.name = "cts_mclk_i958_sel",
.ops = &clk_mux_ops,
.parent_names = (const char *[]){ "mpll0", "mpll1", "mpll2" },
@@ -890,12 +890,13 @@ static struct clk_divider gxbb_cts_mclk_i958_div = {
.shift = 16,
.width = 8,
.lock = &clk_lock,
- .hw.init = &(struct clk_init_data){
+ .flags = CLK_DIVIDER_ROUND_CLOSEST,
+ .hw.init = &(struct clk_init_data) {
.name = "cts_mclk_i958_div",
.ops = &clk_divider_ops,
.parent_names = (const char *[]){ "cts_mclk_i958_sel" },
.num_parents = 1,
- .flags = CLK_SET_RATE_PARENT | CLK_DIVIDER_ROUND_CLOSEST,
+ .flags = CLK_SET_RATE_PARENT,
},
};

--
2.9.4

2017-07-27 13:35:51

by Neil Armstrong

Subject: Re: [PATCH 0/2] clk: meson: gxbb: fix audio divider flags

On 07/27/2017 03:09 PM, Jerome Brunet wrote:
> Two audio clocks incorrectly set divider flags in the hw.init flag.
> Just move these flags where they belong.
>
> Jerome Brunet (2):
> clk: meson: gxbb: fix meson cts_amclk divider flags
> clk: meson: gxbb: fix clk_mclk_i958 divider flags
>
> drivers/clk/meson/gxbb.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>

Applied on clk-meson's fixes/drivers

Thx