Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760228Ab3CZTip (ORCPT ); Tue, 26 Mar 2013 15:38:45 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:45921 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753505Ab3CZTio (ORCPT ); Tue, 26 Mar 2013 15:38:44 -0400 From: Mike Turquette To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Mike Turquette , Shawn Guo , Peter De Schrijver Subject: [PATCH] ARM: imx: replace width with mask for clk_busy_mux Date: Tue, 26 Mar 2013 12:38:05 -0700 Message-Id: <1364326685-8545-1-git-send-email-mturquette@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1392 Lines: 38 The recent addition of table-based parent lookups[1] in the common clk_mux implementation removed the width member of struct clk_mux and replaced it with an arbitrary mask. This broke compilation for i.MX platforms using clk_busy_mux which builds upon the common clk_mux. Fixed by populating the mask member during clk_busy_mux registration instead of the now non-existent width member. [1] http://article.gmane.org/gmane.linux.ports.tegra/10028 Cc: Shawn Guo Cc: Peter De Schrijver Signed-off-by: Mike Turquette --- 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.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/