From patchwork Tue Jan 17 02:43:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 716018 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 3v2dx33x0Vz9t1T for ; Tue, 17 Jan 2017 16:30:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D1DC8B3881; Tue, 17 Jan 2017 06:30:41 +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 9KWQL1OLCvGa; Tue, 17 Jan 2017 06:30:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A5D58A75F6; Tue, 17 Jan 2017 06:30:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F3133A75F6 for ; Tue, 17 Jan 2017 06:29:54 +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 px7oLW0h4b0B for ; Tue, 17 Jan 2017 06:29:53 +0100 (CET) X-Greylist: delayed 9154 seconds by postgrey-1.34 at theia; Tue, 17 Jan 2017 06:29:47 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 NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0056.outbound.protection.outlook.com [104.47.34.56]) by theia.denx.de (Postfix) with ESMTPS id DAC794B99D for ; Tue, 17 Jan 2017 06:29:46 +0100 (CET) Received: from BN6PR03CA0022.namprd03.prod.outlook.com (10.168.230.160) by DM2PR0301MB0752.namprd03.prod.outlook.com (10.160.97.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 02:57:08 +0000 Received: from BN1BFFO11FD010.protection.gbl (2a01:111:f400:7c10::1:177) by BN6PR03CA0022.outlook.office365.com (2603:10b6:404:23::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Tue, 17 Jan 2017 02:57:07 +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 BN1BFFO11FD010.mail.protection.outlook.com (10.58.144.73) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Tue, 17 Jan 2017 02:57:07 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0H2v4Bl025355; Mon, 16 Jan 2017 19:57:05 -0700 From: Yangbo Lu To: Date: Tue, 17 Jan 2017 10:43:54 +0800 Message-ID: <1484621036-8015-1-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131290954276739453; (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)(336005)(39410400002)(39850400002)(39380400002)(39450400003)(39400400002)(39860400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(626004)(5003940100001)(47776003)(4326007)(5660300001)(36756003)(8936002)(30001)(104016004)(106466001)(48376002)(86362001)(68736007)(50226002)(356003)(8676002)(33646002)(77096006)(189998001)(105606002)(2351001)(85426001)(2906002)(92566002)(81156014)(6666003)(81166006)(6916009)(8656002)(50986999)(50466002)(110136003)(305945005)(38730400001)(97736004)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0752; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD010; 1:Wgy28ANd3su97JbJ8eA+WOi05P/wZHiK4zAZjKeUqQYnAhdVmNws4I6LGOkO4oDFTn9uqawbBf+kJUAioww7enlhDpoHnmwi8/o/GyRCOI5cHA83ygNXNEm8ErW+CyK19HswdHyvhViVNrilxrlTYqisGY+w/cGNyPHgYjtthGumw0QUte89JQ/igXBkRw5a49DRET7LmdufTXtsMKzCgRPN9YbO9/glhTv6sC0hNudZeL6eC4WJDhou3eGfyWmr+zWrkOooSmS0WlN79ltp3UUWJ/JQ5sSDNUA7FY442gbJXpxJjR7xtRjxu6VQp3vmjcHsDUx8uE1KGIYR8jTq6f4Tln+nP6QxGF3hIBaWG55K6bZNI1DzxN4d4s9mmbPBOFf9sAS9Oi9adRCTamSqwbCndJitHR9IaWrbklf3KYipt+DpkHtWgt45l31N0DnDZnkR7b2Xhrp+c9xDV8Rp96V4fxYTLDCKaKVcWDpQhxXVcNK86gcBmLyI3Q22JuH4D0axTD4vbgEXF/Oscd4c+527QBI921MXWqq4MMiMTbt39gahDIaK+c87j3E7J5546aNPzOIMgFtxbGovPjS0mmYSl5AJ0l7jHWgfNeRGT0UqvwN9C70Xh1lZDDLK8rXJ5hr3jgu9h1I3ZYFyL0yg9r8Vx8LhijhfqiPNcz2PUh/JQLAMOHI9j48Z2xR64bWz3y7ABdj3Ko3spIFUqWJdTQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 848ecdb9-e387-4940-0e9d-08d43e848647 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 3:v7Q+P0pue3seud7G2dqh2RCN5PYUz0f0dw2RC+2pfM/D9JiGxVWEI7Q7xK5bKug9/PuiGCVjiMpVUp8pNKtCXWKP086Yf+OX0A/Rqn5QgODX1jj6/D7A/vzkJ0bmPyeEOt//Fg0xLN6HW4kyI585+Azu25JjhKa38KOk7CIp3/QG/Wfg6ymys7cKANYgToN/9Hky6QNLTb8h2nY8ecjAaopONNmPWmHOQzYvqLqHhBf/GDtsuZw1akVAp/oglsNaT0jxp+WXEgGx8oRd0+NwOsrClWI93AS/r7hhgN/DmG5w+4VWAv2Oo3dR4a2wcHv/FjUFYSSRL2UrtIrNUhw49WQzJ3glifgTwAoeQ4QZPh1UQDZeSZ9DELDxXO5Ewgd/; 25:LohjDBRElcqi39RiCTCU5dbUmec6gkxszJDe7pSixiURHKPv9nEPMajRpkbpkZ+8gixaWSoqUQGOTQCNP71KorO8KZIHTEpgneF2YuKF4aREhHNM1M3EK4qW6dXA33LXwdwf1OIEVL5KhyRvxy7Z60wMnnRkLg55wlgLMEmga9C2TCYVdt3M7GxDPv4sLuVnT9t9npnDygNl9f6nYTloscfDAiEWS8hFp1d+XyAEz01bIwZJsWpun/wu10Yo6RvovNJgR2Aa00Ebpk85oeRTTd/7ZKub4CMbFUJmej7WDEVTm6XYpXnhR97dVXSw/9A8iC6ncSu47AQl89bS2+6umQftuq0BAnTl+Ox4MSX7bFBT0bnUu8KF/id0IwUPSWsDY4mLUpPIRx6uZsjXktDT3nd0LaRB7lafNKjLoIWXegAnvUNz75ur3TpjYPBazmWJ+xwtaaMC/o4rNFZrJC55Ug== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 31:7FuYSRgDZ/LkTt5+5pE8Wr9icrxnqUbUXXV9ozHdvjAmVCoBgjlH0cDO2jgTnH2JNpBDQ/rqzyQbto+eRkhUCs+FC76081JTVyTb8NSjvNeuDdA6GCJ7/Mcb4KnwTm+mYvaNRfScd1REb1RZkmjwS6ylsiviv8ZVQiomg2jmfxvvSu3tuwrJau/BcjBPoDbjNyQ2HyURkC0Zt+rRDogb3IXbwZr7PjzaJI0cwRhkXbTWFz3lhr5tYkNmI4/IOBa4jCb/jSUdsxNZ9ImfMHxNmQ2+oXob9qSwtUKp+w6GLSo= 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)(8121501046)(13017025)(13023025)(13024025)(13015025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:DM2PR0301MB0752; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 4:krQ+QyisKGISd3ZJb2Qo0Jl3dd13VBiSSlWaiO3LZEINYVZGM3Ta4LGHqNA7jilYNNU1eO39NmzeeD3av43vGXfYh8gRiXXO1opy9Ll3UosiaBumMzevpKCBwe6ztLLafIYEnVD/ykaq3LKvDIYyewpjSkFVTl+PNvl6jjLbXXRdvYkT9e0DOhXJ7RyDs6A9Ajn7j/DfrNjus5ink67SIbvNt+VvMJPfYILDqsEdQ5ydG+7dJ79KFDwfPn+a0+ou5JdhdzLoOIH6wLPhyp5PIM+PEfSucpFhx0Akz93GybBJvpim2g0eUPih+SAsPuQVdiyMHZTJi7hzaO2D74O5uxeoY8Nr6X3olEtfzsM/ZTRRCXgflazluQa+ctPsZwjFCGB6sXTGhMLemr2uTmLvgYAIQUQQ97rCYKNZ3v/MflziH+lfSHzisSX8mwQHpivjd98tveYoch8gNAS/7tOvv2yJaIJXVRhHUbQOpTLB3w3jhfKwDli7ncEG8WfK3Vu08p9Fem6xoANXiX9g6o1RJhAAf/gloYm7r3wapqLNAyUeP60HR2kybucsP6vYpMdnjD/fa+oiM0jc9Jyo7fpztptJb0+7gF7oRt29HU40sA4klihNV+2oVylTIFEBfWzmKQx1mB0ufNAwrEBOl6/UH7GqfM6OOY5uHaKiaus+kPUyAhW0qQwZZLNeMYZxxiYXdw5+pDu5D6bAMLZZTMNYBC1wVCzv0ruiA39x0pCrnlL/bCQmovwHOxWP5cXNMXdz X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0752; 23:GgFc4YwuQTqOruN8ZIjH4c8PAGeC1kE+xJj4rRP?= =?us-ascii?Q?iynv3aLCA76fq661nZ4dPf+eusNShshEH6b7HAIttVUihov9up33e5zflDsS?= =?us-ascii?Q?C5imNRSvEE4289ucmUIGk5GNpddQXGYuQxIVhos5Gv0hNTWCmUnxSJnAbJ7k?= =?us-ascii?Q?ftrCBdsEsDttbnwHScB7r5HATMD4Sdxg8Yq4ZTF4GEAtVcnJl6qsEYzvXFmi?= =?us-ascii?Q?em52neQga5X1b/tNtrOT/XlSK9dsZSpSWyOSWeyoox9KDzI1GByUuWBaf8ZZ?= =?us-ascii?Q?b5q0u8UBkCxzVIyNVbV0dMcRm6rvZwa0uF+4kFM9fppt8xLv4M+IwWohk3r6?= =?us-ascii?Q?amjV9nfVzeWOIf71TzGy6qNb4LeYz4dltCLU/1dPQyeIHS+9t7VfzFqGs+xK?= =?us-ascii?Q?edE55XYYBvk//gikL5hrqjwL39+3Xxw+SS/d5C+sp0WWiST/E34+Hzcm8+A+?= =?us-ascii?Q?Q6SVnJs+O9ZN7grhATVTe9aSpmqQaP+uXS26mLXbHkLBz0xzqQBIjNkzEXOv?= =?us-ascii?Q?lhiBDDPaSXJ44Vc/3S3ICNkpDExVAscX0qeTkP5vbrgnqomBRPZnxofLAVsW?= =?us-ascii?Q?rqt1IU9gvq047IxYbf370Qd2VzMF/0uW8YLM0j94xzPhELBEZqMO7Y4lXuL+?= =?us-ascii?Q?nlKW4J0tMLmYKMwU5cTR+HHMAkX32D1JPxhnJll8JIewiT8rle00ezcZicju?= =?us-ascii?Q?QfmgJXiB1gvtC1DeIYaDsAwS6NuyUm9X4AlYXvSkniajvC2cwFmoorhTCu05?= =?us-ascii?Q?/30madT3vg51B+11ijXOrzuXVpXn3Lkk7584wjNzfgYp9+SV3RDjw6H1kuEK?= =?us-ascii?Q?QvIZ0ltzuGYjwAWh8XqyLJtuVQ//VFuAP5WgbwwJt/C7id3MARGLLFPJYUhk?= =?us-ascii?Q?FxTGOA4zX7iC3Fuw4RDII+jsArD4oELW/hmdAVnwlnZvZkbLpfkwh8131lUI?= =?us-ascii?Q?kqtdZqqrIoYTLD9EkyxFW8P8afZlMbDnCfw8Cgj4zXn3J8QTh65jWFdJgdv+?= =?us-ascii?Q?WIPCxT4bHcnIClvpEb7k3Dj7Ms6prLK/YKPwzcEiABgCqTk29AgAYOaS2IIY?= =?us-ascii?Q?SRzZBW7jorYdmRWvi2lTjIT0ftZYlxsFhJSeehOewh2L1kREoIs3/XvlgKF9?= =?us-ascii?Q?RbxgkWmks7DrT3BaZyuMnGDdZZeQRFL0rskfsDXoLxEBUbN8wJIhUWH+aAwX?= =?us-ascii?Q?ivxG+99bN8EjjjBTdWW0zPhJwsJ6k0GDjghzRDaF2cTlhwjA27F3Iy/Wfel8?= =?us-ascii?Q?KJgddof7A8Qpwfby7cgI=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 6:sGT8p0m3CCjFmikH/kZLaV71SqeWMQrfz82nqUE0oj+G2wgZfLcpMP0CJjWcZ4e3tfe+lGSW4BxqS6rIWC9b47PbgRuBA0gEM5GPZCkgew48T+2RDOQwA7AbhhSlf8MoV8cZNczN1iu92fbhUPdliRle+lkbxcAuExpYMZqizbf8bf37k9cevJcGlMHq26c2wa6vr3Z2DFdb+WFyLTQdFRWWMCE2DdJAh4v4Fzl52RaD0Uv8tD/yb45UyzV7oEfXPo4pKVr/4jmZt5h6+dM21o4gpHb5kHZNoWfXeK6YCruS1Lt7+LIeGVHTPPgdI1Bej8HmKqLU9pDEupTakqAWdQZdWJ8FXd91EVnWvhRXyn7LQOiRoMA1tqLrxVjv8YtXqFN0bRkUfAEc3bkpZqlMn+YRsE9Beof45SNp+4q6DCrLvkYlDfynuSuDnwjCfDLs; 5:WxekoLNgI24x6ymHHDC1nVDUb4Udcym0fqew+gNXTwIMsWI4trNdT5kQDD5WQqclzB36Hy9iloC8Yhcd7lBBJf/y2GDJBKxWXwamESJKP7OipZEKg6zoFGeguKwfuzghm/v2NEoZvRN+UF6c0wS97zkQSRE5FzqCcuvkQEkhGiDPPIm/nNlzEs+hx1NKda/t; 24:bce9R9RCvMuFL5yIf0ranwN4nVRNRnQLdOXxns9OnpxATDA8hP8l/kXMDf4YGrwhQ/iSouag5xwac+68PXPt1vMPOu0cWTycmFqX5pkSih8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 7:AH4Tp0ltipKRsg0yZN9bz7ubssPlb+Ju21UwmMBcwLGZFzJJpgELxIbUQ/IKGvEnuE6VnyZUapa/i3QMLVhT3Lfy1WUYa46z+a73HUNIAmhdoOUhr6oyiziw6M0MST/6WiBp5YDwynMsIKMV0D1putyOdlwv7ftMaPdMF67fuhvqgu8GLZ9xYrEi581B5xzPb3PmjlbDbnP1IZ8a5LWVhD08uozctSMJdjNdrS6sAVE74jisUTDdfE0UtLwSBPUX8+hgp7EawSuIECA/yDxwaQHJPfEGpMDC6hGYMldZ7h4mea/Ws+xRp5VzvNlTWg6zfYeEFMbjIIDe3wb8DohxA/q2uYDolDsFW10pog15FZ6aNDvlWUs4sqlP9r+0uTqhFMF8/B8KXojokRyfsIocTMInruU5SKWV0hFH2pIboNtOjBxvZ/QbjSqO6rqZtSaNLdioEvoxmJ7pDcGyN4St0A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 02:57:07.3619 (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: DM2PR0301MB0752 Subject: [U-Boot] [v4, 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 Changes for v4: - 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 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