From patchwork Thu Dec 8 03:42:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 703948 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 3tZ23f22tRz9t2D for ; Thu, 8 Dec 2016 15:11:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CA05B3858; Thu, 8 Dec 2016 05:11:08 +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 KKmQpNT4TUq2; Thu, 8 Dec 2016 05:11:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF2F8B3847; Thu, 8 Dec 2016 05:11:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C44BFB3847 for ; Thu, 8 Dec 2016 05:11:01 +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 ot4cYmhHLI2P for ; Thu, 8 Dec 2016 05:11:01 +0100 (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-dm3nam03on0055.outbound.protection.outlook.com [104.47.41.55]) by theia.denx.de (Postfix) with ESMTPS id 1BE8EB3846 for ; Thu, 8 Dec 2016 05:10:58 +0100 (CET) Received: from BLUPR0301CA0042.namprd03.prod.outlook.com (10.162.113.180) by BY2PR0301MB0742.namprd03.prod.outlook.com (10.160.63.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Thu, 8 Dec 2016 03:55:42 +0000 Received: from BY2FFO11FD034.protection.gbl (2a01:111:f400:7c0c::190) by BLUPR0301CA0042.outlook.office365.com (2a01:111:e400:5259::52) 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:55:42 +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 BY2FFO11FD034.mail.protection.outlook.com (10.1.14.219) 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:55:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:534; 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 uB83tcBl015628; Wed, 7 Dec 2016 20:55:39 -0700 From: Yangbo Lu To: Date: Thu, 8 Dec 2016 11:42:16 +0800 Message-ID: <1481168538-29963-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: 131256429414954955; (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)(39840400002)(39450400003)(39380400002)(39410400002)(39400400002)(39860400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(336004)(189002)(199003)(2351001)(33646002)(105606002)(106466001)(47776003)(86362001)(36756003)(48376002)(50466002)(50986999)(4326007)(50226002)(8936002)(2906002)(81166006)(8676002)(81156014)(68736007)(77096006)(110136003)(104016004)(356003)(7846002)(5003940100001)(97736004)(8666005)(305945005)(189998001)(6916009)(6666003)(92566002)(38730400001)(5660300001)(626004)(85426001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD034; 1:adq2T9DY7ynHuO2QGYOnbrv4ws33JLXabCTRMVuw11TTHv4xPv47BEHyo5BGcRzBE/P0oxLB//NkjHXLuFUwb4UDTJWcVM5qGIC+CQFg1ArrZkGiqQo8jDKXmZobLPtT3ru4UN/AdJJxQZ4wpygNcYI2otyqctVQrdk57Th49iNU7HrliXxzsI+ZNnsnqa4fAHUv2AS2tyrRHn5jOD4CWka4UF8SL1BmoFiDlp/osrzwvS0yhQH/B3LfPLu5+mb7q5/5NmlZub8t2vDk7nzSkivJnyiK9OYdmFAPG62Pse7M95BYGWArne+p0CQLTKrw+7eS1cwWFWtiI+ocYyzj2Cdp5M+y+2/OFOkv24UxuGZ0rBVkvaL78upPhNCS7+5qnX4U4if2ye6WyGlpDOsvNStuQC3RNLnP4/NfDJcS6wim0zRg7BaTeFpM4BFLB77UcyZUKDRPqUDm7ZZqMOPYq7UQVNdDlQ9O+/3Tepy4je0Xc4FJBmjTo0zXvzCK5RR0R2vsHePW1tAbWohG6D55UVPa151tgcT3f/T7W77q1nscKvJRT0sSX7f6vMHlHQb36XwyiHTDHxnbRTC6ai3iXOm2JoZEBcKKvaXrRXmyKBvCW0yRkrAbNJa6lomvMg8DNov1Gu/ZzmOtoz8/w+NWCt2L2k2leamVyZy0AwbZsnIelt7oefJnFdH2XWEQ2KMcAwA1MAXPktOYa+QGGQj44JmQts7ONEVi6fzg/VCmJIU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f71e924c-e935-4019-b7cb-08d41f1e143a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:jt0tHe2rYdgMvz2z6dMXb66ao3gdNuT6RjFU6chySNVclGYWKWfn8bxwDEct+cG3IM1QtK/yat1bRhFw9CLPJ4P55rakfBD1Qp9p5tCxkNuYMtMptIeYvr5be6+plR1CiW0fufpCn60gqR1EgxLcl0/FHHngKhvx78/eOtkiebpERFKaDChGVYzGHH92Iz4sk3z0uoKjlIotIKCpMoM7wupkH/vaIHRAA3M0AwqC1ePN1VhX6mtQr3GjbJTBaQ2iK6p3OiWbO9gtzv6xAjk2vi6vJaAjFkRwFOrE+21H3CZ1aJkx+0oHM2yHWXzzBB5Wen/QXSoZ0FI7Dsl+UjQKrDn3ArO1+BgUL5S5U1QGSIT88pZLPtehWGtv1pI98Syk X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 25:U0202rBJjZxinSNpytbPducXMz7TIPGWee2wPflhp7JzAMyGurMc/9O/D36otsNOfPad+nRNbLhThonBQa5bCseB3E94Vu7xHPDwCmfuVRhrjmuoTw+g85OSiwSKW57fYDB7zcgOJ3ur4F7qzCeWpVAl9OqiHSPtKcET1XNDLU1wG60BCblDM8hfvSHDH0HXekS4nnVmToyI9VZgPN6PLNPaCVvw8+q6VH8k7ef29tkWh3fZNQ1aUOeaUDD3u1+cL/+FZja753nFHkewC57Gx7U9lhNG1k0V+om8Nu1hRmzMzmYr1bXpacppHfzJ4Dl4GWgTqVr745XMA5BBXb2IYuzPnTmhre4NHppV5m/nDZdRujN6rA7HHQPzoTCbBTIAhSO8+TsrTpEIr/naU84d8ZkRpideFAyqLAoGmJ1ZbG9dQ2OYr1GEQ6KBPt5jBzy4rtIe/bXbsDs6a1tdurp4bhryziC/n9xuYrKmHul0puGe6Y5IrZT6fq3npQBGy9Nwg5dUh7TvSbK5BW4CuZt+a+kQbzy3yfmlDQFSQ5JZVzrBlaeCiB9vWHKxS2PZUs8oWIzWMbB3CpbMjXsfFooBC8ttAnV9+13eAviZE7wxI+mdwRZjGCRlJ3UuUy7zwANcDH2DwIq5CdsmY4K51w2ITeN6n9dG4TDwACN1DGo4FzGRdTljZaoiV6S2UFK9wg7fYZre9BCA3xHJtw+PqFZKCD8T7E22h1IyatNXWOWHVg6TZ2uHoo9u1juEY3pGkh6h X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:cPOvhMs7LDGAvXIOtuQKnzxQX1Ql+5Tw7jJiw48uaNefoHrX8OPalsExgUCEO1/CFFymNyMfyu2TiwXREe0e9qzB9GqJTD+0k8S5l4XIVE78cVGIr1mLUb5Fnu5aGj2fYMnpR1ce28Ix9NfOBEGHB2Fh0p/2fZUl/6+8w7giuaFtN5Tc1Q1rZSUPUAUPQshvo/XpxY9wDhA8FNMV4EyA60FgH5shY+cGKFwg/5ZBDPf5r8LjUp4RpbBNU4E7zHd1CTvc0w3r9NpJ+m7kUAtGh1U3rblN4uL4m1oF+Aq5gm0= 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)(8121501046)(5005006)(13017025)(13023025)(13015025)(13024025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123556025)(20161123559025)(20161123561025)(20161123565025); SRVR:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:RPrdoRY7QTIVS9xVWSNlSbzutO480IrtiW46znW2/KWeRk62tF2hw1v9uebBK8vtOJH7zslh+X5zICIu9X0zuM6prz7rhIVxU5TltCtVXVd8tlnWyOHRzb2zieXgLEFpuT0rJRq7Yado5vfUFSYe83ySVTafIYR/evk2tnyAGfGGk/Tyq/aopaoOxSIpqms+Nt5lujtIwwuGmvF5btKbj4L2WoGmN66XokNZ6eIypjNDDTtK0fnHHwrXVeHJsv2qhcni65uVt8QUaQMy7xGQbexxZLOzDlwHlfMPv0bo4/sQC839poTrpCFwFpI1Ks0PzAMy1nKncEbvwX9FnbkA5wTanKhR6lBvyYtHAOJ5gLmdaHwFcFmBUZFgCu0KJ1upfwe9zRJ94FhhxCLYfZc2rBSxtw25dgB75obJsULiHq26O227YX/7IwHnPyBdPxzZE9mlra1d652rnuoGkN77A5t/x2srilRLFCALZs3vpAiNC/PT0uQJUtQvqpQoFBQrcf88wWaWzhkFfQBzAJu1Pvg0yU6kPBu0Rs1fP/v1lwG2LzjOaCRR1OYJQ9d+BmsgdTWl4PqpWted60ALOHDYCys7eKIzar6FHiarKs7zaIvqfUWHhSRkksILLGnIuIJt/2o/rXm1HPcF6qp61+9dYyz9mlcavqJzu8X2K6KCCCio+lbei2A8ICnJfEFi/KmAr/2VIfZFeBR9YTgU8GNbpw5R1f3spayfFasmV1kESafpFj3VsKeT+njOCdUvlV7A X-Forefront-PRVS: 0150F3F97D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:xqfRTyR9RtJ6R/VcGwd/K4QtDdlXOxJcYE0BXS0?= =?us-ascii?Q?6ufXXDMA1C9KYubJD9g1YDB8KjmWoWEX1oW99GTz5SuLDOwsQ0rg7tgn7Swx?= =?us-ascii?Q?ceLjXaMo7zkLe6tCk4/hxiwxl52gWWKxbpTFVgN3RopMrG85BeIKeUy9lL7o?= =?us-ascii?Q?22wAK/3g3AB+8v/MsDBL2J9RiTypjUW5BJmd9WwK0atWIq3SvAYj+B2sQgO0?= =?us-ascii?Q?l6l75nwknx/peValaqiIW2fajON4FTM0Z6nTdWzqJqSLw9jfvIKVPq50PA4/?= =?us-ascii?Q?TVwWeG34Mb9OimTgFDfyrHeb0pls9LhqpmBJCsjP5sKhbGKtkxUqHK6BbVBP?= =?us-ascii?Q?RW4ByZSPvOk+/D6AwhdaKAuk5Yowq/LKbiz/khXMIBKS3lLwW0cI71F/D0gW?= =?us-ascii?Q?ksuPkII+myB1czMoQeIFozhhwMMF53lC1DCI2SC6XbvlfuPsSaYqzYtj8/6g?= =?us-ascii?Q?0O1R6HwZlUeglTLE+7entelHlaxmx5yMs5FvVB9jpBz0Pg6yWzzzitqRkHi/?= =?us-ascii?Q?s0DqMEPfI3CJ39ZVxKvMPYwTEVW/ZrYSRHRw6KGSli1M3yRkNKiRsvQkHCKU?= =?us-ascii?Q?7NPyOEDQBGCQA+0GKeahEs2fN192cbUHdOgRFLLIhnvbxJHrTrzxiuohxIDp?= =?us-ascii?Q?5J0vUpwJZgLqmh6p2xZjbmlRHhcTEjkjc07MWcPSxrjlpBCjYxZHAB2KtK5q?= =?us-ascii?Q?Hi+W0Pj80M/aXRoJlMPYNFKpXc3RXtbyQIwD8X0yHyTHodq6eJ3Sg5GWtEqE?= =?us-ascii?Q?L+Dn0pBMYwL0zD6we/raJ5Vr5i4gaOYjhfPhO0wHXNBwQV4FrSChTtTH/knx?= =?us-ascii?Q?58tVLmfFvmJQouP7vjcU5iNkMoqA6Vrf5xcY9kOZnXfJRfzDxZykA9OFEL7q?= =?us-ascii?Q?GYd20xVdWm5hPkTVsFqqf/LqUIWA7/FXbv0l3qifFJkCjpFmlJJxv3aFKzcH?= =?us-ascii?Q?Bz5uIyCNAC3cGLkGtxEizw1fo3+/o6OLD9joxhD6S/yj3dP2BrrzP/cGD0/A?= =?us-ascii?Q?494g+6HnZ4NEhQLS40yawG1hGabI634eGJKUEQ8EvWYVKHq/bgbE+x4Oulmd?= =?us-ascii?Q?R/JPTw9PZG86FotDToedPqxofvxuuhBWVjjvSe8mq8PGGHYixgzTEwF9ZoUb?= =?us-ascii?Q?GfFDcctZfnPQ2V9SWg4vVcHM75zJ5afaKNMC9Tia9JNTSuOzQK6yWrpBW4vX?= =?us-ascii?Q?n1UA1p6+8+33gXmyTa/CURzHGOdeLUtHnkaGe65JmyQ92zCD1bRi8GKOCAnd?= =?us-ascii?Q?gGEW0ML92SNkbvv52tjs=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:kPupwx+Zds2TPlo57YQUcLdMSy4VJNfB5OgcDUoVrijRBIp4DdmNsBvSXjLAPY9+I5BVsbyhqmHKyVkJjQYkrRxe5eamm7f4bqHq2vXcCrfSFNyq/xHb/2o9ciY6Llt4TK+S6qAWytqOb3MpJg3P/2fuOKk8WvCzTqAzU6wIO2494ioXkIH5KurqJ2NNsAE3R7iSHb//e1gIAzXHKvUp8OMTALJWkEsl5zuMFtgRX2sBpovRJsqTsKy3LWuQDRpcu7yvUc35WOKyJ500nLjQ9DsMIygZXLFW8Kwiqq376kQvvOyGdbzX5FzOw4RuijcQUag1O1c3hDuYDSpTicu0yQHMf93mzHWa5w1kH1A4gdc4lPuSBplRaHLfNmeRZZIIScDlbVN74GwoG4yiwAUQwiBHuVDxvowlzIdBVXTYShjzll6P4SNwTGODJmZIS6pI; 5:2IRvn/Zhowf7FIUrkmgXW8RmhlammRogaz2SjRbgcHDizUZMKP+PGup/XuGMKld9AezSlStcgwZQxuSbSTxIXWtI29J3mN7Mqy+BPHhxJx7yUbTRMldyEX9Eyl8QkcM/1XjmvpF/thJPyqRnGQCc3mwpnqxA8qavQlNIoPBx1z+ekJhEPX6rmrUPawp0H5vB; 24:YDUrTQXCfNLxDaKjD9dWtt3B8GZp7qqXdxXJz7ImFJrd2Khx22rGmUFod0ImNepVz96cudyvE8n34hEqAtdQYICZUP8gCQgoJz1z42+vSjA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:dQZ66VIe+TiwyuS5kUGh+NGg3l4lTw7FBgrK6GCCjgtgLIw884oZD4VQgbIMoueDSFE7rUC34gPaA76wvDd51jklOGbuVSJyh6mddintRY/vGMJVO5ANbn2vw32KIRbWv2JxvVZNe8EmZB/oocG4CchzPnIlyL/X02XNmbbfXGsjxuU59vCckb2QldNWUojzNd0GOzAuVsL6azlL0vfOnBDUX7lvjx7XvuxnbDs1TZcUM68l5rOJkynD00Nz0acFQ5cq0dXnjKXNCRVCkm1tmS+/dsSEZjYUoKXBvrFRQ3s6pUcw5bE2R3vVG+p1jIWscYw/Rq2XqO6Z/71InmiK2uqBRFzbZyH3n4d2AVImixj6jT7N/ZS7c35Enpl2308o5t61XABJEI3U8GKbgsnM5pm9Xikmi8p8hiJPN4abAdk3UwmI4GDyYHGe4qZuJRndoAvYgF877+BxA2zdrmESWA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2016 03:55:41.3082 (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: BY2PR0301MB0742 Subject: [U-Boot] [v3, 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 Changes for v3: - 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