From patchwork Wed Dec 7 08:20:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 703509 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 3tYXG76Ns1z9t0X for ; Wed, 7 Dec 2016 19:48:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C83724BA35; Wed, 7 Dec 2016 09:48:25 +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 PYsjLwF-pP3g; Wed, 7 Dec 2016 09:48:25 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B972A7576; Wed, 7 Dec 2016 09:48:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E0494A7576 for ; Wed, 7 Dec 2016 09:48:21 +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 C0wvZZTlGC6k for ; Wed, 7 Dec 2016 09:48:21 +0100 (CET) X-Greylist: delayed 15920 seconds by postgrey-1.34 at theia; Wed, 07 Dec 2016 09:48:17 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-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0088.outbound.protection.outlook.com [104.47.40.88]) by theia.denx.de (Postfix) with ESMTPS id 0DF544BA16 for ; Wed, 7 Dec 2016 09:48:17 +0100 (CET) Received: from BN6PR03CA0034.namprd03.prod.outlook.com (10.175.124.20) by DM5PR03MB2474.namprd03.prod.outlook.com (10.168.233.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Wed, 7 Dec 2016 08:33:59 +0000 Received: from BN1AFFO11FD021.protection.gbl (2a01:111:f400:7c10::116) by BN6PR03CA0034.outlook.office365.com (2603:10b6:404:10c::20) 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; Wed, 7 Dec 2016 08:33:59 +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 BN1AFFO11FD021.mail.protection.outlook.com (10.58.52.81) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Wed, 7 Dec 2016 08:33:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:535; 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 uB78XtgS032129; Wed, 7 Dec 2016 01:33:56 -0700 From: Yangbo Lu To: Date: Wed, 7 Dec 2016 16:20:36 +0800 Message-ID: <1481098837-1248-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: 131255732392618823; (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)(1109001)(1110001)(339900001)(336004)(199003)(189002)(39450400002)(81156014)(5660300001)(33646002)(39380400001)(48376002)(2906002)(110136003)(6666003)(39400400001)(38730400001)(6916009)(47776003)(50986999)(39410400001)(68736007)(105606002)(81166006)(189998001)(39840400001)(50466002)(8676002)(97736004)(39850400001)(39860400001)(8936002)(50226002)(92566002)(36756003)(5003940100001)(77096006)(2351001)(106466001)(104016004)(7846002)(356003)(626004)(8666005)(305945005)(4326007)(85426001)(86362001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2474; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD021; 1:TxqzDlRS5jsvCcplfOWvbecBf+KJvsxKOOEsTj7Cj7SqbQZRb4LPLxreM750ihs3oDqoKhIHSXMQuKPHQZ0/YXFP08e3mK00Of827YZIidXoKHhqPcxnYXn95JYfq0aESFBUUO/tfcL4DLloZOCUO9f4fmHzemc8KpjzHV+BWu6dvRk1LEoyXRMfQN2ajc8JV0MDis75qqZFHBshbGb6woeNLdHwWKSNCB23jIzOM9doeZGp9eOS4PqQg6u4n8WMpi7+6yFBvQR/rnrkZOEwkGsaolsX/IQUqfIegCZTEGl36kJaR1QbJJfEvp3jXa4ckYmIUU0pMwXTlk1NAah59htbMMpFDSWQmxJzpDn94G3ptytKFU3LK3TRfgEqG7MInPmAcy1Bs5RXSGAirIt1kXHi80BVNRrGCdHGF6/9q1VKO/+8gpGLNoSRm7FUzCOaGtPLreLpxKKgKRGcFRKbM/JuJg7DqInHUOLSGMHGhO/WnG7js5JOKqTJYhSs3oFfSbV/DuTWTTLRxYkBazqZ6DNXb+bofZ5Vlzb5fKViURf2ij/pE9leX65Uv8YjoOMhykVeSb5fnOMt0MrETlr9d2uKRQUInv3uneEN2KrvakGndDIYlJez+yYfSicebFY81eERrN+Le02AUyWKp9i+JbjKpUa+Wm5JXK4yIotda9Se1e31Wex99Hj75L9EJ9gtznQUF1J7bVKW4UDBli0zUtPdY/qNNNQdjGKi92/a0LM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 71f491f5-049a-49e1-89e7-08d41e7bca73 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2474; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2474; 3:vqW0+aYxioI7s+RJ/nifBOYLzD284GrLWMs47h2J2Kpn1DfMttnuJOCxEk71ZnyUBsrfbbVjVbW8S11d7EFnISKJf6v01J48oQxFgIIkfCy3lVoiIei4Ho5kwCII12ZO/IT7r/Gm7PEJBHjuhSmbEgeoMaeRm06LOyu/Mc44EkXNqQaBOqjuZUaHje+FEAyivndwEoIFAdFLtv26KZbZlQgohdaJU9XbCUQ94b59eo82FyACynkAPsyvR0RpNjeW4I4zU7Ch1m76H0x366X5aKKP9qcIUdMTuL/TeUgpAh937j0fzDNAEcFHqZ4F8v0LiqPevtDwjErmtZtvPweL5aB3cDXBlZbYyS2rlxDmJpjEL1hiBtngWf7IEIesu8ET; 25:qTz8ecxe9wZnCwX7jKbJde3LgbYobyCL4PBc+/HpOTMfAU9MxLKUjMP1/SqzOWE79AnpbAZA6OXuaROFeHfajF9fU6/3Ucjy/cPN1HalHzuMKxOLl5V1DsgvaNYEUcItSQD0ns/tdMVl5xeJEJitP5U0lEgzVyojd0mErAOsKM2NW6ocGdw0uzdYJX47DC4BJGh/bJErr4Izl3vC6aVF5mYeHFrocmbCT2XENMs0Un3jslWVPrRYcJXZ1Ut3a4lwkSCOMQKExh2MarG2zazjnFMhXFYoVMogZsjgCiI8bRJCQ2GTJ1ivxMJp76hT+pldBMRqawBlu2bw2hwBUnSJw7Xc6CERBgS6PcjnypOv8geCKCH73AZ7x6G5FMGAFniCqtcfQqfyQ92tjjnryygu/GNSYw9rklZTIJ6VuyNaEH/QGF4fmgndziZk3DssycbLxO4RGk3HFi4nXfFWcTfsZQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2474; 31:coc1NjId7NETgrqcm7K+OxmcrA/Y/UYs/Li73LAEmJYsWMhngbX64Yl7CCO7R1awXIbkuGUxSw+jay8vVyJOj0COUpedskC2f1t6UpluIHg/fnL3NqgkcHlU2OKYwFzRqfWW7DM3B9NhdS6DuN2qaQF1ZHJJZ7hYmoOADtI8L0Wktgne8+WwzcYWI3ZUHIvQl77rQY406x9p+toeeMxnyJ5PTbQuxsyyG7dSxfrhRhDahOD4uOWkdQBU51NbAbYHq3bfyyZUBnLqvcOvaS5FEA== 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)(13024025)(13015025)(13017025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123559025)(20161123561025)(20161123565025)(20161123556025)(20161123563025); SRVR:DM5PR03MB2474; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2474; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2474; 4:d/e1evFQ205Pc4l74at76yxDTWcnufwMNRCNa9K/ziwZWJGC+bXoHkYNi24MxqP6aOTewH4CgAPrHwUySDAEqMWUF+ooqV/pkjxeMZiI0ba3GnUZ2gchydWirg25/2mz16d/44FngWoTskyFiuTFzCBIt55x+G5vmgCBxw/SBaT1ejU0RhYZFH8TgcWd3+JDTGAF89fISH7zJBfuG7roO18cL8at/6/Spvt3b2uuaDwdqPKU75j6O6lw3tWbvW/1jos7GuCK2vYEc+PXbWJIYkudTyjeIxVpbUfIvuvOeoAL0bmY8DHvel2wzXmJhlg6vmeCfXSj4jh5kNVXcNv+HDsHQq50aO9Zgn6rN5sJEh6ZBTQon0M8nc5Fx0IqMsxWJaHJCulwCTWHBDblh/TFwYytH8nqu86hc/zybP+UGHCDu9dcviA7d010ZFMEyRtpEP0tVEW5aGikcLOVNCd0rQNewQFvyEDEH3eu5P+nnGaXeR5o6GXkJHAXwvCe2J9pF2JkIrScbKG4ejR22e4ZJp8dQx3vOHyP+Ql1xg7+1oTFZ9vKRmD0Xihm3zIMoshtdHlsPUdHUGD7bk8Q5tF1dV8ndB556xr2MUWPzxm3wqnmzpu2hJYL4xlJoYJq6SOPaf5fQyb/oBKhljXGRuFHYPlDCJ1Ngyp2ujRaGIzXDm4rm5eriFCVvdBkr5CyzGUaNeZzTAKfcZPx/Pawnzj4c7U8o49Vk2LcYOP9g1biWrnoHe4corkbeCL22Bv61diP X-Forefront-PRVS: 01494FA7F7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2474; 23:DK7gi4f5VzVH9Xt261O9OWElaC6INihUo2bn1ewb6?= =?us-ascii?Q?l5m3/0IDiA926RlckJv7ILUQX+w2AqsWeiqq+1DLJIH+Ye2rWz3l1C7W1ivg?= =?us-ascii?Q?KLtKTawZpdELOyc8GKZLBcMkrAKoTZ2bXQpVmAkYnHK4NoYwE2CCSuW0SeGM?= =?us-ascii?Q?CMWeu/WDrsiFfM801XP1f/BMLIdyZ+ZAe1JwePSEwYlaTDiVyFoWbn5gX5kB?= =?us-ascii?Q?l12izTOwdBNgguDFOvAL4dcwuqTfvayDkzmUrtHJUM5KGI7R89pkSqCZRLBu?= =?us-ascii?Q?9tVMROXz+k+HmeF6UF2KKqQFacKJL1th9MgnHNRfPKyxAh1PxeIBHobi1lgE?= =?us-ascii?Q?FkW0cQIanSIkRJWtIK2wRATDgDk0yQVong3nsasi+4ptuz203MN8vbZaPixP?= =?us-ascii?Q?7eivZmci2NlA0upUQXFqzdeAjMSye2m+foqh4fvYDk7T9SWUA0BLEEEUriGS?= =?us-ascii?Q?KmFfN0EuQ1JuQGdCg7/mPs73RwxL9hte5Vvq8+EG1vkzcCpZB4P+INyPU1F9?= =?us-ascii?Q?+omrguhd+l5GjfKoDNm9O9XZ/ApeSWg33Q3HP5ZKegOWcr5/KG9sk9O9tmDJ?= =?us-ascii?Q?xas4OqP6/h20CxJOZArAdepWEp3j5vmXSLOLb0foJhWCwJeAk2OZ5bCO1NkU?= =?us-ascii?Q?a4/poE9CIwUPIq7kD4wX979B9z+zVLDNhnpREftJbwOjRa6i2d/Ay/p50l+B?= =?us-ascii?Q?fdyzOdkLD7HiQgJzPMBYzUOLi/UUyd76mfKbf3D6wCCxUCEXOAGLfpzFQufP?= =?us-ascii?Q?c+2lJooY4oRjKyRiY3M9Y+49eJ8qKhp/sR/4CJ5XDdilHqwC9bk9iqvyE+QU?= =?us-ascii?Q?enkBCIFBkkO3vVnOGIz/UDnUvwIJLSfTndIlwz4RGLxwB/e7S79jWmv3gNiD?= =?us-ascii?Q?3JxMbpOqDtvAKIPfju4UU7SvUPcOYyqpK9SxsAcx05hNFFguoFrsDEnKGVlt?= =?us-ascii?Q?xmneLQqvXCG+disLSakXwlQXWMcDBdTCZk7jIUxF53eDZtEAlpad0CwyrMws?= =?us-ascii?Q?uLP2nsMinIV41H0kBGu6pOvD4V3Ibx6cAUkU1IBI2HOER9OwOCCDU7GV//tp?= =?us-ascii?Q?5Go0fPYS4nQh26IHAg9BP/I50/HXGPOQUar7PWC9eaGtTN7USpPH476qK0W4?= =?us-ascii?Q?2LqpuEHKwyZYWNX9Uu57zOBUPQiBs9MtOHUh9Wq4w+s69bPnwmrqvu4dvuyb?= =?us-ascii?Q?vuapxFBn1xoGZpOzEfhoA+ZOIXBZSAJmf+nOhiNpq5EKrdbhxnNNP2IOdJKt?= =?us-ascii?Q?Nq88r1FoAewB8FI0x0=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2474; 6:nN34bV4Kc3QvY7C1O4O2WrovsLRJSpEy6fqzGzKLs9kFYd5huW1Ex3sC3yyVzu80iGd5TwzIqTI1md1ZARwgbbFdbMQiir6OC+i1ooMt34s0ykHX8nv251ZeJl86sA/IAqYJxTqEDkj2U0fLqzCDgb+q+ZFQTln98UnZ446nLnS5JrrymKNLJj8ZtC2ppyBfSwGOZXZeP8+QkEfrMRhNwsCkX2S21wAYJQLrNCF4dk6Ks0ugUh70SLiRvGqWSjEPl7dKVsMQQi7QrMCOwFS+eG8BuEU0DGEQ1lzpmwszjq5qI1z/kBVcilZikezrsPhRvfugtABKQFaIO+rHMeMdHc5B9lbLlTEfv8t7TjeAo55mDRiPHdrDkJUBUax3kvCDxjWok9gCs9E3MYxZSrcv+1kPs3IyLWvPvXhIY6eBTI0rZHzxRG8fIxeFeyru+3VY; 5:x5ihDiaohtyGAXYY1ySVvzQpj7VIFtbKN+t6/oC9DUTTxS+tC0mdAnXLBST9fQTIyzNhU6ZYpLS1Vbsy8OBFKrnVqpE1eIRyl4BAtu9r90Wr64ubrazAl9r4NNdSVBvxJqFHoDWalY5DIcclk53T49ELtIACbBdynMJ0JALdcx5xSOmGQg+S56SI/ntkQ33x; 24:ThNs4/NKGrrukcmK/T5VvXKUG0G7FL+ghmpB8ZttD99UbU/AL3mPRFxaoEFxKrIw/x+3ISFAQEt4Pt446qj/FpSUo1cgaCteQv4cih1abK8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2474; 7:8mA0NELCJadHtj5zZuKb4o6ymIsIiC97kNkxvfOWX2/2I75nDxXddCnNIXrpFUrfcIhmbVN5NxEQyPq7QT6wD+Rag4+O11DzJf3EXqZfE/BlSB5sR+9LaTMC3AWKMuJIV7ooh51lQeWA5y1i+UAktGFDM/1S116DPRtvLi7FDLuGppAefMRx7Gv9cuaf5kLwyu8quCCOpJJdFmZgD8aI0MoP9Xa99eIztLcpws3gOe0EAMdN59VdrAj/zPy2/MLMOotgW119Pge3xaIJOus4RXBjnULBjNrFQcwxaW16vT0NT/CdRLQXgS8kcrNpn7dVRNW7G/EmQoMPrNgVPZFx12pM/nshNFrVzkxTzrOO/tSVFZjOIO8MPFsKdAZUx2gAKCPf6qaMIdkUB3HTVdfuf5VbeuDq8TIanhI51LbPCG0FVrcyNykd5uR6f+slNsx6bV+lXyh/mn9xrhySUQD+nA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2016 08:33:59.0746 (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: DM5PR03MB2474 Subject: [U-Boot] [PATCH 1/2] 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 --- 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 0ae1cfd..7b7863f 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -911,17 +911,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", @@ -934,8 +943,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