From patchwork Thu Dec 8 03:36:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 703947 X-Patchwork-Delegate: yorksun@freescale.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 3tZ1xF1PR4z9sR9 for ; Thu, 8 Dec 2016 15:05:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DF8FB3850; Thu, 8 Dec 2016 05:05:34 +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 aGB-btS7no8e; Thu, 8 Dec 2016 05:05:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 19A8FB3847; Thu, 8 Dec 2016 05:05:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D3F0BB3847 for ; Thu, 8 Dec 2016 05:05:31 +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 LxNNdT8mBHss for ; Thu, 8 Dec 2016 05:05:31 +0100 (CET) X-Greylist: delayed 85306 seconds by postgrey-1.34 at theia; Thu, 08 Dec 2016 05:05:27 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 NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0077.outbound.protection.outlook.com [104.47.41.77]) by theia.denx.de (Postfix) with ESMTPS id 33550B3846 for ; Thu, 8 Dec 2016 05:05:27 +0100 (CET) Received: from CY1PR03CA0040.namprd03.prod.outlook.com (10.174.128.50) by CY4PR03MB2471.namprd03.prod.outlook.com (10.168.165.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9; Thu, 8 Dec 2016 03:50:16 +0000 Received: from BY2FFO11OLC006.protection.gbl (2a01:111:f400:7c0c::171) by CY1PR03CA0040.outlook.office365.com (2603:10b6:600::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Thu, 8 Dec 2016 03:50:16 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11OLC006.mail.protection.outlook.com (10.1.14.199) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Thu, 8 Dec 2016 03:50:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:529; Count:8 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uB83oBw0003451; Wed, 7 Dec 2016 20:50:12 -0700 From: Yangbo Lu To: Date: Thu, 8 Dec 2016 11:36:49 +0800 Message-ID: <1481168211-349-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: 131256426158198370; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39860400002)(39400400002)(39410400002)(39850400002)(39380400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(336004)(189002)(199003)(305945005)(68736007)(97736004)(92566002)(48376002)(50226002)(81156014)(8676002)(50466002)(38730400001)(81166006)(36756003)(33646002)(77096006)(85426001)(189998001)(2351001)(106466001)(2906002)(4326007)(6666003)(104016004)(105606002)(86362001)(6916009)(47776003)(626004)(8666005)(7846002)(69596002)(5003940100001)(50986999)(356003)(8936002)(5660300001)(110136003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2471; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC006; 1:GlawVTfLRnFNbc4dAVvIzA+H5oSWQtMzco/4XUmTXWMD+M/uzQdFYvKYNHKK2I/bp5ePW7D2HPV4JlLN3HKju5kuazC1YPqe2EfwsVCnkc56n8ZSR4+dOvyUkIjFNg3nlWED9QKjbwsJHMN+gH6kpUuJY6sz3cxI9rEFAmdOGKVRbXTVsUr6tftx4GyF5HQU4y5be/bggAqlhTBuCeE6RszA5oNcRMr/dAFAG9gX3w7TTgxME8Buf9fTQ4oOOcNqhkMTsLNRLMC2RhHFrhvvNiZFOBq0AxqXUWRHxRESDiL7xEvvJO57jvzoQ2J6RkPpyJCZpKPH5tdJhDfZfftS3KTejdg6t9BdoEx084DUQF4MzEWkWpKWZqyCDU3QrNzkBXm9p5dnbGW1UOqtaxFTbvfeqwStmoJzbMQnL9L6Y7fSfSyz1dWcoLI79u0BHzqlhUxTmJvqLJuP3Xo5EaD2ZQJnSE+QtS0p/OrX+7z6/3eQW0rtsmBafe87HcrSuHGwsXcpjQzZYiBdUDhRzqFZg/r8DSd+9CzgN28T5rfYsQ1r3K6j5n0DFgX9YJlZF/zekb2ffl3NWnYYxuM1L9yiR0SMpAEKmVeVQYeR9u31wK/ijaxaMZk5cimlTKBbLhc0Ns83oG7IMJLOH1+Otjyu2sfhPQi8EiGkbKIux/b5Ts+GuP6dxxff9dYp307CxY55JcWDrRmiEG/0sbAVC1DYxZ1eQaxzdNnHcNGry+w9uEU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e0367bb7-e0be-4485-221d-08d41f1d5207 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2471; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 3:SsH29yG35bdaVmnc/g3/7pNrCOU+35nF8wvd3YbG62W0Bk5WiRItlYPLL/sMMbE7aCUY4eco32vvh4EGacGMQr3G4RLGz87oRrVEv19NdClLD5hRfYS/SBbGgJA24h+FdXcNJJ7GcYZv1JhY2/DEi5wJgkwKQ9pPgXxnr7z11DFX03X7xuKHtmxD+JFyOowmzWn/q1EjRaARy8DnfAaX9rsT8eR21LHQnJxfJRs7LzfFaY81PJro7u0Fg7UMTbY2fmtfmCoca8DH1h8fQeuQXc3aOIzE1bMPeVPju3Rx3TC/vte0snv4J0vVbQatgszq1VIXHuLDjEn09j0ZWbU39mIUbvXbm/JOzHsfRw3hseOf6IUU5v4VCLizK9YOs6Qn X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 25:nyBLhCORh/zgBW1XPUibbyrn0Ydv/L5suH140qm1VtiiV8FSULtHbxMPjcWaGWVMegJuNel/9MfxeU+9zjXVTtUSj74uS6aWPd8ZP7ZWG67gCnYM2vjLT2ob3w5Z3Shx301E9VBcxTFV/tZrSNIRrpSOWdcfh1G8y+U08hsJVuY9VrnXQcpm9dhfx8lmi55GwXp9kKtjP2kBL3DFwrGwV64uKKJ655X0IJ2v2x/RbRLcSqqwH7DGeu1XaargLwG5G87njSHp+3Pquz+53JfGTW5MLgBXFU1o9zaA5WDnmCmY6irAvznIVQMbFA30zDStEi++xAt0lA9a2p139xHioygxOkPJBsTWF1tI52J4GFw0/jkyI0ndh4YHidxI3CiZkxfZLEAOY5x0QxuKKPFwE6ZfF2NDOZS+Acr1FqRHGYY4uYrJpXEYhSpIdrkKLBTJA0pHWNtKRf1FilKl/jbTenrK+JtTQJRtQ3HgbwKg3gk8DiNxDsqeHRti/XcKPhMAMQjNCt3e/buI8dGgNG9lrwOy8ODBc2Bn+qos2u12c5GbuwmJuP/ZYJ8qpiA25XhIxdPtrJvxvPtYxhyynp2lIfHZd0u6G1QtyoHVVxfDJ3U40vdkp8rDMFXkReksmp/2L1rkIpF3KcIzwRGiNY6NuyKXuyeI0FX3nJExFpqEvzyhIVmZ5gdzVPxfNy8xS0G+9T0L0v3pWF7yP8Q6NC1KmbT+/r+a3bhDbssd7xYqEU+LLmnA4Tqw2rqmgczheAj6 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 31:zX1vHERCfZd+m29eQ1jaYdq4Av84D0IiWDAq+YKRzRrw/46e2qeonBjc/RqhTuc0tkZN2ouUgq7qMk53tVtis1egc1ooVKJ07ENOYUHnJlPuxdKYqB5qjkuJvn5NAK5OEx2HZjVZjlhL9Hm0HWZG6CAPIfVISSRg9ftBIkrfvrWKTtBMO3jH2f7tYT05seGCkCve/+fB1q7pcpgijRT3hQkBSHzn+BknuFss1j53lwby5g1iKcxo6cuDWGbKmUBscT3e+SmeSGGKQ71Rmta4dg== 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)(5005006)(13023025)(8121501046)(13015025)(13017025)(13024025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123559025)(20161123565025)(20161123563025)(20161123561025)(20161123556025); SRVR:CY4PR03MB2471; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2471; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 4:bt9hDfyxkAspc02QPAPOgL9mLbofuvl5nsC/tSNmaoD+v1NM0s+v2DcwtKjx3zeOTsto9GqCN21bYnhHa5UXmOCxgh4VFLSVtHgEmEHIWV7hFPe2BIGSDD6I40VstA02Pb/8PMIOw9oia1A0J9U7BZy8uMsnGiWmQdTEFD1uau4DpclaleiPUTzPfxq2u0MPOzxwSPO7ZfKqyJL4VSA6Wtdyfryn6V2yeDNug/eUFQRvKW7Gl1XMGUtXZRUh1IhRgJgoOvUXXDV2vB53F/apggBF1gEX2caAc++bnjvia4fW0UPgBOr74NlhUK0n6AD+hxgqwBofA30pWZs8/sQ1Nf0o7WssJAWE6y0rhXt5odrUNiOsrh53g0aBGdtZ3D/LTh4kQeVCjExih3uUXjxoe3WCxfRHtAziSIFNAG/3aovKOB+wd8UDT0mmvr3I4Uo/PGAJEywPmPpV8eeh9PPmUgvHDCpL2wbOQ6EQEinxLQGEfEK2BsXB+y7tbTiOD+75ckLrDLA2QoxDTX1XmRNS62vSX5XHU8OWa7zBpB5r7QQRYzHugZq/R6j2v3koM1LzVvEHTNtPgsAwEP+5c3ZXGP+in2DM4/yUnX+iaCyW008YxUBEGVe76FZO8Lj7s2JhC7KYu6jIb/dXAruumoZK+Wuv+ndw8Qdy1CaSPNhMKONUxtJNII1zHim1M7DxamkraZOkxtPWTWaCqz0Bi1fLT7NRxuGj30iOO7S7dp3S1f/eCLD84chpg6ogMewJxsx8 X-Forefront-PRVS: 0150F3F97D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2471; 23:ZiWouyw+bdS0+qOZIB7+T4l52A9vWdRMim6zCJ4Dx?= =?us-ascii?Q?KgjIpUdvOdHnqMpwqr+7dg556DOLmgkClfR3UM9mfhngomAeMkStABQHFOXL?= =?us-ascii?Q?WX/sB2g/DWC5dLu8Q0AqyPeDRrCtNx0SQEuuUsqWWMVCd/FFXbyaBrnPEHdI?= =?us-ascii?Q?zMjX+f7jtzL6Sgs5lpLDwj9l4af2tCYe617QZSNRoRW5bZI1qpKBg6YiVhs+?= =?us-ascii?Q?1YPaA3viiM38zl20PPzmAoV01U84K+puAy5d/gjh0pMRnBola2PxifF8YtzX?= =?us-ascii?Q?EY3XmpUnbX+Oglqf5x3GgS9xvB5QwLAfIT0AHHDk2ExF1f8ngkn+jn33Ql45?= =?us-ascii?Q?KfOw9BjcIqCYQk8l2qDWcFsAGWnjn5FWQLYqVnrNVSAURDl3o5u5hDgmujaE?= =?us-ascii?Q?17NTdqW/DY4oDtCtKQjbLI/S9wAaVtyKM4uvCevi7TqY2ZqlSTred7vGX9RE?= =?us-ascii?Q?DRwd7hCzHVfmblXIV5o8456M1oI2qXLTvsZ1FC2F3j6LUzIHmQLQhHmkXoWM?= =?us-ascii?Q?MvDXORbUO2HJQ2NWpmtwbjP2yIXeDuEpnTOJlHZCtqqK+m8qYk3cSxSfLWau?= =?us-ascii?Q?iL4xS1G5gifC4jL3MSLsS+F1xXZjsVPb8jOOewI06Id0VahDghBUYB2CNaUb?= =?us-ascii?Q?FKZIhIqYxau+fAp6CbhRmHYpX8LvkOh9sNATRTpswpw5GVbGK5JGNe3RBTYj?= =?us-ascii?Q?Ak/UVt/W21AGUwTb/B5OE6syCtowLtwhPtd1njomVdVmCR3jyN/jWOAHHRzu?= =?us-ascii?Q?IKMzkcCEt4+aMio/VoBc97LNdXMz1+9AYYfdJkBKe7DL1AqsT4Yt9xOVuzcf?= =?us-ascii?Q?lKma2QfJ5Kw3KWkGnXttpAXyCZtsxXly+jhz0AW1pWXDxriXc1cN31Qd+Bey?= =?us-ascii?Q?pN6MnR3Mre20KfCsg1mnBTcomU9/mWuiTdt/VC0kQ0ui8iJZO4vWh//VmFBR?= =?us-ascii?Q?67alawNagRL2p86/FCY1raCrlP03ucPzCK3BU35m38NdnwyKqEwB1J7Nwyoe?= =?us-ascii?Q?RNVSJagflCE619T0XEv9ZUH84xGpiBz0SHSRz0BbZkiw6r1/+cMkEHx87+GD?= =?us-ascii?Q?ZowgfNoRT7TbhP+ppI7s29bXF96I5Hlg2ve+m1ZX4LXL14HgebG7kLlIlFoE?= =?us-ascii?Q?aK6FeeSvOZ25uyfAB2aq11bSVW+bvqH7XkWV1PV1In+nCb+eqQ/nmaJ6ICBp?= =?us-ascii?Q?CcwKqQjSX0FnAQ4cLTZhEkKua7359qvpD2UtKXJWQQ7K4GuJx4Yuv2VbDqLm?= =?us-ascii?Q?bOnv18S7iUVaNA/Gb09n8mwN0RhlCyOuVnmXbiP?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 6:EjjpNm+RYZRHwhfKtRV6ReR3j+NGwk34ohBmy8BBEb9qUMyJQnFuTfHNcW6TVsR9JEpvvpYjnArmmJLUjL/5RGaAotP/xO4Qjxm0Zu3p0eUR9kGW8/Z/sI/+udSxV1yKQBJ3Al854bWhLBfXCRxEYuWosCyd4EfzZhEm2h/xWgOPbmoNd7IYt2g1s7Ra8bzD7B6HDTcuccG3ljy4VhuKIqUopX8KT2X11YB4aYuevZyNy4B1r4NcA0xtAbiAFk3vOCHeueQxA1NHiqYumTPYoaNxf5WL7iOTE8V9qic6fElPRQ9VIHrBdYwtodf5erJKnNtADpE3qv9zy3bNwoNBUK8bjRNxbe9aVDZXR6Y7b5eZwpUtoP2P08IV3JliMKQmS03vl9pY4Iz5KQTzEF8OXhDZWBeN4SnzcQBvRqvBChvywOxL/DqkZJ4YJzWlsGBi; 5:gaP57EpdDUl+MZMzHSdtDiuIziTLn9xNL04AuyFm3M35svO3iR/dsK1ko+j0pSXwdKJ42wSroP2J3kRqEIGicxAJu4tHPCvEIv+YJlJWQZondkRpNyTYMnC6pAzEazg6KK3MlHIBHmXqdkooutu4gukFIaKyw+/qFfL7FpaBZ2tdoCKCy+kAj9t4FpdjNcDN; 24:owJ69Vm3o1E2XbPYVaKwoh1kMfH2Z66wVPJUKd4t/hfDOIafrAEqZpj+B9usinc6UePpcmexDyUoCO/YCxGbCXQy4ISikroOCoNHkZo0gNw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 7:IjLiZd41diPDT6pVzosI6Edqiui57lf0Xfh45PvvXCThf/2BwSX/rLJjF8eSF4DXNElIMEwv98DeP1B34fjBuDWHXXHlav7OlW7z/vuJJ/lAP/PGFqdW6X52/RCcH3bvCxL6r205E6qiRZZMhX03F6UbAlo/BcWDHqeKk5fhnBqoE9jF84ouQCFPTayIOKLUtBnYQDvspAlVwuGWA6dfnHdGaQfGohbilXFr/dgRTQysjVlSaXkfB5LiDicmYCx/WGXwCV1+wr/2CdeO4jjwYeUrOHKNMtL+IWUOD/Fqmyes4CJHZoImcJ+m3mSgra0YTM19qXRLXzrJM+Wx94epd047lk4W619TGC67qjRcgp7umitLh3y/xcQosCw8mSgnAaDR5br3ZfMRJ1F9kzditG4K4d0wONAOMqCBGHfqd/E9aRSQwGNI/LeftERORHfszRUoEY71RHbCg4JfBK6Ufw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2016 03:50:14.5406 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2471 Subject: [U-Boot] [v2, 1/3] mmc: fsl_esdhc: move 'status' property fixup into a weak function 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move fdt fixup of 'status' property into a weak function. This allows board to define 'status' fdt fixup by themselves. Signed-off-by: Yangbo Lu --- Changes for v2: - None --- drivers/mmc/fsl_esdhc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 9796d39..68de04e 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -908,17 +908,26 @@ void mmc_adapter_card_type_ident(void) #endif #ifdef CONFIG_OF_LIBFDT -void fdt_fixup_esdhc(void *blob, bd_t *bd) +__weak int esdhc_status_fixup(void *blob, const char *compat) { - const char *compat = "fsl,esdhc"; - #ifdef CONFIG_FSL_ESDHC_PIN_MUX if (!hwconfig("esdhc")) { do_fixup_by_compat(blob, compat, "status", "disabled", - 8 + 1, 1); - return; + sizeof("disabled"), 1); + return 1; } #endif + do_fixup_by_compat(blob, compat, "status", "okay", + sizeof("okay"), 1); + return 0; +} + +void fdt_fixup_esdhc(void *blob, bd_t *bd) +{ + const char *compat = "fsl,esdhc"; + + if (esdhc_status_fixup(blob, compat)) + return; #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK do_fixup_by_compat_u32(blob, compat, "peripheral-frequency", @@ -931,8 +940,6 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd) do_fixup_by_compat_u32(blob, compat, "adapter-type", (u32)(gd->arch.sdhc_adapter), 1); #endif - do_fixup_by_compat(blob, compat, "status", "okay", - 4 + 1, 1); } #endif