From patchwork Sun Dec 29 19:05:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 3416821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C5CFF9F295 for ; Sun, 29 Dec 2013 19:06:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE5572010B for ; Sun, 29 Dec 2013 19:06:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9708720107 for ; Sun, 29 Dec 2013 19:06:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxLgg-0003EK-Ra; Sun, 29 Dec 2013 19:06:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxLge-0003TL-A8; Sun, 29 Dec 2013 19:06:08 +0000 Received: from mail-gg0-f175.google.com ([209.85.161.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxLgW-0003SW-V9 for linux-arm-kernel@lists.infradead.org; Sun, 29 Dec 2013 19:06:03 +0000 Received: by mail-gg0-f175.google.com with SMTP id u2so2171554ggn.20 for ; Sun, 29 Dec 2013 11:05:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version :content-transfer-encoding:to:from:in-reply-to:cc:references :message-id:user-agent:subject:date; bh=/SP2QH84vObbLibRR2g51Jif5aNgq0hGd4VmMbDViEk=; b=c5PQTJiIsBh4i8mfnCzis1xvcyX85hxN1EF18ciCfjGQMZCjxglnpMDSnV4xMwBnpp UQIgqohOsUImA1hxF/Fr96l0yg91wsllZ/wZlbo7aZ09jjSl3J3ie44ozSOWO/OKiq6i no8jgKgPsITIDD10Rl6peFQ/P6ZorC8iRmuu/zN2cmgXysW1zHcmtXD5ENgL+ctT1Tn8 hEnwTCna76MRWhQJItEcKzcw2BOIi2NsiXbw6yWRxj0+8FDVpU8p8s5DUsDTr/nPziQ6 QzXOHnVVtKdfqNPJGDNsPR21q8n/9cfoYSxE4J6HvrtuxL3YMkDQBYHYDMmfv0FIDoYh Sp/g== X-Gm-Message-State: ALoCoQkSyOnTx418+R02kvXhI0TGkSPg7M7tWTiw/v1R98DYpaZe4BVkHsQregpjjKRHC+42Cxft X-Received: by 10.236.102.200 with SMTP id d48mr41353038yhg.38.1388343936529; Sun, 29 Dec 2013 11:05:36 -0800 (PST) Received: from localhost ([2601:9:5900:1fe:ca60:ff:fe0a:8a36]) by mx.google.com with ESMTPSA id k76sm57863165yho.18.2013.12.29.11.05.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 29 Dec 2013 11:05:35 -0800 (PST) MIME-Version: 1.0 To: , dinh.linux@gmail.com, mturquette@linaro.com From: Mike Turquette In-Reply-To: <1386976031-21651-1-git-send-email-dinguyen@altera.com> References: <1386976031-21651-1-git-send-email-dinguyen@altera.com> Message-ID: <20131229190529.21400.11997@quantum> User-Agent: alot/0.3.5 Subject: Re: [GIT PULL] clk: socfpga: Clean-ups for 3.14 Date: Sun, 29 Dec 2013 11:05:29 -0800 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131229_140601_046831_400D0A70 X-CRM114-Status: GOOD ( 15.53 ) X-Spam-Score: -2.6 (--) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Quoting dinguyen@altera.com (2013-12-13 15:07:11) > Hi Mike, > > Please pull in these 3 patches that cleans up the SOCFPGA clock driver. Hi Dinh, Patch #2, "clk: socfpga: Look for the GPIO_DB_CLK by its offset" throws the following error during compilation: drivers/clk/socfpga/clk.c: In function ‘socfpga_clk_recalc_rate’: drivers/clk/socfpga/clk.c:238:27: error: invalid operands to binary & (have ‘void *’ and ‘int’) if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET) ^ make[3]: *** [drivers/clk/socfpga/clk.o] Error 1 make[2]: *** [drivers/clk/socfpga] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [drivers/clk] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [drivers] Error 2 make: *** Waiting for unfinished jobs.... Compilation can continue with the following change: I have not applied this change to the patch. Is there anything different way of handling this that you would prefer? Regards, Mike > > Thanks, > > Dinh > > The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae: > > Linux 3.13-rc1 (2013-11-22 11:30:55 -0800) > > are available in the git repository at: > > git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14 > > for you to fetch changes up to be4cf9f262a069a91d095b9c17aed44e12699236: > > clk: socfpga: Remove socfpga_init_clocks (2013-12-13 16:54:38 -0600) > > ---------------------------------------------------------------- > SOCFPGA clk cleanups for 3.14 > > ---------------------------------------------------------------- > Dinh Nguyen (3): > clk: socfpga: Map the clk manager base address in the clock driver > clk: socfpga: Look for the GPIO_DB_CLK by its offset > clk: socfpga: Remove socfpga_init_clocks > > arch/arm/mach-socfpga/socfpga.c | 5 ----- > drivers/clk/socfpga/clk.c | 31 +++++++++++++++++-------------- > 2 files changed, 17 insertions(+), 19 deletions(-) > diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c index 9350071..da6d82c 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c @@ -235,7 +235,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift; val &= div_mask(socfpgaclk->width); /* Check for GPIO_DB_CLK by its offset */ - if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET) + if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET) div = val + 1; else div = (1 << val);