[PATCH v3 4/6] clk: sunxi: unify sun6i AHB1 clock with proper PLL6 pre-divider

Chen-Yu Tsai
2014-11-16T19:04:29Z

Hi,

On Mon, Nov 17, 2014 at 1:02 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> On Thu, Nov 13, 2014 at 02:08:33AM +0800, Chen-Yu Tsai wrote:
>> This patch unifies the sun6i AHB1 clock, originally supported
>> with separate mux and divider clks. It also adds support for
>> the pre-divider on the PLL6 input, thus allowing the clock to
>> be muxed to PLL6 with proper clock rate calculation.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>> This patch produces a warning on of_io_request_and_map complaining
>> about dropping the const modifier. I have a separate patch for fixing
>> of_io_request_and_map.
>> ---
>> Documentation/devicetree/bindings/clock/sunxi.txt | 2 +-
>> drivers/clk/sunxi/clk-sunxi.c | 208 ++++++++++++++++++++++
>> 2 files changed, 209 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
>> index 67b2b99..9dc4f55 100644
>> --- a/Documentation/devicetree/bindings/clock/sunxi.txt
>> +++ b/Documentation/devicetree/bindings/clock/sunxi.txt
>> @@ -26,7 +26,7 @@ Required properties:
>> "allwinner,sun5i-a10s-ahb-gates-clk" - for the AHB gates on A10s
>> "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20
>> "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31
>> - "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31
>> + "allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31
>> "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31
>> "allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23
>> "allwinner,sun9i-a80-ahb0-gates-clk" - for the AHB0 gates on A80
>> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
>> index 5702025..2bb769f 100644
>> --- a/drivers/clk/sunxi/clk-sunxi.c
>> +++ b/drivers/clk/sunxi/clk-sunxi.c
>> @@ -20,6 +20,7 @@
>> #include <linux/of_address.h>
>> #include <linux/reset-controller.h>
>> #include <linux/spinlock.h>
>> +#include <linux/log2.h>
>
> Why is this needed?
>

For __roundup_pow_of_two.

>> #include "clk-factors.h"
>>
>> @@ -1233,3 +1234,210 @@ static void __init sun9i_init_clocks(struct device_node *node)
>> sunxi_init_clocks(NULL, 0);
>> }
>> CLK_OF_DECLARE(sun9i_a80_clk_init, "allwinner,sun9i-a80", sun9i_init_clocks);
>> +
>> +/**
>> + * sun6i_a31_ahb1_clk_setup() - Setup function for a31 ahb1 composite clk
>> + */
>
> Why is that added to the A80 clock file ?

This is the clk-sunxi.c file.

ChenYu