From patchwork Tue Oct 14 16:39:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5081061 Return-Path: X-Original-To: patchwork-linux-arm@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 F3A0EC11AC for ; Tue, 14 Oct 2014 16:41:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1916120158 for ; Tue, 14 Oct 2014 16:41:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 54B1520154 for ; Tue, 14 Oct 2014 16:41:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xe58S-0004XI-Nz; Tue, 14 Oct 2014 16:39:44 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xe58P-0004Tl-Jm for linux-arm-kernel@lists.infradead.org; Tue, 14 Oct 2014 16:39:42 +0000 Received: by mail-pa0-f46.google.com with SMTP id fa1so8194571pad.33 for ; Tue, 14 Oct 2014 09:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=yRPhIVyDoBIFcpTKHoKmP2SVjmUvDY8CXPtbPGvKSNg=; b=b0kguFYmKJjkVysfQ19tBmY4TkVaRBDE4xq1nI7CAnlU8O8iPY3YSC24Us1QbNeQYr bg3j9pMK7Y9cqEsMI/bM7oaL5rUw9vbeR0CmJpOMGOOxC9MFatscevM2YbKOxUjhCZoV s1mn5Gg4kRRoo6bKZvhIcECfYl9p9c9dhmTb4= 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; bh=yRPhIVyDoBIFcpTKHoKmP2SVjmUvDY8CXPtbPGvKSNg=; b=kcYlNGNyorxsS6+Rzl+1J7m8QhfURE7XObWliIpINGYoJNUS9oWES+b5u+r/OBHEEK 8A/eIQXYcWUC0dSTHBye8rOItUlTEBEFm5XhfPOKtfXfke5P3LGTBoC3WGVJrTk43p+6 2Hf/6n5EBnvA68f2UxIilB4pO3R2V5x5nYkqbE1enwTmfc/vSKMIopcymSbcQL9BcnRF 5zW+0718Zxdkq0EtxWo8QyortdAxgIaeJnQ10wAL93hl7jUHUqqrE+yfDfphwYrQclHt Bdw5L1+InsmiSoCwjDOhNhPs+CYPKuht6d2SSett/E5BIrFkSu83FzkS9wRtTnvWMEko HLMA== X-Gm-Message-State: ALoCoQlUtqLeDsYqLvSY6WDfmRpvbGFE7yQAgtmzlGVodBM9Sjf5tbPsAY/KK6St73OVbYwDA3qx X-Received: by 10.70.38.165 with SMTP id h5mr6171550pdk.121.1413304759410; Tue, 14 Oct 2014 09:39:19 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by mx.google.com with ESMTPSA id db7sm14718599pdb.27.2014.10.14.09.39.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 09:39:18 -0700 (PDT) From: Doug Anderson To: Ulf Hansson , Seungwon Jeon , Jaehoon Chung Subject: [PATCH] mmc: dw_mmc: rockchip: Don't recalc the clock when it goes off Date: Tue, 14 Oct 2014 09:39:12 -0700 Message-Id: <1413304752-7823-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141014_093941_674434_0FDB5E2F X-CRM114-Status: GOOD ( 10.79 ) X-Spam-Score: -0.8 (/) Cc: Addy Ke , heiko@sntech.de, Andrew Bresticker , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Doug Anderson , chris@printf.net, linux-rockchip@lists.infradead.org, Alim Akhtar , Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 The "set_ios" function is called with a clock of 0 when the clock is turning off. There's no reason to go through all the extra Rockchip logic (whose goal is to make sure DIV is 0 or 1) in that case. The Rockchip logic happened to work because the CCF will pick the lowest possible rate when you ask it for a clock of 0, but it's silly to go through all the remuxing and adjusting for no reason. Signed-off-by: Doug Anderson Acked-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc-rockchip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index f0c2cb1..bbb4ec3 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -37,6 +37,9 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) unsigned int cclkin; u32 bus_hz; + if (ios->clock == 0) + return; + /* * cclkin: source clock of mmc controller * bus_hz: card interface clock generated by CLKGEN