From patchwork Wed Jan 22 11:46:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 3522701 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D593CC02DC for ; Wed, 22 Jan 2014 11:47:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D42FA2013D for ; Wed, 22 Jan 2014 11:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C40E020035 for ; Wed, 22 Jan 2014 11:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932087AbaAVLrZ (ORCPT ); Wed, 22 Jan 2014 06:47:25 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:42411 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755372AbaAVLqO (ORCPT ); Wed, 22 Jan 2014 06:46:14 -0500 Received: by mail-wg0-f52.google.com with SMTP id b13so220877wgh.31 for ; Wed, 22 Jan 2014 03:46:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Hnt25sn2vr1JjdfetUo2SAUiNsm6QwnV5jT1eE2Ek+k=; b=jgtoCOHOFbtwSABXOxt/sPMSgelJA7wJLvXAmENEYa+Pu2E2PyZMpYa4btJ9d3ChSL CeH8gub4VxBqIDbueWbXVWpnMgxwtBUwSSl1tZ0zAzcHTeO45nfEvLy208BA+TC/csRK KM+UOcf90hpJTlo2IYMmGz+1v+gcoCAv/3ipeu1LbJQSKLWjMdiZwVFVgbjqNrdDcPbd 3LHLZLwWdujihVA+FftJw0UJB9z483a8+zC4P5bGmlgsSmlq8M4Yah5it9CgvyHJwR3n O4YJKU/Nz0BYWCx8ArTWNGDUz9xX4CLE0k03U3EBWIH7F/b0iymZvywYp/I5F026h1nR q9cQ== X-Gm-Message-State: ALoCoQkqngBXoiVHt80XwYHKlgl/4redYm+eg25elKGs2ZpI1I+RfWBOX7nLLIuDheR3LhSTkmEs X-Received: by 10.194.71.47 with SMTP id r15mr1255505wju.19.1390391173889; Wed, 22 Jan 2014 03:46:13 -0800 (PST) Received: from panicking.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by mx.google.com with ESMTPSA id kr10sm14297368wjc.22.2014.01.22.03.46.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 03:46:13 -0800 (PST) From: Michael Trimarchi To: linux-mmc@vger.kernel.org Cc: Chris Ball , linux-kernel@vger.kernel.org, Sekhar Nori , Manjunathappa Prakash Subject: [RFC PATCH 3/3] ARM: mmc: davinci: clock rate is an unsigned long Date: Wed, 22 Jan 2014 12:46:05 +0100 Message-Id: <1390391165-27906-4-git-send-email-michael@amarulasolutions.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1390391165-27906-1-git-send-email-michael@amarulasolutions.com> References: <1390391165-27906-1-git-send-email-michael@amarulasolutions.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Michael Trimarchi --- drivers/mmc/host/davinci_mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 13ac664..0181780 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -183,7 +183,7 @@ struct mmc_davinci_host { struct mmc_data *data; struct mmc_host *mmc; struct clk *clk; - unsigned int mmc_input_clk; + unsigned long mmc_input_clk; void __iomem *base; struct resource *mem_res; int mmc_irq, sdio_irq; @@ -654,9 +654,10 @@ static void mmc_davinci_request(struct mmc_host *mmc, struct mmc_request *req) } static unsigned int calculate_freq_for_card(struct mmc_davinci_host *host, - unsigned int mmc_req_freq) + unsigned long mmc_req_freq) { - unsigned int mmc_freq = 0, mmc_pclk = 0, mmc_push_pull_divisor = 0; + unsigned long mmc_freq = 0, mmc_pclk = 0; + unsigned int mmc_push_pull_divisor = 0; mmc_pclk = host->mmc_input_clk; if (mmc_req_freq && mmc_pclk > (2 * mmc_req_freq)) @@ -1105,7 +1106,7 @@ static int mmc_davinci_cpufreq_transition(struct notifier_block *nb, unsigned long val, void *data) { struct mmc_davinci_host *host; - unsigned int mmc_pclk; + unsigned long mmc_pclk; struct mmc_host *mmc; unsigned long flags;