]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: imx: adapt clk_busy_mux to new clk_mux struct
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 26 Mar 2013 13:42:10 +0000 (10:42 -0300)
committerMike Turquette <mturquette@linaro.org>
Wed, 27 Mar 2013 15:35:18 +0000 (08:35 -0700)
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>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: shortened $SUBJECT line]

arch/arm/mach-imx/clk-busy.c

index 1ab91b5209e6503e7742450c4dc424a15b2e651c..85b728cc27abc4db782328f9a0524cb08abc759a 100644 (file)
@@ -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;