From patchwork Thu Sep 18 05:35:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 4929591 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 465F09F2EC for ; Thu, 18 Sep 2014 07:33:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B23F200E6 for ; Thu, 18 Sep 2014 07:34:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CCE3200DE for ; Thu, 18 Sep 2014 07:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755786AbaIRHe3 (ORCPT ); Thu, 18 Sep 2014 03:34:29 -0400 Received: from [65.55.169.119] ([65.55.169.119]:35048 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755581AbaIRHe2 (ORCPT ); Thu, 18 Sep 2014 03:34:28 -0400 X-Greylist: delayed 4675 seconds by postgrey-1.27 at vger.kernel.org; Thu, 18 Sep 2014 03:34:27 EDT Received: from CH1PR03CA002.namprd03.prod.outlook.com (10.255.156.147) by BY2PR0301MB0631.namprd03.prod.outlook.com (25.160.63.11) with Microsoft SMTP Server (TLS) id 15.0.1034.13; Thu, 18 Sep 2014 06:01:24 +0000 Received: from BY2FFO11FD055.protection.gbl (10.255.156.132) by CH1PR03CA002.outlook.office365.com (10.255.156.147) with Microsoft SMTP Server (TLS) id 15.0.1034.13 via Frontend Transport; Thu, 18 Sep 2014 06:01:23 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD055.mail.protection.outlook.com (10.1.15.192) with Microsoft SMTP Server (TLS) id 15.0.1029.15 via Frontend Transport; Thu, 18 Sep 2014 06:01:22 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s8I61FDk012322; Wed, 17 Sep 2014 23:01:17 -0700 Date: Thu, 18 Sep 2014 13:35:01 +0800 From: Dong Aisheng To: Ulf Hansson CC: linux-mmc , Chris Ball , Shawn Guo , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH 6/7] mmc: sdhci-esdhc-imx: add imx6sx support Message-ID: <20140918053457.GA15363@shlinux1.ap.freescale.net> References: <1409745903-26550-1-git-send-email-b29396@freescale.com> <1409745903-26550-7-git-send-email-b29396@freescale.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(979002)(6009001)(199003)(51704005)(71364002)(24434003)(24454002)(189002)(102836001)(46406003)(23726002)(54356999)(50986999)(99396002)(230783001)(97736003)(64706001)(50466002)(107046002)(84676001)(87936001)(76176999)(90102001)(26826002)(97756001)(21056001)(106466001)(95666004)(47776003)(20776003)(4396001)(31966008)(105606002)(575784001)(6806004)(83322001)(19580405001)(33656002)(92566001)(79102003)(83506001)(92726001)(110136001)(44976005)(85306004)(76482002)(104016003)(74662003)(85852003)(74502003)(19580395003)(46102003)(83072002)(77982003)(81342003)(81542003)(68736004)(80022003)(32563001)(42262002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0631; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0631; X-Forefront-PRVS: 033857D0BD Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Aisheng.Dong@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 On Thu, Sep 18, 2014 at 12:29:52AM +0200, Ulf Hansson wrote: > On 3 September 2014 14:05, Dong Aisheng wrote: > > The imx6sx usdhc is derived from imx6sl, the difference is minor. > > imx6sx have the errata ESDHC_FLAG_ERR004536 fixed. > > So introduce a new compatible string for imx6sx to distinguish them. > > > > Signed-off-by: Dong Aisheng > > Hi Dong, > > This one has checkpatch errors due to missing DT documentation. > The original binding doc is writing in the format of: Required properties: -- compatible : Should be "fsl,-esdhc" It just provides a rule and does not provide the specific compatible string. So i did not update the doc before. But i think it's better to fix it to avoid future warning again. Can you help add below patch before this commit or do you need me to resend the patch series again with this patch added? From 467b84e5ffcba543b9ac88913b1d2dc1159dfa72 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Thu, 18 Sep 2014 13:11:03 +0800 Subject: [PATCH 6/8] mmc: sdhci-esdhc-imx: using specific compatible string in binding doc Using specific compatible string in binding doc to make the binding more clear. It's also used to avoid checkpatch warning in the future like follows: 0005-mmc-sdhci-do-not-enable-card-cd-wakeup-for-gpio-case.patch has no obvious style problems and is ready for submission. WARNING: DT compatible string "fsl,imx6sx-usdhc" appears un-documented -- check ./Documentation/devicetree/bindings/ + { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, }, total: 0 errors, 1 warnings, 18 lines checked Signed-off-by: Dong Aisheng --- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) -- 1.7.8 Regards Dong Aisheng > Kind regards > Uffe > > > --- > > drivers/mmc/host/sdhci-esdhc-imx.c | 6 ++++++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > > index dc0e384..87179c4 100644 > > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > > @@ -150,6 +150,11 @@ static struct esdhc_soc_data usdhc_imx6sl_data = { > > | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_ERR004536, > > }; > > > > +static struct esdhc_soc_data usdhc_imx6sx_data = { > > + .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING > > + | ESDHC_FLAG_HAVE_CAP1, > > +}; > > + > > struct pltfm_imx_data { > > u32 scratchpad; > > struct pinctrl *pinctrl; > > @@ -190,6 +195,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = { > > { .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, }, > > { .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, }, > > { .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, }, > > + { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, }, > > { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, }, > > { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, }, > > { /* sentinel */ } > > -- > > 1.7.8 > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index 9046ba06..c415d34 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -7,7 +7,14 @@ This file documents differences between the core properties described by mmc.txt and the properties used by the sdhci-esdhc-imx driver. Required properties: -- compatible : Should be "fsl,-esdhc" +- compatible : Should be "fsl,-esdhc", the supported chips include + "fsl,imx25-esdhc" + "fsl,imx35-esdhc" + "fsl,imx51-esdhc" + "fsl,imx53-esdhc" + "fsl,imx6q-usdhc" + "fsl,imx6sl-usdhc" + "fsl,imx6sx-usdhc" Optional properties: - fsl,cd-controller : Indicate to use controller internal card detection