[GIT,PULL] Allwinner clock changes for 4.13

Commit Message

Stephen Boyd June 16, 2017, 9:50 p.m. UTC

On 06/14, Maxime Ripard wrote:
> Hi Mike, Stephen,
> 
> Here is the patches for 4.13 for the Allwinner SoCs.
> 
> In order to reduce the conflicts, this is based on the fixes tag I
> sent a PR for a few minutes ago.
> 

Thanks. Pulled into clk-next. I did notice on new sparse warning
though for which I've applied this diff on top:

Comments

Maxime Ripard June 20, 2017, 6:30 a.m. UTC | #1

On Fri, Jun 16, 2017 at 02:50:36PM -0700, Stephen Boyd wrote:
> On 06/14, Maxime Ripard wrote:
> > Hi Mike, Stephen,
> > 
> > Here is the patches for 4.13 for the Allwinner SoCs.
> > 
> > In order to reduce the conflicts, this is based on the fixes tag I
> > sent a PR for a few minutes ago.
> > 
> 
> Thanks. Pulled into clk-next. I did notice on new sparse warning
> though for which I've applied this diff on top:
> 
> diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
> index cfe4538304fb..312664155a54 100644
> --- a/drivers/clk/sunxi-ng/ccu_mux.c
> +++ b/drivers/clk/sunxi-ng/ccu_mux.c
> @@ -68,7 +68,7 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_common *common,
>  	return parent_rate / ccu_mux_get_prediv(common, cm, parent_index);
>  }
>  
> -unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
> +static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
>  					    struct ccu_mux_internal *cm,
>  					    int parent_index,
>  					    unsigned long parent_rate)

Seems good, thanks!
Maxime

Patch

diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
index cfe4538304fb..312664155a54 100644
--- a/drivers/clk/sunxi-ng/ccu_mux.c
+++ b/drivers/clk/sunxi-ng/ccu_mux.c
@@ -68,7 +68,7 @@  unsigned long ccu_mux_helper_apply_prediv(struct ccu_common *common,
 	return parent_rate / ccu_mux_get_prediv(common, cm, parent_index);
 }
 
-unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
+static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
 					    struct ccu_mux_internal *cm,
 					    int parent_index,
 					    unsigned long parent_rate)