Patchwork ARM: mach-imx: clk-busy: Adapt to new the clk_mux structure

login
register
mail settings
Submitter Fabio Estevam
Date March 26, 2013, 1:42 p.m.
Message ID <1364305330-21638-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/231202/
State New
Headers show

Comments

Fabio Estevam - March 26, 2013, 1:42 p.m.
Commit ce4f3313b05 (clk: add table lookup to mux) caused the following build 
error on imx_v4_v5_defconfig/imx_v6_v7_defconfig:

arch/arm/mach-imx/clk-busy.c:172:11: error: 'struct clk_mux' has no member named 'width'

Fix it by passing the 'mask' field.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-imx/clk-busy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Mike Turquette - March 26, 2013, 7:47 p.m.
Quoting Fabio Estevam (2013-03-26 06:42:10)
> Commit ce4f3313b05 (clk: add table lookup to mux) caused the following build 
> error on imx_v4_v5_defconfig/imx_v6_v7_defconfig:
> 
> arch/arm/mach-imx/clk-busy.c:172:11: error: 'struct clk_mux' has no member named 'width'
> 
> Fix it by passing the 'mask' field.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Oops!  I just sent the same patch to the list.  I'll take yours into
clk-next since you were first Fabio ;-)

Thanks,
Mike

> ---
>  arch/arm/mach-imx/clk-busy.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
> index 1ab91b5..85b728c 100644
> --- a/arch/arm/mach-imx/clk-busy.c
> +++ b/arch/arm/mach-imx/clk-busy.c
> @@ -169,7 +169,7 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
>  
>         busy->mux.reg = reg;
>         busy->mux.shift = shift;
> -       busy->mux.width = width;
> +       busy->mux.mask = BIT(width) - 1;
>         busy->mux.lock = &imx_ccm_lock;
>         busy->mux_ops = &clk_mux_ops;
>  
> -- 
> 1.7.9.5
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Peter De Schrijver - March 27, 2013, 9:47 a.m.
On Tue, Mar 26, 2013 at 02:42:10PM +0100, Fabio Estevam wrote:
> Commit ce4f3313b05 (clk: add table lookup to mux) caused the following build 
> error on imx_v4_v5_defconfig/imx_v6_v7_defconfig:
> 
> arch/arm/mach-imx/clk-busy.c:172:11: error: 'struct clk_mux' has no member named 'width'
> 
> Fix it by passing the 'mask' field.
> 

Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>

Thanks for fixing this before I had time to do it.

Cheers,

Peter.

Patch

diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
index 1ab91b5..85b728c 100644
--- a/arch/arm/mach-imx/clk-busy.c
+++ b/arch/arm/mach-imx/clk-busy.c
@@ -169,7 +169,7 @@  struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
 
 	busy->mux.reg = reg;
 	busy->mux.shift = shift;
-	busy->mux.width = width;
+	busy->mux.mask = BIT(width) - 1;
 	busy->mux.lock = &imx_ccm_lock;
 	busy->mux_ops = &clk_mux_ops;