From patchwork Fri Sep 23 10:14:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 674025 X-Patchwork-Delegate: jh80.chung@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sgTkX3Lbcz9syB for ; Fri, 23 Sep 2016 20:15:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B33D2A76DD; Fri, 23 Sep 2016 12:14:58 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P8Ym2kgQdg67; Fri, 23 Sep 2016 12:14:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1B8C0A76D7; Fri, 23 Sep 2016 12:14:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88E50A76D7 for ; Fri, 23 Sep 2016 12:14:54 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ahx-g9pETt9t for ; Fri, 23 Sep 2016 12:14:54 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTPS id 1484BA76D4 for ; Fri, 23 Sep 2016 12:14:51 +0200 (CEST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0ODY01W5ACGO1B70@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 23 Sep 2016 19:14:48 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 6F.D2.19061.89005E75; Fri, 23 Sep 2016 19:14:48 +0900 (KST) X-AuditID: cbfee68d-f790c6d000004a75-f8-57e500985c1b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 62.78.30255.89005E75; Fri, 23 Sep 2016 19:14:48 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ODY00BVICGNUR80@mmp2.samsung.com>; Fri, 23 Sep 2016 19:14:47 +0900 (KST) From: Jaehoon Chung To: u-boot@lists.denx.de Date: Fri, 23 Sep 2016 19:14:45 +0900 Message-id: <1474625686-6181-1-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRsSkQHcGw9Nwg3tHeC1u/Gpjtfi2ZRuj xdRJm9kt3u7tZHdg8ZjdcJHF49WBVeweZ+/sYPTo27KKMYAlissmJTUnsyy1SN8ugSuj4fZt 5oIjGhWnLh9jbGDsUepi5OSQEDCRuLriFTuELSZx4d56ti5GLg4hgRWMEk8fnmOGKWr4OpsJ IjGLUeLV5pdsIAkhgR+MEs+O5YDYbAI6Etu/HWcCsUUEJCR+9V9lBLGZBRwkjk3+y9LFyMEh LOAnsXueA0iYRUBV4tC8ZawgNq+Aq8ScV3+hjpCTOHlsMivILgmB12wSvz70skI0CEh8m3wI bI6EgKzEpgNQt0lKHFxxg2UCo+ACRoZVjKKpBckFxUnpRYZ6xYm5xaV56XrJ+bmbGIHhePrf s94djLcPWB9iFOBgVOLhzVj2JFyINbGsuDL3EKMp0IaJzFKiyfnAoM8riTc0NjOyMDUxNTYy tzRTEudVlPoZLCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoHxNK/MdE6ZJZ7zzZcKmFqutnQ4 evyCS/VJS4uVE6/yudW8ml2YYTLl2cY3L3pOpgmZBwl/8ffoT02V27b2dofqgbcaXHf8jUxM smJz1Tw2q7raFD2/vG/KGr2E7A2PJk36y6vj/15E/d6thsX2+w+eOnunbkdSYOGnE+7MYrMv 27FYWe64luaixFKckWioxVxUnAgAoYZrQUICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t9jQd0ZDE/DDa6cZbe48auN1eLblm2M FlMnbWa3eLu3k92BxWN2w0UWj1cHVrF7nL2zg9Gjb8sqxgCWqAZGm4zUxJTUIoXUvOT8lMy8 dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zBygpUoKZYk5pUChgMTiYiV9O0wTQkPc dC1gGiN0fUOC4HqMDNBAwhrGjIbbt5kLjmhUnLp8jLGBsUepi5GTQ0LARKLh62wmCFtM4sK9 9WxdjFwcQgKzGCVebX7JBpIQEvjBKPHsWA6IzSagI7H923GwBhEBCYlf/VcZQWxmAQeJY5P/ snQxcnAIC/hJ7J7nABJmEVCVODRvGSuIzSvgKjHn1V92iF1yEiePTWadwMi9gJFhFaNEakFy QXFSeq5hXmq5XnFibnFpXrpecn7uJkZwyD+T2sF4cJf7IUYBDkYlHt4JdU/ChVgTy4orcw8x SnAwK4nwXvsLFOJNSaysSi3Kjy8qzUktPsRoCnTARGYp0eR8YDzmlcQbGpuYGVkamRtaGBmb K4nzPv6/LkxIID2xJDU7NbUgtQimj4mDU6qBsTgs5OvK+gVynQWvn3aKard+2e11mLnn1bdb jvuKj+gfjPcp0VcIX1j2nd3szmq7mbfEz15bfmKC48WIcwlrzogkG7JGaswpUHA7+I5xnnP2 w2v/d4Zl/GniXMj37al1yMqtptW5mqfOL15iV898zrVBzmDDxtlTfOOmdBspV0yaYi8eY7C+ TYmlOCPRUIu5qDgRAJAGG7uPAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 1/2] mmc: sdhci: use the host version value in sdhci_setup_cfg X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" "host->version" isn't a SoC specific value. It doesn't need to get in each SoC drivers. Signed-off-by: Jaehoon Chung Reviewed-by: Simon Glass --- drivers/mmc/atmel_sdhci.c | 1 - drivers/mmc/bcm2835_sdhci.c | 1 - drivers/mmc/kona_sdhci.c | 5 ----- drivers/mmc/msm_sdhci.c | 3 --- drivers/mmc/mv_sdhci.c | 4 ---- drivers/mmc/s5p_sdhci.c | 1 - drivers/mmc/sdhci.c | 6 +++++- drivers/mmc/spear_sdhci.c | 5 ----- drivers/mmc/zynq_sdhci.c | 2 -- 9 files changed, 5 insertions(+), 23 deletions(-) diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index dd6bd33..c197b09 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -29,7 +29,6 @@ int atmel_sdhci_init(void *regbase, u32 id) host->name = "atmel_sdhci"; host->ioaddr = regbase; host->quirks = 0; - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); max_clk = at91_get_periph_generated_clk(id); if (!max_clk) { printf("%s: Failed to get the proper clock\n", __func__); diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 680b754..c1d8700 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -184,7 +184,6 @@ int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq) host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; host->ops = &bcm2835_ops; - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); add_sdhci(host, emmc_freq, MIN_FREQ); return 0; diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c index 3653d00..0c4f30e 100644 --- a/drivers/mmc/kona_sdhci.c +++ b/drivers/mmc/kona_sdhci.c @@ -127,11 +127,6 @@ int kona_sdhci_init(int dev_index, u32 min_clk, u32 quirks) return -EINVAL; } - if (quirks & SDHCI_QUIRK_REG32_RW) - host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; - else - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); - add_sdhci(host, max_clk, min_clk); return ret; } diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 8d4399e..90e90bc 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -140,9 +140,6 @@ static int msm_sdc_probe(struct udevice *dev) writel(caps, host->ioaddr + SDHCI_VENDOR_SPEC_CAPABILITIES0); } - /* Set host controller version */ - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); - ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); host->mmc = &plat->mmc; if (ret) diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 82c695f..ca5f872 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -88,9 +88,5 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks) sdhci_mvebu_mbus_config((void __iomem *)regbase); } - if (quirks & SDHCI_QUIRK_REG32_RW) - host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; - else - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); return add_sdhci(host, max_clk, min_clk); } diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 3bace21..7827b28 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -71,7 +71,6 @@ static int s5p_sdhci_core_init(struct sdhci_host *host) SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8; host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); host->set_control_reg = &s5p_sdhci_set_control_reg; host->set_clock = set_mmc_clk; diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 504f2d2..7fc11c0 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -524,7 +524,11 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, return -EINVAL; } #endif - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); + if (host->quirks & SDHCI_QUIRK_REG32_RW) + host->version = + sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; + else + host->version = sdhci_readw(host, SDHCI_HOST_VERSION); cfg->name = host->name; #ifndef CONFIG_DM_MMC_OPS diff --git a/drivers/mmc/spear_sdhci.c b/drivers/mmc/spear_sdhci.c index 6ca96a2..06179cd 100644 --- a/drivers/mmc/spear_sdhci.c +++ b/drivers/mmc/spear_sdhci.c @@ -22,11 +22,6 @@ int spear_sdhci_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) host->ioaddr = (void *)regbase; host->quirks = quirks; - if (quirks & SDHCI_QUIRK_REG32_RW) - host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; - else - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); - add_sdhci(host, max_clk, min_clk); return 0; } diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 3815b94..299d820 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -36,8 +36,6 @@ static int arasan_sdhci_probe(struct udevice *dev) host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT; #endif - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); - ret = sdhci_setup_cfg(&plat->cfg, host, CONFIG_ZYNQ_SDHCI_MAX_FREQ, CONFIG_ZYNQ_SDHCI_MIN_FREQ); host->mmc = &plat->mmc;