From patchwork Fri Nov 25 04:00:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9446451 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC24C60778 for ; Fri, 25 Nov 2016 04:14:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99227279E0 for ; Fri, 25 Nov 2016 04:14:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DD4A27F9A; Fri, 25 Nov 2016 04:14:19 +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=-6.9 required=2.0 tests=BAYES_00,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 5E74927EE9 for ; Fri, 25 Nov 2016 04:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbcKYEOO (ORCPT ); Thu, 24 Nov 2016 23:14:14 -0500 Received: from mail-by2nam03on0073.outbound.protection.outlook.com ([104.47.42.73]:3936 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751303AbcKYEON (ORCPT ); Thu, 24 Nov 2016 23:14:13 -0500 Received: from BN6PR03CA0030.namprd03.prod.outlook.com (10.175.124.16) by BY2PR0301MB0744.namprd03.prod.outlook.com (10.160.63.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Fri, 25 Nov 2016 04:14:01 +0000 Received: from BN1BFFO11FD041.protection.gbl (2a01:111:f400:7c10::1:117) by BN6PR03CA0030.outlook.office365.com (2603:10b6:404:10c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13 via Frontend Transport; Fri, 25 Nov 2016 04:14:01 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.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; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD041.mail.protection.outlook.com (10.58.144.104) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Fri, 25 Nov 2016 04:14:00 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:552; Count:8 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uAP4DvLj021192; Thu, 24 Nov 2016 21:13:58 -0700 From: Yangbo Lu To: , CC: Xiaobo Xie , Yangbo Lu Subject: [PATCH 1/2] mmc: sdhci-esdhc: clean up register definitions Date: Fri, 25 Nov 2016 12:00:50 +0800 Message-ID: <1480046451-29492-1-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131245208409741703; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(336004)(339900001)(199003)(189002)(39450400002)(189998001)(38730400001)(5003940100001)(626004)(47776003)(86362001)(106466001)(39400400001)(5660300001)(105606002)(104016004)(5001770100001)(97736004)(8676002)(48376002)(50466002)(92566002)(50226002)(6666003)(33646002)(81166006)(39410400001)(39380400001)(68736007)(4326007)(356003)(305945005)(2906002)(8666005)(50986999)(36756003)(77096005)(85426001)(7846002)(8936002)(81156014)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0744; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD041; 1:9J8mKGnvyGNi+v2znoU86yXykU/iGvaAbdzuIbWrIHqWwVncQrWqPFQP/FKAI0IyEmm4Oo/qjS+k8Ni6U2wih3z6O03AifDOMR2ZzzLnDSsmGlIf3UuiMBWv8Dc/lx8Z+6G86I8+m18ukkGDQA//jAJzy4ZEJmSMg1XDmQWtnNG4RLwQYYAJl+Admfr0lvBUUBSfi/Qb0RffyPWhk4U8NRvBFbfKOLuw2BUAnRlNWlQl7cM3vbk/sBhxKYuvgHbj6UoddvISbd6YEmsO/HTZt26o+6uDb/EVEnznc7AUAIEF39XT9utuLxGVQqfhkTx4yJ3WENqOOJUljBkDd6OgEGfUMVHLNW3OjI7CdQrgrGpz2rUmzdDxpGTgmuLanCPmMnKaRX2LUp+n+Wr8fH8bDniIPkK4PN1+yinIkkA6w/g8lp6eXYunCeRM/OtyyVHqiy371RoAwVW4blibPAMvV8QYCb+LmEG/lLQcOfx5o9PW8/6EkysecZn7tMdBwgojgbhJyUvh2RNTN8zNs+y/i46ApzAdDBzirgG/6gRbK5pGPFGEzl2axcpEOtVZZtTCwUVNy/BP+fIIQd/cyTM1zsThSrNaGxxwNZJg5NKojn3r6b7j1n+Fmn5jYb6QWOC7cQiFzgp1lzs0weMEM/IIk600Qh2ErEi8C7yNuq2gC4E9xqopHzWL8KpWwCQYnhsDL6u5Q3XSUXGjNM+DbiSxiMnIQurd2oqvHRYkcRTaKTM= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 2:QCLdhT2bhIaNJTn9/oXf2N/8RzMXT7ULiozEpeEKk085nRxWq0OYkMGoGD3yjsRRRcZRPtfswo+eVL3wTHDIf2ob8NHSbciRhLStQ8QRYF+/poE4b28gCpI6u8YH306TZeikYs+9iOZ+sKZLaDxwrOLMX61ilyPZ9Qt8CieqtBY=; 3:dZVmlPZaiHYUQ0ankvPhVpUfM+QfgKCMoY2DJeLQ91bIbPzGz2WzAq961JufNJB6PBT9yF4QdZ+T1EXOSpLlvuxHf9Nolc/+qUBWioGO8TbCAfa8yQYXmr0lNL8jyZTLkG2YnEhHgsRjiZe4Y2jLy5p4te1ZUkK2HOY1ayc2ys4fv/jXPw1ZN5KPji/3gEHkk+FsDIKdu4JYcIPEfLoVzZmMSaUI8BxjdIKMdGD/CwJi3MlJMM7AMrrBdALLV0wirPrkCftJOcSt5O+RWC1gfg==; 25:vJLeY0MzHagGCVYQ5hADlW3L2uUbk0KkXKviBSZFrsJsaQ49ePFn9J7ar4QN/tC9GHSaXZCGizgPU8oBIaacWN+veQY+54DMDpsdtowjKZ8+VWbruFU0fa2mmdtwBf3TdjKejuDVtRruAgEPqRaEaCBzdr9Y/63qac4LNJHZSksK+Wt2nu0WX7YS+RHFktmUXhr4Qj42sIyr07aJbkSxFT0VXm2NlgjNdOhRHlipbCONdqYcw0CKjm5SKRd0onk4sdB2kpspo/yw1m5MSvq3e5hTRFu671EcDMWmvXypNtHVFYXH0/IhQdN/XFDElm13cYJZoAr8a9R5SiwM6H09Jd1RidwKz982IRIe6X8XSZqKUuIo6fTL00Sk/hgBGpb7V+CAAoASWY+gFL66IFNd2kQHATr+sgYSUTYHY2KmsSZZRwEPro+lR0iiqT99b0xiT7AyiRFBLJCR6YQnLw4teA== X-MS-Office365-Filtering-Correlation-Id: 2274fec2-8cb1-4a02-b826-08d414e97c30 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 31:ENfIWA5Mp+N6Mz44Z+se/Xtggf5spPtVnzC8dvrTgX7Xv4CF7lfzcMXJGsfbZHVO+1opi6IJC44+mhBBnxNHgMfZc6MYO7B5cOTRIBzcQFBwyg731ONDtT75N9cnk/VGEUpbg/IHLH+qoUIugPzksAADmtVqRtnxjJya2HVjdblu61KK177xqgVB0lv8GH9vuT+DuWTaHy4DFGX+aO/4J346H9smuz5+tnYScYxiRR2/ky+ToHHz0SpOVr/ToU18T7DNmIt4MGFkeAhm2dVR5A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(8121501046)(5005006)(13024025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:BY2PR0301MB0744; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 4:bv1KHFgNwrVpCO4NhLXwTXDabxdrA4FPzd7+Ft0z1FYCprcTkQVdhL2zq/lOdEUzi1sVTeBDH+IgUEhOilAWa9aXFiXbNjM1l+910JwFRpNMpw5WUl43KA0uRp1/GszMznqDOA+hKD0qhYGXY+yORd8/QUpsr2qwqbFkrLEoj3wv7FrRjnwzfmURupFBmU4bPM/pWZNcIcUGtK7jPDqPcv4Ca7Lpqc7+W5kdLL2z25oSL0AI7Hz2ASD/u/Bwt1Q6v9ohHqhDSxEAe2QKPeBF6wq4chM6B0CfJYTV+2/BZVo3bmFk/yCujf7g2HXR19HbvDBNQQcfONufvv0lnH/SyFLIfsukwdLtlBDNI2u/XLO9fr4aMH7XklUb4tsNou9wXaluuxP67IyQgAJMG+xYWNq2zhg8dP9fLlluvyd/+VRQjCY+uaW1ydPBC+aVEjhSMFsBQUdHzoK4K1VpSVeQn/bQkA6GU6r8OmLxLnV3KAy2lU/3boXGtDWJXLSfodWGs7NZSmrtVixQ0A5hBRl73xTSuCXi59N8ngr3b16QN5cC9j8oHUSidXx27rH/eirwXQ77ATOxG3OMr+prJ6hDG3hzL54NEoeqC24pG9tvsgf537v8tvHVdzkt0krRQel1UIudF14mi9jp5xIyo8OICsdUkSIyChrC5bHG4Re666xAWFotOn9b4YDEfoXJKSDIdoZq8U4inqyGtUdiAzWRmW/TFucoo5jAhAlB8E4h6X6tM97dqgkTqr8qiR+ezfyF X-Forefront-PRVS: 01371B902F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0744; 23:Ixc2PQMCGx8e62HnVoRW8qcuo86GxIj6uRx+WmM?= =?us-ascii?Q?U0pUzC44uR1F4naQtchjE1a0m30FbDgTgB9SZoTSoIBZGbIbU5LS5ccZQXX/?= =?us-ascii?Q?K9Zs5o5a2iZyn/3POUWeYvX0dGF6hTUUf++nLhxzjluBcrtxUWhJvItMRirt?= =?us-ascii?Q?at4M9lm97n4YFFnAk9DkkfRPDaGSKHbt19lV1ba2uPNx1BQrvSsAj0XiGWeu?= =?us-ascii?Q?G6BkDeqgnoscninwWrDzqiDQTzC7NhukL+gcq4Cn2v28dAPbc/LDUi53Jlq0?= =?us-ascii?Q?Z9hci4NydSptvijRgwg99GQT5v0a4tAfPRXtTo0kBHo+E5v2tw5jke9jctya?= =?us-ascii?Q?8Rkvo0X02l19vCdMhKXxMqp7AOgtGHNpdOfjNrodNeqYXoEv/ebBHrufWduG?= =?us-ascii?Q?wXynD4Ig3B3p+9Ql3JNPTmNjPe1dyyQ7X1q/x4xsSWor6VG4zYjaLRyOkilm?= =?us-ascii?Q?vvPLTAdgxbN3hV4HXZ/24o/413UKrofz/dvX1EbJj2VawaOwkb60zWPhoMz/?= =?us-ascii?Q?z4zDSrcGqcB7OuJTjmPmfPCC2MsL9L807JHwFW322nQLcc6/aA5MypVFZfVY?= =?us-ascii?Q?Gl4IrlUe9Rp4HasrYAa00uKANHIKcSR6z28EfA/y+uKJvXB/8LOtqYgBFRWV?= =?us-ascii?Q?CZahm8WuPiZKkVwMRTK2kf/fDPPGelUxUc3BW/wl1bcdSlD7jUt4Xo09ANX1?= =?us-ascii?Q?Mq7ebN/ImY6PEgnKuzrjpOhjszLtbLnxJ2Ofui9xWAxl0s2atyny8pOsIiL0?= =?us-ascii?Q?AzBJh8KUShUewfBGm921laC8SPXni8SqAoaMIkGeGB6SkWAs/q0BTUzJy0wb?= =?us-ascii?Q?4rDFFlwXLQXBVbLFtLyUJOcAZ9qY5a0tJAtuPnCl9FO6Es8/bvmLaKQ5c6YA?= =?us-ascii?Q?bkvRx9CRI4z5By+ZKBt939XXT871s9UcB3AmxYgTkbHZuEEFkiNRspN6HFd3?= =?us-ascii?Q?qKwWPXoVzzYExOyOfR/9okl+9jqmRwe2t1XG9CFf7uRGHBLI4llGiO+B+X2e?= =?us-ascii?Q?t4Cd2WLZb+6iThvyP+OSkj4fiil3z6+1u/6pwWBHqsd+7WvRZX0Wx6P+DAe9?= =?us-ascii?Q?yFxi78YsXxKgubRqsz1aeivUB/XJ8cTx0CJgZya1GhUaojzQeRPFZubDQ0Hd?= =?us-ascii?Q?nfCUaf+TN3vyGpaov01bi6buAPzXpGCL8?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 6:JFJgqFulOUB5KRv+FwI+z+chVhppCricNYvKSpy5IYKwpFpoDTxaoPMartEe7be+JKf57y7Xig710bdt0ea1N/PAVoj5yFRtVwwyg0DQchuxCG/xl+pW1Rd9UelfAW4BqCYt5OnfHbh3/DmP3u5F8xnqHgkdpYaK5s6W3HwNGHLiTYLLL/FZ4ZVNewpUfEsXHq8eZOPxZmtF/SoXDk6wXlVPygZn+8PKjMlazfSFxFSnaHTW7NTmOV89IR+bsQW9FdDZe6/bAg7oYnAwnpH9bmMLRlC39dLPf345TrdnE178wF8tRV8ZS62OT3xWAIHFG28q5IALYYpMARkCj6tQ6A==; 5:82vi7aqicXGIrJuvCjr8cB58h+tbIa7l3aIoeYumbLzzJeCEaH9GZZy2csnIWMATAyo/i3QZJHuOeU6/KXWMEOK7f2XBBTw4B84SGLIem2UbtpooUUbpXTT0LFAtHbZREGOP3d/gvnoY7a9JEVlhYw/SRfsVFPi32lShRQ3fHGFm83zwt8tgQBq/bzHE7R1F; 24:KslADUXO2DH/R66nN/fOq33gRtUkmtaPzoWKACsNrn8YS60ppT3h0Lf1H6mMy8BbAkptZhgLn5V5XxC5ziYCd5VqeGxPHEA1C81ak93itjE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 7:KzR0ghe2vjJpvkbRzn+XeToZLGYqqUXdTT2dcOSK+ON2yCD5zSdROwzJsnZzfr5LRexvuBQ/Qzv7J8ZCjjJjCYO9yId6oeNtqMu8kcMKRyqqzwLVzHY6mt7v48d/PLuhqRUbtnxo3s+JHYfeKjdSeYp9h15cboh5YQookMv4m2DYFmdjQNy2adz4PuKqgTcmDQz8BH+PYAul92jznkIGvCpNeAGOS35qw84v83Evztu96Sf5IlWiRop7GJluNQ4PoNEbYLVSAGzwE48PeSJGSwasTc7qCAaUjYp/RWl2GcQBx8Gwq3LguQ231lUxSAUkWjtggK3GouaV1N8zIs2DD/Xlq33P0khQ5iKP74b41xA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2016 04:14:00.7713 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0744 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 The eSDHC register definitions in header file were messy and confusing. This patch is to clean up these definitions. Signed-off-by: Yangbo Lu --- drivers/mmc/host/sdhci-esdhc.h | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h index de132e2..8cd8449 100644 --- a/drivers/mmc/host/sdhci-esdhc.h +++ b/drivers/mmc/host/sdhci-esdhc.h @@ -24,30 +24,31 @@ SDHCI_QUIRK_PIO_NEEDS_DELAY | \ SDHCI_QUIRK_NO_HISPD_BIT) -#define ESDHC_PROCTL 0x28 - -#define ESDHC_SYSTEM_CONTROL 0x2c -#define ESDHC_CLOCK_MASK 0x0000fff0 -#define ESDHC_PREDIV_SHIFT 8 -#define ESDHC_DIVIDER_SHIFT 4 -#define ESDHC_CLOCK_PEREN 0x00000004 -#define ESDHC_CLOCK_HCKEN 0x00000002 -#define ESDHC_CLOCK_IPGEN 0x00000001 - /* pltfm-specific */ #define ESDHC_HOST_CONTROL_LE 0x20 /* - * P2020 interpretation of the SDHCI_HOST_CONTROL register + * eSDHC register definition */ -#define ESDHC_CTRL_4BITBUS (0x1 << 1) -#define ESDHC_CTRL_8BITBUS (0x2 << 1) -#define ESDHC_CTRL_BUSWIDTH_MASK (0x3 << 1) - -/* OF-specific */ -#define ESDHC_DMA_SYSCTL 0x40c -#define ESDHC_DMA_SNOOP 0x00000040 -#define ESDHC_HOST_CONTROL_RES 0x01 +/* Protocol Control Register */ +#define ESDHC_PROCTL 0x28 +#define ESDHC_CTRL_4BITBUS (0x1 << 1) +#define ESDHC_CTRL_8BITBUS (0x2 << 1) +#define ESDHC_CTRL_BUSWIDTH_MASK (0x3 << 1) +#define ESDHC_HOST_CONTROL_RES 0x01 + +/* System Control Register */ +#define ESDHC_SYSTEM_CONTROL 0x2c +#define ESDHC_CLOCK_MASK 0x0000fff0 +#define ESDHC_PREDIV_SHIFT 8 +#define ESDHC_DIVIDER_SHIFT 4 +#define ESDHC_CLOCK_PEREN 0x00000004 +#define ESDHC_CLOCK_HCKEN 0x00000002 +#define ESDHC_CLOCK_IPGEN 0x00000001 + +/* Control Register for DMA transfer */ +#define ESDHC_DMA_SYSCTL 0x40c +#define ESDHC_DMA_SNOOP 0x00000040 #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */