From patchwork Fri Sep 4 15:32:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 7124131 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0D5719F1D5 for ; Fri, 4 Sep 2015 15:37:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21DB020839 for ; Fri, 4 Sep 2015 15:37:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 273A72083E for ; Fri, 4 Sep 2015 15:36:59 +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 1ZXt1M-0002TD-TM; Fri, 04 Sep 2015 15:35:20 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZXt1D-000148-9W for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2015 15:35:12 +0000 Received: by pacfv12 with SMTP id fv12so27997459pac.2 for ; Fri, 04 Sep 2015 08:34:50 -0700 (PDT) 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=uc73q+KGFzx0kwX9ZnXEnZex57kcoHZkGT5HXWoxtV8=; b=jHOo7DmPEn8fMQpa2heLQjIoqQoZj5ry7HEmMMaA9uZKbvrWyz5liH3zZCs/p/Y1gj p/oGijueHK90NHdiQ4MuF8q3LwjXFnYGoXbQtgt88l1YG3QNpG+H9b6eLzYFF8kuioi8 2nmk7kOnhd+4Jgq7wo/ytZMGwIu4SO0/c6TumKTYJKMsUAhsSIzryVwmvkeb5f0MtlG0 myP+/Nab6StzGMRIXHBSnL9kwi72JVdysX5yq3Sg0hP+RET6a7QCTf4Fcn8/R/FiJO6k ia9pAx/by9/ADDjlx5gHJYzPUFI2CaLSxNTr+oiWoU5nMUjnx4411tfJrXYXk9b4NJI1 6+RQ== X-Gm-Message-State: ALoCoQmFKTdnd96FSiWZ7APJxC8YhCtPRwn8bhq5IUM+CAjoMMXIMPjhJcJfomm8/6krcIjQbCub X-Received: by 10.68.195.231 with SMTP id ih7mr9621401pbc.26.1441380890568; Fri, 04 Sep 2015 08:34:50 -0700 (PDT) Received: from localhost.localdomain ([202.62.93.137]) by smtp.gmail.com with ESMTPSA id gs2sm2920151pbc.15.2015.09.04.08.34.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Sep 2015 08:34:49 -0700 (PDT) From: Vaibhav Hiremath To: linux-mmc@vger.kernel.org Subject: [PATCH 2/5] mmc: sdhci-pxav3: Add platform specific set_clock ops Date: Fri, 4 Sep 2015 21:02:18 +0530 Message-Id: <1441380741-13115-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441380741-13115-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1441380741-13115-1-git-send-email-vaibhav.hiremath@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150904_083511_499980_C921E71A X-CRM114-Status: GOOD ( 16.93 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vaibhav Hiremath , ulf.hansson@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kliu5@marvell.com 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=-4.2 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 In case of PXA1928 & family of devices, the TX BUS and internal clock need to be set as part of ->set_clock() ops, so this patch adds platform specific ->set_clock() operation. Note that, in order to not break other platforms, this patch introduced the flag, which controls whether controller/platform specific clock configuration needs to be executed. Signed-off-by: Vaibhav Hiremath --- drivers/mmc/host/sdhci-pxav3.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index aecae04..c2b2b78 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -48,6 +48,10 @@ #define SDCFG_GEN_PAD_CLK_CNT_MASK 0xFF #define SDCFG_GEN_PAD_CLK_CNT_SHIFT 24 +#define SD_FIFO_PARAM 0x104 +#define INTERNAL_CLK_GATE_CTRL BIT(8) +#define INTERNAL_CLK_GATE_ON BIT(9) + #define SD_SPI_MODE 0x108 #define SD_CE_ATA_1 0x10C @@ -57,6 +61,9 @@ #define SD_RX_CFG_REG 0x114 +#define TX_CFG_REG 0x118 +#define TX_INTERNAL_SEL_BUS_CLK BIT(30) + /* IO Power control */ #define IO_PWR_AKEY_ASFAR 0xbaba #define IO_PWR_AKEY_ASSAR 0xeb10 @@ -68,6 +75,9 @@ struct sdhci_pxa_data { u8 sdclk_delay_shift; u8 sdclk_sel_mask; u8 sdclk_sel_shift; + + /* set this if platform needs separate clock configuration */ + bool set_pltfrm_clk; /* * We have few more differences, add them along with their * respective feature support @@ -90,6 +100,7 @@ static struct sdhci_pxa_data pxav3_data_v1 = { .sdclk_delay_shift = 9, .sdclk_sel_mask = 0x1, .sdclk_sel_shift = 8, + .set_pltfrm_clk = false, }; static struct sdhci_pxa_data pxav3_data_v2 = { @@ -99,6 +110,7 @@ static struct sdhci_pxa_data pxav3_data_v2 = { /* Only set SDCLK_SEL1, as driver uses default value of SDCLK_SEL0 */ .sdclk_sel_mask = 0x3, .sdclk_sel_shift = 2, /* SDCLK_SEL1 */ + .set_pltfrm_clk = true, }; /* @@ -375,8 +387,40 @@ static void pxav3_voltage_switch(struct sdhci_host *host, writel(val, pxa->io_pwr_reg); } +static void pxav3_set_tx_clock(struct sdhci_host *host) +{ + u32 val; + + val = sdhci_readl(host, TX_CFG_REG); + val |= TX_INTERNAL_SEL_BUS_CLK; + sdhci_writel(host, val, TX_CFG_REG); +} + +static void pxav3_set_clock(struct sdhci_host *host, unsigned int clock) +{ + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_pxa *pxa = pltfm_host->priv; + + /* We still use common sdhci_set_clock() */ + sdhci_set_clock(host, clock); + + /* platform/controller specific clock configuration */ + if (pxa->data->set_pltfrm_clk && clock != 0) { + u32 val; + + val = sdhci_readw(host, SD_FIFO_PARAM); + /* Internal clock gate ON and CTRL = 0b11 */ + val |= INTERNAL_CLK_GATE_CTRL | INTERNAL_CLK_GATE_ON; + sdhci_writew(host, val, SD_FIFO_PARAM); + + /* TX internal clock selection */ + pxav3_set_tx_clock(host); + } + +} + static const struct sdhci_ops pxav3_sdhci_ops = { - .set_clock = sdhci_set_clock, + .set_clock = pxav3_set_clock, .platform_send_init_74_clocks = pxav3_gen_init_74_clocks, .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width,