summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-03-26 10:42:10 -0300
committerMike Turquette <mturquette@linaro.org>2013-03-27 08:35:18 -0700
commita35e89ad91c5379bef867eac1aff46a6187f7d74 (patch)
treecc7326ee8e14beab908508f8a50892433efbff56 /arch
parentece70094f6ab2107d4313fa1802b13dab0234ac5 (diff)
downloadlinux-3.10-a35e89ad91c5379bef867eac1aff46a6187f7d74.tar.gz
linux-3.10-a35e89ad91c5379bef867eac1aff46a6187f7d74.tar.bz2
linux-3.10-a35e89ad91c5379bef867eac1aff46a6187f7d74.zip
ARM: imx: adapt clk_busy_mux to new clk_mux struct
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]
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/clk-busy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
index 1ab91b5209e..85b728cc27a 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;