On Sun, Sep 2, 2018 at 3:27 PM Jernej Skrabec <jernej.skrabec@xxxxxxxx> wrote:
>
> Support for mixer0, mixer1, writeback and rotation units is added.
>
> Signed-off-by: Jernej Skrabec <jernej.skrabec@xxxxxxxx>
> Signed-off-by: Icenowy Zheng <icenowy@xxxxxxx>
> ---
> drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 65 ++++++++++++++++++++++++++++
> drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 1 +
> 2 files changed, 66 insertions(+)
>
> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
> index bae5ee67a797..4535c1c27d27 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
> @@ -31,6 +31,8 @@ static SUNXI_CCU_GATE(bus_mixer1_clk, "bus-mixer1", "bus-de",
> 0x04, BIT(1), 0);
> static SUNXI_CCU_GATE(bus_wb_clk, "bus-wb", "bus-de",
> 0x04, BIT(2), 0);
> +static SUNXI_CCU_GATE(bus_rot_clk, "bus-rot", "bus-de",
> + 0x04, BIT(3), 0);
>
> static SUNXI_CCU_GATE(mixer0_clk, "mixer0", "mixer0-div",
> 0x00, BIT(0), CLK_SET_RATE_PARENT);
> @@ -38,6 +40,8 @@ static SUNXI_CCU_GATE(mixer1_clk, "mixer1", "mixer1-div",
> 0x00, BIT(1), CLK_SET_RATE_PARENT);
> static SUNXI_CCU_GATE(wb_clk, "wb", "wb-div",
> 0x00, BIT(2), CLK_SET_RATE_PARENT);
> +static SUNXI_CCU_GATE(rot_clk, "rot", "rot-div",
> + 0x00, BIT(3), CLK_SET_RATE_PARENT);
>
> static SUNXI_CCU_M(mixer0_div_clk, "mixer0-div", "de", 0x0c, 0, 4,
> CLK_SET_RATE_PARENT);
> @@ -45,6 +49,8 @@ static SUNXI_CCU_M(mixer1_div_clk, "mixer1-div", "de", 0x0c, 4, 4,
> CLK_SET_RATE_PARENT);
> static SUNXI_CCU_M(wb_div_clk, "wb-div", "de", 0x0c, 8, 4,
> CLK_SET_RATE_PARENT);
> +static SUNXI_CCU_M(rot_div_clk, "rot-div", "de", 0x0c, 0x0c, 4,
> + CLK_SET_RATE_PARENT);
>
> static SUNXI_CCU_M(mixer0_div_a83_clk, "mixer0-div", "pll-de", 0x0c, 0, 4,
> CLK_SET_RATE_PARENT);
> @@ -53,6 +59,24 @@ static SUNXI_CCU_M(mixer1_div_a83_clk, "mixer1-div", "pll-de", 0x0c, 4, 4,
> static SUNXI_CCU_M(wb_div_a83_clk, "wb-div", "pll-de", 0x0c, 8, 4,
> CLK_SET_RATE_PARENT);
>
> +static struct ccu_common *sun50i_h6_de3_clks[] = {
> + &mixer0_clk.common,
> + &mixer1_clk.common,
> + &wb_clk.common,
> +
> + &bus_mixer0_clk.common,
> + &bus_mixer1_clk.common,
> + &bus_wb_clk.common,
> +
> + &mixer0_div_clk.common,
> + &mixer1_div_clk.common,
> + &wb_div_clk.common,
> +
> + &bus_rot_clk.common,
> + &rot_clk.common,
> + &rot_div_clk.common,
> +};
> +
> static struct ccu_common *sun8i_a83t_de2_clks[] = {
> &mixer0_clk.common,
> &mixer1_clk.common,
> @@ -92,6 +116,26 @@ static struct ccu_common *sun8i_v3s_de2_clks[] = {
> &wb_div_clk.common,
> };
>
> +static struct clk_hw_onecell_data sun50i_h6_de3_hw_clks = {
> + .hws = {
> + [CLK_MIXER0] = &mixer0_clk.common.hw,
> + [CLK_MIXER1] = &mixer1_clk.common.hw,
> + [CLK_WB] = &wb_clk.common.hw,
> + [CLK_ROT] = &rot_clk.common.hw,
> +
> + [CLK_BUS_MIXER0] = &bus_mixer0_clk.common.hw,
> + [CLK_BUS_MIXER1] = &bus_mixer1_clk.common.hw,
> + [CLK_BUS_WB] = &bus_wb_clk.common.hw,
> + [CLK_BUS_ROT] = &bus_rot_clk.common.hw,
> +
> + [CLK_MIXER0_DIV] = &mixer0_div_clk.common.hw,
> + [CLK_MIXER1_DIV] = &mixer1_div_clk.common.hw,
> + [CLK_WB_DIV] = &wb_div_clk.common.hw,
> + [CLK_ROT_DIV] = &rot_div_clk.common.hw,
> + },
> + .num = 12,
It's best not to openly code these. It is error prone, like having
an index beyond .num, which then never gets registered.
Instead, please update CLK_NUMBERS and use that instead. sunxi_ccu_probe()
can handle holes in .hws.
On the other hand, it can't handle holes in the ccu_reset_map. Hope we
never have to deal with such an instance.
ChenYu
> +};
> +
> static struct clk_hw_onecell_data sun8i_a83t_de2_hw_clks = {
> .hws = {
> [CLK_MIXER0] = &mixer0_clk.common.hw,
> @@ -156,6 +200,13 @@ static struct ccu_reset_map sun50i_a64_de2_resets[] = {
> [RST_WB] = { 0x08, BIT(2) },
> };
>
> +static struct ccu_reset_map sun50i_h6_de3_resets[] = {
> + [RST_MIXER0] = { 0x08, BIT(0) },
> + [RST_MIXER1] = { 0x08, BIT(1) },
> + [RST_WB] = { 0x08, BIT(2) },
> + [RST_ROT] = { 0x08, BIT(3) },
> +};
> +
> static const struct sunxi_ccu_desc sun8i_a83t_de2_clk_desc = {
> .ccu_clks = sun8i_a83t_de2_clks,
> .num_ccu_clks = ARRAY_SIZE(sun8i_a83t_de2_clks),
> @@ -186,6 +237,16 @@ static const struct sunxi_ccu_desc sun50i_a64_de2_clk_desc = {
> .num_resets = ARRAY_SIZE(sun50i_a64_de2_resets),
> };
>
> +static const struct sunxi_ccu_desc sun50i_h6_de3_clk_desc = {
> + .ccu_clks = sun50i_h6_de3_clks,
> + .num_ccu_clks = ARRAY_SIZE(sun50i_h6_de3_clks),
> +
> + .hw_clks = &sun50i_h6_de3_hw_clks,
> +
> + .resets = sun50i_h6_de3_resets,
> + .num_resets = ARRAY_SIZE(sun50i_h6_de3_resets),
> +};
> +
> static const struct sunxi_ccu_desc sun8i_v3s_de2_clk_desc = {
> .ccu_clks = sun8i_v3s_de2_clks,
> .num_ccu_clks = ARRAY_SIZE(sun8i_v3s_de2_clks),
> @@ -296,6 +357,10 @@ static const struct of_device_id sunxi_de2_clk_ids[] = {
> .compatible = "allwinner,sun50i-h5-de2-clk",
> .data = &sun50i_a64_de2_clk_desc,
> },
> + {
> + .compatible = "allwinner,sun50i-h6-de3-clk",
> + .data = &sun50i_h6_de3_clk_desc,
> + },
> { }
> };
>
> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-de2.h b/drivers/clk/sunxi-ng/ccu-sun8i-de2.h
> index 530c006e0ae9..27bd88539f42 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.h
> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.h
> @@ -22,6 +22,7 @@
> #define CLK_MIXER0_DIV 3
> #define CLK_MIXER1_DIV 4
> #define CLK_WB_DIV 5
> +#define CLK_ROT_DIV 11
>
> #define CLK_NUMBER (CLK_WB + 1)
>
> --
> 2.18.0
>
