From patchwork Thu Jun 2 06:54:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram Dash X-Patchwork-Id: 629041 X-Patchwork-Delegate: marek.vasut@gmail.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 3rKydw2NmZz9sdQ for ; Thu, 2 Jun 2016 16:55:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 380FBA74FF; Thu, 2 Jun 2016 08:54:49 +0200 (CEST) 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 WoclV9-dPa92; Thu, 2 Jun 2016 08:54:49 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 27D7FA74FB; Thu, 2 Jun 2016 08:54:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1AD8BA74E3 for ; Thu, 2 Jun 2016 08:54:39 +0200 (CEST) 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 8j9gjAEREqg1 for ; Thu, 2 Jun 2016 08:54:38 +0200 (CEST) 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 na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0080.outbound.protection.outlook.com [157.56.110.80]) by theia.denx.de (Postfix) with ESMTPS id 2048B4BB3B for ; Thu, 2 Jun 2016 08:54:31 +0200 (CEST) Received: from CH1PR03CA004.namprd03.prod.outlook.com (10.255.156.149) by CY1PR0301MB1593.namprd03.prod.outlook.com (10.162.166.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.6; Thu, 2 Jun 2016 06:54:30 +0000 Received: from BY2FFO11OLC007.protection.gbl (10.255.156.132) by CH1PR03CA004.outlook.office365.com (10.255.156.149) with Microsoft SMTP Server (TLS) id 15.1.501.7 via Frontend Transport; Thu, 2 Jun 2016 06:54:29 +0000 Authentication-Results: spf=none (sender IP is 192.88.158.2) smtp.mailfrom=lvd5587.freescale.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: None (protection.outlook.com: lvd5587.freescale.com does not designate permitted sender hosts) Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11OLC007.mail.protection.outlook.com (10.1.14.254) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Thu, 2 Jun 2016 06:54:29 +0000 Received: from lvd5587.freescale.com (lvd5587.ap.freescale.net [10.232.34.77]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u526sR96002168; Wed, 1 Jun 2016 23:54:28 -0700 Received: by lvd5587.freescale.com (Postfix, from userid 65022120) id 5EA8968086; Thu, 2 Jun 2016 12:24:27 +0530 (IST) From: Sriram Dash To: Date: Thu, 2 Jun 2016 12:24:15 +0530 Message-ID: <1464850458-2850-3-git-send-email-sriram.dash@nxp.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1464850458-2850-1-git-send-email-sriram.dash@nxp.com> References: <1464850458-2850-1-git-send-email-sriram.dash@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131093240693474859; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6039001)(6009001)(2980300002)(428002)(189002)(199003)(9170700003)(11100500001)(110136002)(2950100001)(90966002)(52956003)(16796002)(189998001)(5008740100001)(6806005)(48376002)(47776003)(8936002)(50466002)(76176999)(101416001)(87936001)(50226002)(50986999)(4326007)(8666004)(8676002)(81166006)(92566002)(45336002)(2906002)(19580395003)(19580405001)(103686003)(586003)(46386002)(229853001)(86372001)(2351001)(36756003)(33646002)(42186005)(105586002)(106466001)(5003940100001)(7059030)(42882005)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1593; H:az84smr01.freescale.net; FPR:; SPF:None; MLV:sfv; MX:1; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC007; 1:d8N7mShcTZ5v8o1wWlFRMek75SURAAMtIwQnIHvbWMZxCdDgFJAqfRCR+oj36RNaY3V6clAUU7ygH5jkVbZ16XLD+0tBgXjiAXjAPLqr9UZws3/dyRgATrV0FWwLBRQR91osKrgbz38BraNzmjIs2Ul+6+mPHGCqUqUvseDk7ZYzjmH8BIgMMsXJ387S+FZ6xL0vI6B4sb9nQB3uXllMbnRLBIonoQKpTrZnlLyAT1v7DWyvtmZRJg05j03GhiSYZZsOHp4MXXMqJcT4GqLwfKmXsS1GTIOjioc39bCuZNjfpFHcmlpszLoThgJLXkydegbPaixj5ps9NBNMDtP15yL/8IHqYTlMKVeAgvf9wXYRRgAX7ioaYIf4vllg4nyN5Ln7Z1ExKgDqfV0jcIe1G1edBRGPNJnOXVz4yyYg5tlLUyNjjsOHF7jSWhPtolcxiLZacddHh2DJlwInOmXuUixmBT4OCmjgPXtZWbx8d7fDv2YpfTG4tVHevU1G5ekoIZtzpgEPh1TJPc8S8N2URAuYJnBwgJXczdhiZ+bXCHUMNoEYNf4Qq5yg68rQQHdxGgPBYIEeNT+ktdLZQVlesmqy5M7yBVixsCWh1VLFR48yIS2Xo1yOdhU66uhsHitwa5/OFSuSBRR86I8e+60MsE/5lwJGSJ60C5krxSO3u8bHjfqS5el0A3bAooMLo+lg MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 8c44300d-d741-4db0-3b3b-08d38ab2be61 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1593; 2:f9dFLgQQg9k3W2nqYqHg4E1VdMWK9m1Vexj07TDJKtJJbUQipxl1opX1BAOZskR+Pr60Fr1vTVmyCdDpxCVBkGi6hX66f74e5SeMzRNClhdv9m+teneCzfj9XjZ4SXfAYVFnw2fmuBWJzB7w/UUzgg6SpfE0DFjU2j3cFwyJBhYy+kMi889qsgKETogJtu10; 3:bB7zv9juXcIKo0iwMmT39YzAfxwhtDKCXLfUQ1LrlsfjTD4NHfggl8TbOW+FDFnn8L1qrzOcKoq9CyTHN3DjeL65ECEBRvIoWraFkGDCGWzKQIpNsrq7VT1Emvcw+cfnxRcTR4Rk3gtAXspX4h3jVH3HMcjdkmscQJBO0bNPiZcB7M03aA+KIskCwqhWHHvzsEHahuKJdQca/JHVP0RdHKCZutsMAatL8K59kDDnuTI=; 25:bm9noEK6Y7PqFZahdM+3tQFDqswzvZMDDH/ifnyoz6yZ89GZstSOI+5n+Lty+DOXgT7/oNB80wqvmVS1vdH9PRWQIDY36FA7kvGNdaGKaMhdKahb7Myj0hc3avFeVF9ufIWMLY1Wmvx3xQKQfjUuDK/HjDIy2oU+r+x1QbdqCifCb0WSjeIyM/0ZJ2juiCXWk/q+NvMCoBsrfMokNDPzSTGRvfh/XBPtRLFJlJRf/3ReRTJjgVg596gVvXQ+L6c/69MWyoHjqab3KnepHU+K4ILVFC7CgqFgvYEUdINoS0+1t6WFpATjmC+UFwVxeQqsqevlsaKY3uz40jtL16gW6npaCfEXl+i7xiSTELyWzi/Ai8JSXyLWm+wH4KpeteIz6HqMrMMVED+FPy7D/mZI9QjxuymCKy/ZnRe43Wk1jgI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1593; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13023025)(13024025)(13017025)(5005006)(13018025)(8121501046)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB1593; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1593; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1593; 4:JQuh4BSJrygive7jezxmftT+07JhvZSAI3yekn15MFBOI4RLgTLjwjGnxbVz9E1OARfN3+c8nP/A0jFIEAORMnw3FPeidZzxzyOhPqxNuRspE9NN1sIRkRKtgtdsV8sEqXf+bH4aIJQrH4tGdFW/BRt0ayxe4CESQ5j0vNjfsa8CMEcf+XP88uVtHIlE+35NzpWC5NbdcfkYg93BKtssTCj1X3jYNncaKwG1gwwWpWHm6HVwNh/nfMkd4DBqkmfTTTkDCJ/EB+7T1GxN5fsw/VhJoDAwLTA1x3noPNgKoR96s8WYJo4Xe2OzZbZBxTMhdRj7IY3uMQhb11aMtsMyYY51u0Yn2sFJSszMKos50tJ8AerX7QIpeCbfHDQi9mQT2NboTUaZ4oRRb/YiM3ExSJEMfVavnlY2NU9UiHEpZFrh446mRBn/oo9THTXbJI6TBztbRz45GCMc6r54rAfjp1N+LmUycxIMDvmiOFl3YEPrjziLHMQOQgMlM0BdruPUezrYyvJVXVJNYqkfwD1dig== X-Forefront-PRVS: 0961DF5286 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1593; 23:YalXqWnneuD+DLNakiqimhOAGJWWMWQem9Grq2m?= =?us-ascii?Q?sm+EcsXL7st5UkKvO5sV7NIIx2lZtr6Payhj3T3zbnVh3eAcFCJtT1gVGCKr?= =?us-ascii?Q?dmnjcOEXN7c6M7Ez6k2kVOMz5E7hCns1WbQgDvsa9OBZkoVwsPUc/zM7eBbZ?= =?us-ascii?Q?otRXTqUxAU4i+AL9v4IhPTOfctkW9Rf1qax6jQQ60J4ACcph4G4lWtMkhHcQ?= =?us-ascii?Q?pFrwCRhIWg2C1iTYMEA29/HNqOIJvgfNRkhcNxErYyV6BaDpAmSMswUv4/t/?= =?us-ascii?Q?RzrERo74CmSVlUMC/ET8OFzf1BKst4aNXJjL3rbu/JwYgpSCFMUNHmu0Dcga?= =?us-ascii?Q?ELgKyNsEFgKQrQQwp0f78s+khXl1MGM1PojwslsLAy5HdEPXnD832icme8wJ?= =?us-ascii?Q?XA9aAuABHBx3JeOg7+5mvXOJ+JNeuB4kSsBsRA67kabQiWfAtxzT3zDM7c1F?= =?us-ascii?Q?V1gweGVeD0M+7pJyBO7FrKlX5sEiiN2grDflWcmwYBywvX1EZMOYtOgDyKlt?= =?us-ascii?Q?9a/i/1d2Kgg8NP1t7dofE94mXSpxyPv7ttqSWzcr21J4WacRRYv5iAokGEDu?= =?us-ascii?Q?m88qEL2ZQoXxcswHrA4ssCYZ2+GB4eTETv8wbC5pS+UWdFnsxF0rTrQdxgoo?= =?us-ascii?Q?a4H5ox+eqYzxX5TmuHDUg6V4vDS2Ga+rcqeaF4ORCkB2GZ/uMxy+YxtpvutI?= =?us-ascii?Q?3uD+mvIps7GSWPZdUMlUawHCaUVsW8JxTfbLvlfEJ6lPDoI1IkZYcgr0nz/Y?= =?us-ascii?Q?uCuzLIZL2+TnJiGZ2vzockZbYIJtDo+qPMn5f3HFMrgxUJZpJhKaEQdxUBTW?= =?us-ascii?Q?cjzRfiUg1diEIMxz8GQpbnQhUQJAVM1lJVybKQKlgmJdOnX/2pWAvjRhsoBY?= =?us-ascii?Q?jAFnzYyCWHHSqIgL/Q7G7xD3Y8UqnF30VLNJkAcgN7fpSlV+rAmhK9OWEzDw?= =?us-ascii?Q?kIwadJy1kqqxQ5Luwmy9g70GHPqvY4jFb6uQAOGs358BJtT8kQQgNVyO8pTA?= =?us-ascii?Q?aTZNXZyQH6mdgtWMB3+lN5ylQQhGv5lpci/eSNmwS9tydoRAPQzIq80w+c16?= =?us-ascii?Q?HvUomj2GyY1JdbXo+kyM9rRSgNy96mPlWeSnk0J9IJ/SW8B6mPxid98+BSOT?= =?us-ascii?Q?6wsg07YoMDZ5FQWH3dYIgiEbsFjIluremqJgVQAfmCulEWKcQBmJLGx2L1+k?= =?us-ascii?Q?1y82AF1VodNp06iEVs0mwg+iFbWHzW1LBo3jTwCgr7ks7upDbnVbPghaaXA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1593; 5:UttFrJBPgldcZQFPeDE0AaVQ3zA+Z+r7EsieQeMW+ycbxgnlOj1SlXt/AHnQ97RrxBAzCyCY+Vw5FzvPCdpRqTAB8q/7KDPuSLWHKFFG0aZRRBi6MVWVfTaxZnGv2FsiZ4YmZDowQDodsDRw8DAKKX0hPv0JWvOyJXqoL/6HRYQ=; 24:0DnXxy7ljLx2SU6rxClKq2WohIj4GgK36/273YF8feO6FDy3BVUb+tHnuUbvq+Me45vlrFBXycjgXsjGo8dCYVXsNoU46uXsB7LqeUgIpeU=; 7:l9vhj52/cWb1iEIvkuB/5mtS/vX+/S3e+xMi5OWxbjVOywI40PA5upeZKk5PuDi/g2KEfn4pwz3dD571R2zhDahjV80MsAKhS86xmXorvcJROI8UqzxbDdY6TthUIQnq9yixNHhug9Ea2fpabvj3uqeib4bO5e4cSj2I7MTBRf3ijblSFPOeh3Hqrp7hkSCv SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2016 06:54:29.1134 (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: CY1PR0301MB1593 Cc: marex@denx.de Subject: [U-Boot] [PATCH v2 2/5] usb: xhci: fsl: code cleanup for device tree fixup for fsl usb controllers 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" Performs code cleanup for device tree fixup for fsl usb controllers by making functions to handle these similar errata checking code. Signed-off-by: Rajesh Bhagat Signed-off-by: Sriram Dash --- Changes in v2: - added patch description - remove the MACRO and use fdt_fixup_erratum function instead drivers/usb/common/fsl-dt-fixup.c | 58 +++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 6f31932..cbb008b 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -99,6 +99,23 @@ static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum, return node_offset; } +void fdt_fixup_erratum(int *usb_erratum_off, void *blob, + char *str, bool (*has_erratum)(void)) +{ + char buf[32] = {0}; + + snprintf(buf, sizeof(buf), "fsl,usb-erratum-%s", str); + if (has_erratum()) { + *usb_erratum_off = fdt_fixup_usb_erratum + (blob, + buf, + *usb_erratum_off); + if (*usb_erratum_off < 0) + return; + debug("Adding USB erratum %s\n", str); + } +} + void fdt_fixup_dr_usb(void *blob, bd_t *bd) { static const char * const modes[] = { "host", "peripheral", "otg" }; @@ -164,39 +181,14 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd) if (usb_phy_off < 0) return; - if (has_erratum_a006261()) { - usb_erratum_a006261_off = fdt_fixup_usb_erratum - (blob, - "fsl,usb-erratum-a006261", - usb_erratum_a006261_off); - if (usb_erratum_a006261_off < 0) - return; - } - - if (has_erratum_a007075()) { - usb_erratum_a007075_off = fdt_fixup_usb_erratum - (blob, - "fsl,usb-erratum-a007075", - usb_erratum_a007075_off); - if (usb_erratum_a007075_off < 0) - return; - } + fdt_fixup_erratum(&usb_erratum_a006261_off, blob, + "a006261", has_erratum_a006261); + fdt_fixup_erratum(&usb_erratum_a007075_off, blob, + "a007075", has_erratum_a007075); + fdt_fixup_erratum(&usb_erratum_a007792_off, blob, + "a007792", has_erratum_a007792); + fdt_fixup_erratum(&usb_erratum_a005697_off, blob, + "a005697", has_erratum_a005697); - if (has_erratum_a007792()) { - usb_erratum_a007792_off = fdt_fixup_usb_erratum - (blob, - "fsl,usb-erratum-a007792", - usb_erratum_a007792_off); - if (usb_erratum_a007792_off < 0) - return; - } - if (has_erratum_a005697()) { - usb_erratum_a005697_off = fdt_fixup_usb_erratum - (blob, - "fsl,usb-erratum-a005697", - usb_erratum_a005697_off); - if (usb_erratum_a005697_off < 0) - return; - } } }