From patchwork Fri Dec 30 06:30:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 709661 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 3tqc9854Dkz9ssP for ; Fri, 30 Dec 2016 17:33:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DB2D3B39E3; Fri, 30 Dec 2016 07:31:59 +0100 (CET) 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 WTsZWbVpMNrD; Fri, 30 Dec 2016 07:31:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1840BB39CD; Fri, 30 Dec 2016 07:31:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BAC53A75F1 for ; Fri, 30 Dec 2016 07:30:43 +0100 (CET) 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 TahXgBj7Bl7V for ; Fri, 30 Dec 2016 07:30:43 +0100 (CET) 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 A9FDFA75FD for ; Fri, 30 Dec 2016 07:30:38 +0100 (CET) Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OIZ017OTJER2T90@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 30 Dec 2016 15:30:27 +0900 (KST) Received: from epsmges5p5.samsung.com (unknown [182.195.40.70]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20161230063027epcas1p256ac221aa182b51877d374dd0d4bd7bb~U9OGaz2AT0844008440epcas1p2k; Fri, 30 Dec 2016 06:30:27 +0000 (GMT) Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p5.samsung.com (EPCPMTA) with SMTP id FC.22.12277.30FF5685; Fri, 30 Dec 2016 15:30:27 +0900 (KST) Received: from epcpsbgm2new.samsung.com (u27.gpu120.samsung.co.kr [203.254.230.27]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20161230063025epcas5p240799cc6918283eb25ae7fba64e8a7c0~U9OFVwq5V0946909469epcas5p2o; Fri, 30 Dec 2016 06:30:25 +0000 (GMT) X-AuditID: b6c32a59-f79486d000002ff5-bf-5865ff03a993 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 17.FA.28332.10FF5685; Fri, 30 Dec 2016 15:30:25 +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 <0OIZ00728JEN3RC0@mmp2.samsung.com>; Fri, 30 Dec 2016 15:30:25 +0900 (KST) From: Jaehoon Chung To: u-boot@lists.denx.de Date: Fri, 30 Dec 2016 15:30:21 +0900 Message-id: <20161230063021.23756-12-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.2 In-reply-to: <20161230063021.23756-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJKsWRmVeSWpSXmKPExsWy7bCmhi7z/9QIg1XHWSxu/GpjtXi7t5Pd gcnj7J0djB59W1YxBjBFpdpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam 2iq5+AToumXmAM1XUihLzCkFCgUkFhcr6dvZFOWXlqQqZOQXl9gqRRsaGukZGpjrGRkZ6ZkY x1oZmQKVJKRmnLlzl7VgOnfFlIZ3jA2MPZxdjJwcEgImEjNmT2WGsMUkLtxbz9bFyMUhJLCU UeLM3h+sEE47k8TxBbeYYTq+dSxnhkjMYZTYt/QuI4Tzg1Gi6c48JpAqNgEdie3fjoPZIgIS Er/6rzKC2MwCWhJTdt5hA7GFBRIkZt04CLSCg4NFQFXi90ZTkDCvgI3Ev+cNbBDL5CUWnj8C NoYTKN50airYeRICO9gk7v/4DdYrISArsekA1HEuEje3vGGEsIUlXh3fwg5hS0v8XXqLEaK3 m1Hi35eNUIN6GCVubV3NBFFlLHH/wT1miEP5JHp/P2GCWMAr0dEmBFHiIXGr/SJU2FGi9TEH xO/9jBKXV5ximcAos4CRYRWjWGpBcW56arFpgalecWJucWleul5yfu4mRnCy0IrcwXhlZtAh RgEORiUe3gdrUiOEWBPLiitzDzFKcDArifBm/QUK8aYkVlalFuXHF5XmpBYfYjQFBtNEZinR 5HxgIssriTc0MTM0MbIEQnNDcyVx3gUV1hFCAumJJanZqakFqUUwfUwcnFINjA3zuDYIzHzQ 9Hlj33OTSQtCJcplZQOXVWYduOHtKrEqla/vFHvXVKP1OXMzbrppfj2/b02BLkf88bo5P5uv nZnzev2ZuNPKphWpf3g1NXz36/hv3s68/JeYXU/AZ6u18+77WGt+sPv5JDFLrUB+rwbng8hD H58LxT/3e23OP/OgXZRfoCanuhJLcUaioRZzUXEiANY4iv4sAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCLMWRmVeSWpSXmKPExsVy+t9jQV3G/6kRBpP+Wljc+NXGavF2bye7 A5PH2Ts7GD36tqxiDGCKcrPJSE1MSS1SSM1Lzk/JzEu3VQoNcdO1UFLIS8xNtVWK0PUNCVJS KEvMKQXyjAzQgINzgHuwkr5dglvGmTt3WQumc1dMaXjH2MDYw9nFyMkhIWAi8a1jOTOELSZx 4d56ti5GLg4hgVmMElM/3IByfjBKND17yw5SxSagI7H923EmEFtEQELiV/9VRhCbWUBLYsrO O2wgtrBAgsSsGwdZuxg5OFgEVCV+bzQFCfMK2Ej8e97ABrFMXmLh+SNgYziB4k2nprKBlAsJ WEtcup49gZF3ASPDKkaJ1ILkguKk9FyjvNRyveLE3OLSvHS95PzcTYzgEHwmvYPx8C73Q4wC HIxKPLw/ylIjhFgTy4orcw8xSnAwK4nwZv0FCvGmJFZWpRblxxeV5qQWH2I0BTprIrOUaHI+ MD7ySuINTcxNzI0NLMwtLU2MlMR5G2c/CxcSSE8sSc1OTS1ILYLpY+LglGpgbOl415b88S77 p/TOtqXLxa3DtxRuZDdgUH71SER2ucDFaF9ug5k1b97nNneJXA6/+vz+xZmy+kbRjkfeie10 6ahj51+zLv3yvEMcXtdmmBxYG3Ba6p8899lptX93d17sfFJ755RRPEeO7TQH8/lcPx+/r1l6 p0zgdR6fTTRH5nv7yfMLKkTNlFiKMxINtZiLihMB7ePg0FcCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161230063025epcas5p240799cc6918283eb25ae7fba64e8a7c0 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?7KCV7J6s7ZuIG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbUzUo7LGF7J6EKS/ssYXsnoQ=?= X-Global-Sender: =?UTF-8?B?SmFlaG9vbiBDaHVuZxtUaXplbiBQbGF0Zm9ybSBMYWIuG1Nh?= =?UTF-8?B?bXN1bmcgRWxlY3Ryb25pY3MbUzUvU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161230063025epcas5p240799cc6918283eb25ae7fba64e8a7c0 X-RootMTR: 20161230063025epcas5p240799cc6918283eb25ae7fba64e8a7c0 References: <20161230063021.23756-1-jh80.chung@samsung.com> Subject: [U-Boot] [PATCH 11/11] mmc: sdhci: combine the Host controller v3.0 feature into one condition 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" It doesn't need to seperate the condition. Signed-off-by: Jaehoon Chung --- drivers/mmc/sdhci.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 5d8969a..3a1f4f7 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -572,9 +572,16 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->voltages |= host->voltages; cfg->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; + + /* Since Host Controller Version3.0 */ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { if (!(caps & SDHCI_CAN_DO_8BIT)) cfg->host_caps &= ~MMC_MODE_8BIT; + + /* Find out whether clock multiplier is supported */ + caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); + host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> + SDHCI_CLOCK_MUL_SHIFT; } if (host->host_caps) @@ -582,16 +589,6 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; - /* - * In case of Host Controller v3.00, find out whether clock - * multiplier is supported. - */ - if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { - caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); - host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> - SDHCI_CLOCK_MUL_SHIFT; - } - return 0; }