From patchwork Mon Jan 7 10:11:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 10750253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D0A16C5 for ; Mon, 7 Jan 2019 10:12:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BF1028A7A for ; Mon, 7 Jan 2019 10:12:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A42628A8F; Mon, 7 Jan 2019 10:12:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFFC628A8E for ; Mon, 7 Jan 2019 10:12:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726667AbfAGKML (ORCPT ); Mon, 7 Jan 2019 05:12:11 -0500 Received: from mail-eopbgr130073.outbound.protection.outlook.com ([40.107.13.73]:43744 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726540AbfAGKML (ORCPT ); Mon, 7 Jan 2019 05:12:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ajiM2OiiILvEIHERt/QLXwQ3o0g3TnTWK9RiXneX2dI=; b=Iz7gecoKR8ZZ3cwuGQEjD9UeitRvQAtECiN8tbYgBCvvlv/4g3c3gonvBciMAQ1ZuX2GhhMi9l99XsNZINEVLnBUkA5phzj/fPp7EV/iQSd7Am1ZtdbA3AwX0/r+0jYjRu4UotNWZhP7gModTlcCyfjy7BYoyj1Dutl01JetTN4= Received: from VI1PR04MB5040.eurprd04.prod.outlook.com (20.177.50.97) by VI1PR04MB2126.eurprd04.prod.outlook.com (10.166.43.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.7; Mon, 7 Jan 2019 10:11:32 +0000 Received: from VI1PR04MB5040.eurprd04.prod.outlook.com ([fe80::ed39:18ba:6fbc:d025]) by VI1PR04MB5040.eurprd04.prod.outlook.com ([fe80::ed39:18ba:6fbc:d025%2]) with mapi id 15.20.1495.011; Mon, 7 Jan 2019 10:11:32 +0000 From: BOUGH CHEN To: "ulf.hansson@linaro.org" , "adrian.hunter@intel.com" CC: dl-linux-imx , "linux-mmc@vger.kernel.org" Subject: [PATCH 2/5] mmc: sdhci-esdhc-imx: add HS400_ES support for i.MX8QXP Thread-Topic: [PATCH 2/5] mmc: sdhci-esdhc-imx: add HS400_ES support for i.MX8QXP Thread-Index: AQHUpnFdC0S4zA/mvEWnD9OT01zTDQ== Date: Mon, 7 Jan 2019 10:11:32 +0000 Message-ID: <20190107101757.27647-2-haibo.chen@nxp.com> References: <20190107101757.27647-1-haibo.chen@nxp.com> In-Reply-To: <20190107101757.27647-1-haibo.chen@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 x-clientproxiedby: HK2PR04CA0052.apcprd04.prod.outlook.com (2603:1096:202:14::20) To VI1PR04MB5040.eurprd04.prod.outlook.com (2603:10a6:803:59::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=haibo.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.121.68.129] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB2126;6:YGONttSL0S18sH+xdCqjUWC+9NDIVPbPlYnRCjIXt29o/kW9LImIlctIxwlP0YaVQ8aUPwJ5a7O/ynhTS4zd7m/VfuiNfJ42At0vbnIAaohM5GANbPWwujrB14wrav1sZ6UxjXsd6V0q8VQUCu+K2/4mSbOS4SHd0DPKEV52mMcG2YvDtc7fGtOD45XyfWOSk0AmLquvv4vnA0lRf9P/G74NwHHgntN5jyr+hU0L+J8Ve8vn70O8B66W2HqSOo/HpYOJS4pd3cVAFp746iVLs9wRIU3bgOjJWfKfjBWFc2vD5SszOavxaZ6b6YJzyngvbCIoJPRd3dlxcK7lQv3tWM+yYly9fGDzVPFkaEJz7HpcLnXgzGELfVOXQxIITsCrrRSUvzM4hbi2AL3e8cyFywZ7fn3ZewK2y85mtdHgUOT0I6pymp4CcOUm77LK2KxEW3e1INorGbP+eLt1/YHfKQ==;5:EJeDHZNBCSpDY1bBREqVj6lNgpxfCpqRtqriQepGrNVlVIzCV8myUhLfhQzTrGIuhHmz/3Uqwypx1g9Fr/oERKTafKxmYIElyvlYVhGrbDEhmfu+mTAHNsxZmOYeW/tB45w8uMMASypramsvL5MB1M4JMPB7918odp1FNLi4wS6Ie9ZvWPsP8KSNVZHLNErYk6aDWZgW8eWSe2wpivXk6w==;7:wd740CUX5wRhSYovBGd7qt832+h5IoiLFa3Fc8WP9N+HRr8MjyaJ4wJHIwMMNCMlgQFDwS4WpJ4SPVrKf8jfHIEJrgvjCwB4WRxHeXzEybaLWILLr6p3ZiVQea9xp6zoV6U/Ou4NkWap3YOk5Radag== x-ms-office365-filtering-correlation-id: 30225800-91fe-4534-e6aa-08d674887f8e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB2126; x-ms-traffictypediagnostic: VI1PR04MB2126: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(10201501046)(3231475)(944501520)(52105112)(93006095)(93001095)(3002001)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB2126;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB2126; x-forefront-prvs: 0910AAF391 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(366004)(136003)(396003)(376002)(346002)(199004)(189003)(8676002)(76176011)(81156014)(81166006)(50226002)(305945005)(5660300001)(106356001)(52116002)(110136005)(71200400001)(2501003)(54906003)(486006)(8936002)(4326008)(102836004)(575784001)(478600001)(7736002)(316002)(14454004)(256004)(71190400001)(86362001)(105586002)(3846002)(6116002)(186003)(6512007)(53936002)(386003)(99286004)(6506007)(97736004)(26005)(2616005)(11346002)(476003)(66066001)(6436002)(36756003)(25786009)(53346004)(68736007)(446003)(1076003)(6486002)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB2126;H:VI1PR04MB5040.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: I3qQM4aTw5BIyCBoGrAVkwLNr6PpBF0sUjD+fQfU+bD/MHnIjXlB6VLQ8u2isqnRKvdw63YGa3KNd5Fk/IJlYH4peaSbA0mv6u6aLgH87OY2oUJa5/g+2cUjCibuuUCxTQeepX1TfCkn8psE9pSUZ/QAMLAGv7f0WmFeWOauE3OtJ0jseiOd2F37QZ+guPHzbWttyJFWdJAWUYWMExEHDHhOy3bEMQhxNvSZ8z3UU9JA7Q09c8EflYbSnWbEOcYEonAepdgRqDB4lA/8VE0bnPQ+hed6amrbeeaVeVIDA9Y3vX35up3IoJeUs9Jum3XC spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30225800-91fe-4534-e6aa-08d674887f8e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2019 10:11:29.9887 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2126 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add an new esdhc_soc_data for i.MX8QXP, and add HS400_ES mode support. Signed-off-by: Haibo Chen Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci-esdhc-imx.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 0489b60b8eb4..08bba97706d0 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -52,6 +52,7 @@ #define ESDHC_MIX_CTRL_AUTO_TUNE_EN (1 << 24) #define ESDHC_MIX_CTRL_FBCLK_SEL (1 << 25) #define ESDHC_MIX_CTRL_HS400_EN (1 << 26) +#define ESDHC_MIX_CTRL_HS400_ES_EN (1 << 27) /* Bits 3 and 6 are not SDHCI standard definitions */ #define ESDHC_MIX_CTRL_SDHCI_MASK 0xb7 /* Tuning bits */ @@ -140,6 +141,8 @@ #define ESDHC_FLAG_HS200 BIT(8) /* The IP supports HS400 mode */ #define ESDHC_FLAG_HS400 BIT(9) +/* The IP supports HS400ES mode */ +#define ESDHC_FLAG_HS400_ES BIT(10) struct esdhc_soc_data { u32 flags; @@ -182,6 +185,12 @@ static struct esdhc_soc_data usdhc_imx7d_data = { | ESDHC_FLAG_HS400, }; +static struct esdhc_soc_data usdhc_imx8qxp_data = { + .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING + | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200 + | ESDHC_FLAG_HS400 | ESDHC_FLAG_HS400_ES, +}; + struct pltfm_imx_data { u32 scratchpad; struct pinctrl *pinctrl; @@ -227,6 +236,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = { { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, }, { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, }, { .compatible = "fsl,imx7d-usdhc", .data = &usdhc_imx7d_data, }, + { .compatible = "fsl,imx8qxp-usdhc", .data = &usdhc_imx8qxp_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_esdhc_dt_ids); @@ -863,6 +873,19 @@ static int esdhc_executing_tuning(struct sdhci_host *host, u32 opcode) return ret; } +static void esdhc_hs400_enhanced_strobe(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct sdhci_host *host = mmc_priv(mmc); + u32 m; + + m = readl(host->ioaddr + ESDHC_MIX_CTRL); + if (ios->enhanced_strobe) + m |= ESDHC_MIX_CTRL_HS400_ES_EN; + else + m &= ~ESDHC_MIX_CTRL_HS400_ES_EN; + writel(m, host->ioaddr + ESDHC_MIX_CTRL); +} + static int esdhc_change_pinstate(struct sdhci_host *host, unsigned int uhs) { @@ -1334,6 +1357,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) if (imx_data->socdata->flags & ESDHC_FLAG_HS400) host->quirks2 |= SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400; + if (imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) { + host->mmc->caps2 |= MMC_CAP2_HS400_ES; + host->mmc_host_ops.hs400_enhanced_strobe = + esdhc_hs400_enhanced_strobe; + } + if (of_id) err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data); else