Commit ab95d6e8 authored by Michael Turquette's avatar Michael Turquette

clk: meson8b: remove mali clk

This clock is undocumented and always orphaned. Get rid of it until we
have more complete clock tree documentation.
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
parent 55d42c40
...@@ -112,11 +112,8 @@ static const struct clk_div_table cpu_div_table[] = { ...@@ -112,11 +112,8 @@ static const struct clk_div_table cpu_div_table[] = {
}; };
PNAME(p_clk81) = { "fclk_div3", "fclk_div4", "fclk_div5" }; PNAME(p_clk81) = { "fclk_div3", "fclk_div4", "fclk_div5" };
PNAME(p_mali) = { "fclk_div3", "fclk_div4", "fclk_div5",
"fclk_div7", "zero" };
static u32 mux_table_clk81[] = { 6, 5, 7 }; static u32 mux_table_clk81[] = { 6, 5, 7 };
static u32 mux_table_mali[] = { 6, 5, 7, 4, 0 };
static const struct composite_conf clk81_conf __initconst = { static const struct composite_conf clk81_conf __initconst = {
.mux_table = mux_table_clk81, .mux_table = mux_table_clk81,
...@@ -126,13 +123,6 @@ static const struct composite_conf clk81_conf __initconst = { ...@@ -126,13 +123,6 @@ static const struct composite_conf clk81_conf __initconst = {
.gate_parm = PARM(0x00, 7, 1), .gate_parm = PARM(0x00, 7, 1),
}; };
static const struct composite_conf mali_conf __initconst = {
.mux_table = mux_table_mali,
.mux_parm = PARM(0x00, 9, 3),
.div_parm = PARM(0x00, 0, 7),
.gate_parm = PARM(0x00, 8, 1),
};
static struct clk_fixed_rate meson8b_xtal = { static struct clk_fixed_rate meson8b_xtal = {
.fixed_rate = 24000000, .fixed_rate = 24000000,
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
...@@ -142,15 +132,6 @@ static struct clk_fixed_rate meson8b_xtal = { ...@@ -142,15 +132,6 @@ static struct clk_fixed_rate meson8b_xtal = {
}, },
}; };
static struct clk_fixed_rate meson8b_zero = {
.fixed_rate = 0,
.hw.init = &(struct clk_init_data){
.name = "zero",
.num_parents = 0,
.ops = &clk_fixed_rate_ops,
},
};
static struct meson_clk_pll meson8b_fixed_pll = { static struct meson_clk_pll meson8b_fixed_pll = {
.m = { .m = {
.reg_off = MESON8B_REG_PLL_FIXED, .reg_off = MESON8B_REG_PLL_FIXED,
...@@ -301,8 +282,6 @@ static struct meson_clk_cpu meson8b_cpu_clk = { ...@@ -301,8 +282,6 @@ static struct meson_clk_cpu meson8b_cpu_clk = {
static const struct clk_conf meson8b_clk_confs[] __initconst = { static const struct clk_conf meson8b_clk_confs[] __initconst = {
COMPOSITE(MESON8B_REG_HHI_MPEG, CLKID_CLK81, "clk81", p_clk81, COMPOSITE(MESON8B_REG_HHI_MPEG, CLKID_CLK81, "clk81", p_clk81,
CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED, &clk81_conf), CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED, &clk81_conf),
COMPOSITE(MESON8B_REG_MALI, CLKID_MALI, "mali", p_mali,
CLK_IGNORE_UNUSED, &mali_conf),
}; };
/* /*
...@@ -315,7 +294,6 @@ static const struct clk_conf meson8b_clk_confs[] __initconst = { ...@@ -315,7 +294,6 @@ static const struct clk_conf meson8b_clk_confs[] __initconst = {
static struct clk_hw_onecell_data meson8b_hw_onecell_data = { static struct clk_hw_onecell_data meson8b_hw_onecell_data = {
.hws = { .hws = {
[CLKID_XTAL] = &meson8b_xtal.hw, [CLKID_XTAL] = &meson8b_xtal.hw,
[CLKID_ZERO] = &meson8b_zero.hw,
[CLKID_PLL_FIXED] = &meson8b_fixed_pll.hw, [CLKID_PLL_FIXED] = &meson8b_fixed_pll.hw,
[CLKID_PLL_VID] = &meson8b_vid_pll.hw, [CLKID_PLL_VID] = &meson8b_vid_pll.hw,
[CLKID_PLL_SYS] = &meson8b_sys_pll.hw, [CLKID_PLL_SYS] = &meson8b_sys_pll.hw,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment