Skip to content

Commit c964cfc

Browse files
committed
Merge tag 'meson-clk-fixes-4.17-1' of https://github.com/BayLibre/clk-meson into clk-fixes
Pull meson clk fixes from Jerome Brunet: - fix typos in two meson8 clock names - remove unused clock ops declaration * tag 'meson-clk-fixes-4.17-1' of https://github.com/BayLibre/clk-meson: clk: meson: meson8b: fix meson8b_cpu_clk parent clock name clk: meson: meson8b: fix meson8b_fclk_div3_div clock name clk: meson: drop meson_aoclk_gate_regmap_ops
2 parents 6cc1eb5 + 5b33139 commit c964cfc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

drivers/clk/meson/gxbb-aoclk.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#define AO_RTC_ALT_CLK_CNTL0 0x94
1818
#define AO_RTC_ALT_CLK_CNTL1 0x98
1919

20-
extern const struct clk_ops meson_aoclk_gate_regmap_ops;
21-
2220
struct aoclk_cec_32k {
2321
struct clk_hw hw;
2422
struct regmap *regmap;

drivers/clk/meson/meson8b.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static struct clk_fixed_factor meson8b_fclk_div3_div = {
253253
.mult = 1,
254254
.div = 3,
255255
.hw.init = &(struct clk_init_data){
256-
.name = "fclk_div_div3",
256+
.name = "fclk_div3_div",
257257
.ops = &clk_fixed_factor_ops,
258258
.parent_names = (const char *[]){ "fixed_pll" },
259259
.num_parents = 1,
@@ -632,7 +632,8 @@ static struct clk_regmap meson8b_cpu_clk = {
632632
.hw.init = &(struct clk_init_data){
633633
.name = "cpu_clk",
634634
.ops = &clk_regmap_mux_ro_ops,
635-
.parent_names = (const char *[]){ "xtal", "cpu_out_sel" },
635+
.parent_names = (const char *[]){ "xtal",
636+
"cpu_scale_out_sel" },
636637
.num_parents = 2,
637638
.flags = (CLK_SET_RATE_PARENT |
638639
CLK_SET_RATE_NO_REPARENT),

0 commit comments

Comments
 (0)