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: 5081011 Return-Path: X-Original-To: patchwork-linux-mmc@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 0BE079F349 for ; Tue, 14 Oct 2014 16:39:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0824D20154 for ; Tue, 14 Oct 2014 16:39:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24FA120127 for ; Tue, 14 Oct 2014 16:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753601AbaJNQjU (ORCPT ); Tue, 14 Oct 2014 12:39:20 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:55252 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752909AbaJNQjT (ORCPT ); Tue, 14 Oct 2014 12:39:19 -0400 Received: by mail-pd0-f173.google.com with SMTP id g10so7829528pdj.32 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=Gv0QKzyL3GUB+KkcgFwobzX9BvhF012STqtaahVbOhe7mEv0enDejqm3+sbDBMKlyb EL2F4X7Y0YHk+13kTBJOTkOC/Nf0ZgeZszAoB6YfJwsDhM+IWLP3YJeXIPakUUpk3oA8 EvrPcyXhG+JwlzM+gJlr2qh3LpNVdi+HV2OnP82+OQsYsQ6dwGNMCTct0fRsvZQuplCt QK1Ro+IdY2gh4RRA+Bg9LY0Qznqm9ZhQuyYrS5L6XNykx6Rb1Dsla5eYErhG0Fh+VGt4 rTyMpcURLqzZR9RwqfN9NPHEDTLgHz3KVmSiExe1nU7UxjzGyh5KsqzTflZNr7j+5RY8 aWVQ== X-Gm-Message-State: ALoCoQllE+d55GctMUDJ4hq+b1d0FsIPxn/yAb79qkLdv5JFHnl7DJXRhlEPmZBVdrmQQ6y5DMiX 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 Cc: Addy Ke , Sonny Rao , Alim Akhtar , Andrew Bresticker , Doug Anderson , heiko@sntech.de, chris@printf.net, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 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