From patchwork Fri Sep 16 11:42: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: 670821 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 3sbD285scKz9s65 for ; Fri, 16 Sep 2016 21:43:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1AC084B6B3; Fri, 16 Sep 2016 13:43:42 +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 Qd_o3WoBrka3; Fri, 16 Sep 2016 13:43:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A489B4B9F9; Fri, 16 Sep 2016 13:43:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E24B4B77D for ; Fri, 16 Sep 2016 13:43:33 +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 7b0Mqr1Fk2vL for ; Fri, 16 Sep 2016 13:43:32 +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 NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0086.outbound.protection.outlook.com [104.47.38.86]) by theia.denx.de (Postfix) with ESMTPS id 4B1134B624 for ; Fri, 16 Sep 2016 13:43:29 +0200 (CEST) Received: from BN6PR03CA0038.namprd03.prod.outlook.com (10.175.124.24) by SN1PR0301MB2013.namprd03.prod.outlook.com (10.163.225.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.629.8; Fri, 16 Sep 2016 11:43:27 +0000 Received: from BL2FFO11FD027.protection.gbl (2a01:111:f400:7c09::158) by BN6PR03CA0038.outlook.office365.com (2603:10b6:404:10c::24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.619.10 via Frontend Transport; Fri, 16 Sep 2016 11:43:27 +0000 Authentication-Results: spf=none (sender IP is 192.88.168.50) smtp.mailfrom=lvd5587.freescale.com; writeme.com; dkim=none (message not signed) header.d=none;writeme.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: None (protection.outlook.com: lvd5587.freescale.com does not designate permitted sender hosts) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.619.6 via Frontend Transport; Fri, 16 Sep 2016 11:43:26 +0000 Received: from lvd5587.freescale.com (lvd5587.ap.freescale.net [10.232.34.77]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u8GBhOD8030340; Fri, 16 Sep 2016 04:43:24 -0700 Received: by lvd5587.freescale.com (Postfix, from userid 65022120) id BC35568086; Fri, 16 Sep 2016 17:13:23 +0530 (IST) From: Sriram Dash To: Date: Fri, 16 Sep 2016 17:12:15 +0530 Message-ID: <1474026136-13295-2-git-send-email-sriram.dash@nxp.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1474026136-13295-1-git-send-email-sriram.dash@nxp.com> References: <1474026136-13295-1-git-send-email-sriram.dash@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131184998070374810; (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)(6039001)(7916002)(2980300002)(428002)(199003)(189002)(7416002)(626004)(19580395003)(16796002)(19580405001)(36756003)(8676002)(4326007)(50466002)(48376002)(46386002)(305945005)(11100500001)(8666005)(356003)(7846002)(2906002)(5660300001)(2950100001)(92566002)(47776003)(97736004)(960300001)(110136003)(2351001)(76176999)(68736007)(90966002)(50226002)(103686003)(189998001)(101416001)(52956003)(50986999)(8936002)(42186005)(229853001)(33646002)(81156014)(586003)(45336002)(106466001)(575784001)(86372001)(5003940100001)(87936001)(81166006)(105586002)(7059030)(42882005)(4720700001)(473944003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2013; H:tx30smr01.am.freescale.net; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:0; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:HyOq8gkZHBDq948NL8qfuO8KEgN1Tiul3to3JjTR0kzkEd04K0Nhb9AUg3iBXc4MyOJI0PoFGBgpkNzWAwX97hwSh9//IhwsPblgE77tz6SQOCaD3X1mAwGP49PJl4m7DGPhkTi7a9K2YriyjOXguxTU4z3owk1g5YIhRo344WMwGelR5RKF8XDzM0mZB9rayI3fh9FlCVhe50xZrpqnJk/+AubVnv8ELSYX8FiAlOxYkXRtrovVlAoh0b2v5qCPSvAwD4w2NBuAvStTQQ3fLHfxkAdyL1s59kGBcJd1Zv+QTS5Qy09ZDc4EdaDEqN9CUqLWKrXjMe5+h7R4SrDWVvuymqZBxsJDllg7mdqjWQI1twZFLUZ9i5cezOv92WzkA/RVUXYJZzRrFMQN7eE2x0tmptkm3E4ZYRxDX4KqyMhmsqNxcZvV8ehqoUr07UVlm7SRknKGMXpYIAjDqYEvT3XXGILus23IrXbxO/wuP4tt+68L/mSp+zXLpY+DfEbU9rZKxiqg2WVcWpAGb28cMpyDzj8OrotMd+7Tur4g0AjAX40L7cJXguqb5yjkwbP3jLsTWFtlMaJhHwV5KNYfUyLh++OsXIZpSbF3Jy+H49biCw9RS4x3T+MOr3N/nfdW MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 562f2abc-dd10-4dbd-f039-08d3de26ac4c X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 2:1HAp02qEJPf55vLg5nsbYcMqSzcyL6uD/JnS6zcvJq5cxENu2+P8V3MSmEXWuBsN2fQdByVVS9E4hLY7ZuQi4ZJmflbNDcgdMiV5D95Ri0mDpkZ0r9sIn5Y8zfE9iq7cA9tcSYzou0nNaG6rrCJ+kXHLgSaqmZl1uKDkPmwo/kU4FO/oFppRiaG/Hf+R6SC2; 3:kr/XBjF36kne6i5/uYbJgUqYSVUeBa05Y7v4iz4iU9awXWbOQc52+cHnBZvgVx8BtPqaE/f57XMDQxttHnwso2QxijqjV6POvdPKO70+1ERHX90YEcsq9+d9FIvG/qf57lmHXJAFf+I4+nufV7mqQ45qHwopfKWPmQK+DPUEcyF7fyHh+2wp4u19/Nrfb0ozUC0CP1YK8ADRjyoFcP7MWkhqts6D1eO0ux8Nkw0OVjg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2013; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 25:N26fcP/PguFymPvnDFASnTEdDCh3wqlZmRPbd19rf7oN9F/zfRHHifuOXfrgm3ReHU4aPuwLH2NFmGZRgwmCz+V/ItjMI23XZggIgfVEUDkpleEzl2SrSXo+ccd12DpiLFtvB83Z+urubDQMUZu6kVG+Oe1rGoPC9FZUjuc6zX67gtXH3M3oMd/qLNAnYt/Poas4so18jDunLRTgSScLQ93zEbCPSvCEyruskEFrECXuj1id1MJZlknFH3hl8DOiH9KtRyHfhtxf/MeOwFwe3zhmPuB5ylG5vep9SCpbBwCTymrd8llZVjzqvlFcOT3AoAdMTM/YETZZKfp7VtSXqYt+m85JQ0r+Qlcd5ZTIDESRfGvXDpeMj/+1RPYs7FjfjeRAAa29e7b8G9BQTrh0j08GGKMoXPGqgtHD0QZAIeiVajEzHt1VpZRKl5ZMdM0g1uK07s7dFqZcYLHk8abLCpb2c/+200XiFtsNpi6JYX6xwDxHGWoZoqPNoISgqh1+Dd1/nlAhYeDpdXgR0crQHm+PsCvIQOcqIc8ePsMF9GmFsMU1bkXA1fRSDqoxUzM6Myjl9Hyso1OJjOoLRSULjfk18H/cy3zAmqVqdIVlYfwacJ84Ib4ymHG03YTkR68PGDD2bs1EEQ9iy7pB0Oog8LyWM2eKW/9cNSRLg35iyzV0C7wsG8QKZ38/KWDHoDgdwpjAOwYPe59cY9fDzjSw/2MWXeHENHhY/ENj49ougAgWZK69nLh44PoWLZj3iR8Jlo49NX9Vra17Jyjjf1mu2w== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 31:PhoJnnNhRdoFSSixRfQU1G+mRMptxuxm7txjq2VXizmUMftHf6ieM4ZPQvLWDOova4xuHFN7zn279sR3IvmbbOFMXR5mtGENk4w1G6HF2hA+pHCZ94HkQxzbAochsnxdTxkfnmhriMvdyYoE1qeNd5B5JtZNvKHif4YDQnCXKDaYga0+m3oUTISD7UO5beS9Hu9vOqqO8FqlN1YsjDWeLRYk5EBflWVuMxt+Evf3zFY=; 4:PgVXrX1ef1uT6sOekwhGzx30SlXzxkc8eTgxBR4JJSC4sjPF1N2+eHdWHuu2z1uG3uBT8wrdA2mPFPuONPPNQ2lNSfdY1chkIoZXedpJE0uD6rE6wIqsddMLJrmP9V86o03t3I+mkmy7Z5kJjsNVQ1qYmu9VKfutlHoOPRXZm9i5W6AtN19ycf2uQnMHaKH8OWowvX6Zy8GQ/1mHtJGrPA1sX1AxFdabx60IlC8A0sPx1nUoxFAQoIbQPg/5wM+D8NyrkgtoRMjyu/xFzDR1F1bkp0DhallqrygqNkZ6JLfVAkAQHdb0hOWQnu+Mctbm/rAGRr9vDv2PfMx4CeODI92L2RNs8A8MxP/fhoknOH9fvglFmExI7muOqwm3qGPEMjZ6WdfLh4Gi1qzh9DojYL6S3eJbeTj9oaEbu3TId2Qd2KMs3f0dktYkejIyEfzYfi2s2BJW6hPejCs4Ye6I7ivZFstllfNB2nVeYPXujv5kathHhp/dl5/Q2FJvIJnCpjxNk0IeobdvZ4YYj2cUvW5GuRo2blK3X4ByK0H508w= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13018025)(13017025)(13015025)(13024025)(13023025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:SN1PR0301MB2013; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2013; X-Forefront-PRVS: 0067A8BA2A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2013; 23:myRGwjmOqfxKlNaafpUl565xBCDsUob5ZpzJDdP?= =?us-ascii?Q?g7poEGBoTLg270lPuZJTe8D8awA/Ow8gecS6MDa2iV91pAFV5OTdFrpW7GS9?= =?us-ascii?Q?fW2QkXyU5E/tDvA/j3GAtbVdGSlLQGfhrnA1bSwzDIewlseI+ljpgyiEwnEu?= =?us-ascii?Q?o7grrmNQk/vUqk+wtgiFsrfTbs+gZM9Fgs9xutM9XfCR0FdHQ5PjFE/XdEH6?= =?us-ascii?Q?MMFje6O4PxQMjJ+ygPEnrsqbunLbWBeg5Vva45q1Y4XlGTcMPfkBti8R/u2G?= =?us-ascii?Q?SeiGvjJx85RXVtARgg//EGuYWrClWHonhJbCAg/aLZGvfHLd+CQW0yxyNIKH?= =?us-ascii?Q?BiPK4z4uLd7/JPnOx6PttPm95piTi03FJgEDObBGDTVCKZLJHnwhpF6xthPt?= =?us-ascii?Q?l9X3JDH72QqKECyF5TNR1KM6vAhwrWSQpZsHejZGt9+m+iZFeGjX5Hv+vLmU?= =?us-ascii?Q?3ZkhxLn9anPItUfKHRBrOdvSf25dd9NoM5BO9VcqZ2/0fBmfMVHbYQcvrzTA?= =?us-ascii?Q?AJ/u5bkGZIfwpIgZwdNl5Sua7tSCUlX7dVRQqBdB3Iw3h1A46P1KwGsTgdOG?= =?us-ascii?Q?jELCwqo8szyP2+4avYWH/xp+mME5G9XnvtcxSKc7VdsZaX5GHgglIUGD8CS5?= =?us-ascii?Q?4+Bl6dTCUfcyMP1t7pJgs7Aq+R445OAIz7bMwgrmqyWRhnuqBr9XzKmhzO0U?= =?us-ascii?Q?2GBLxYxqQKcZ8N1vHfj17qVfL156hZzCv3S22Q7rSP6NW0GdXLaPrKC19VPG?= =?us-ascii?Q?HTzU8Pra1Qa74GKwwq3eykgwXDLLVlJraznLpSzScpkGQOfYLBxFzxexR7CA?= =?us-ascii?Q?CZJiqHzsWWaix7n1G/qNpPTGJtUAQ37PSahXZIBN28SZfXDXVtK/NKMT3jaK?= =?us-ascii?Q?3Zxy5slwNQRTcy+z2oZOaC54vDXEsFBsZnHrUHESFZRdMJRoukh6mcZdhkLC?= =?us-ascii?Q?GBTxgir0u6+aLsK7QIToDcxLNuRvKzJlXGvktPKD9fZAqEFGCT7t2746sFyP?= =?us-ascii?Q?CYjgz40LZ+KBnYlAbzmQBlyRDn6yTVbWrRXlupaK1uA1qOqv/aUpWeqI0AOR?= =?us-ascii?Q?KfsHGaBBZiLw9ZxrsliJDm+6w/28/w0kE8pP30s9vQwW/yYRgKk+hIS+Af8L?= =?us-ascii?Q?3UOf/2UISamSWqo+p+z+r3wzogmcd5sgF250Bq6TBzFSopNQ0u32kbom3N1L?= =?us-ascii?Q?XVOuyqEJylKn6q7KqJAJplNrbIyDP6ZN96Zk+x3kHLD3JPiVTfg31VcDoKoW?= =?us-ascii?Q?xVPL6vPvJk91q7PQBS3k+FLf+AjOuSatseFRmgISh3JRDAkCFkp4sjEgMK1G?= =?us-ascii?Q?johLb4UG6B20b8eCyah/t8hMDvi26GbmzimiSZBuWMr0AtO5Ea8okZvxn76f?= =?us-ascii?Q?fdbW5VXACnxf8ENshDIfWqMkyePlNMdjgLjQr6KU5HMZoqN0M?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 6:zwFcKnpKbdql1UvsbkyscteeYAOJSRxUFRRV9yE4sd3pTY9IkkdnRTJ22zUKRShUWgGKg8HHUA81pfZmP/Ov2OT72f2V48DX6NGZ+RynsII6daxgIDaKSBnEH5ODQS+4/rWeh9tZ+Yd+ESwmcx44XXe8hjNSHa85Xlrupnbo5kp9xV1yKtQORgkdYWytKvMYkfEm7DH3HEreRgw9CtRsx2hBlbQZ18HoXdJ5VhtBEAXSHmp1CVkaqjo5EdT73BUYbdpobYM+jOjtPtmh5xPhlkOGB21d9l/1rDnd55YH1X8=; 5:zV7DpDNTYh/khZYwNbzqfbSdE29raOmI9nh/Vko8dqayuDLcM2mCyuNWKoL4VSgUS+34vM+xbJHwJL0aqHsIgTYjNNF7EAGZGZysrLSAQ6XnqOQ1+eJZa3dCQX3UIMABGkZFcO7Psm7Ae3goOYahLHOHcaCdBKi3kHzyeoK735A=; 24:WbG2GWOdn0CppahTuF8xrhRJLwuqLRSWU8DYZEBUYBaJioEtuXOjvAjyxhMOWJVWWxN2leEOJkzUM+4myCXBBbKeP2b2pgABiVznpsBEUmE=; 7:N5bvexg+qEVx2Nzp4rqGVMbsj2EjFQx2Vl6hjrNFIRBpA7OzOFlSl6vkK/lR38IBBQeIpGFJbQdb4O0lQWu5UIH/KOjxcUv2uC+bevDHESrZSnOwnlG+21GfsgX1QAg5s3UF/28jsr0da4cxKKOf6LApOqCFq8Sr3LQb4VtjrISPbUr7yKZ0aQhdu105KKrqIShor4Q47URwzQDB1FpJMub1RkLzlp+68XgzErDZWG1/UB3fmhQsRxq/zcAynb7E SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2016 11:43:26.6786 (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: SN1PR0301MB2013 Cc: marex@denx.de, valentin.longchamp@keymile.com, timur@freescale.com, yanok@emcraft.com, daveliu@freescale.com, eibach@gdsys.de, sinan@writeme.com, NaveenBurmi@freescale.com, suresh.gupta@nxp.com, arcsupport@arcturusnetworks.com, afleming@gmail.com, Chunhe.Lan@freescale.com Subject: [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb 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" The function fdt_fixup_dr_usb is specific to fsl/nxp. So, make the function name explicit and rename fdt_fixup_dr_usb into fsl_fdt_fixup_dr_usb. Signed-off-by: Sriram Dash --- board/Arcturus/ucp1020/ucp1020.c | 2 +- board/freescale/b4860qds/b4860qds.c | 2 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +- board/freescale/bsc9132qds/bsc9132qds.c | 2 +- board/freescale/corenet_ds/corenet_ds.c | 2 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +- board/freescale/mpc837xemds/mpc837xemds.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_twr/p1_twr.c | 2 +- board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/t102xqds/t102xqds.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/freescale/t1040qds/t1040qds.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t208xqds/t208xqds.c | 2 +- board/freescale/t208xrdb/t208xrdb.c | 2 +- board/freescale/t4qds/t4240emu.c | 2 +- board/freescale/t4qds/t4240qds.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 2 +- board/gdsys/mpc8308/hrcon.c | 2 +- board/gdsys/mpc8308/strider.c | 2 +- board/gdsys/p1022/controlcenterd.c | 2 +- board/keymile/kmp204x/kmp204x.c | 2 +- board/mpc8308_p1m/mpc8308_p1m.c | 2 +- board/varisys/cyrus/cyrus.c | 2 +- drivers/usb/common/fsl-dt-fixup.c | 2 +- include/fdt_support.h | 4 ++-- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c index 0fc2bac..0d086e8 100644 --- a/board/Arcturus/ucp1020/ucp1020.c +++ b/board/Arcturus/ucp1020/ucp1020.c @@ -315,7 +315,7 @@ int ft_board_setup(void *blob, bd_t *bd) FT_FSL_PCI_SETUP; #if defined(CONFIG_HAS_FSL_DR_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index e582abb..5dd314e 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -1209,7 +1209,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c index 75e1142..fb8bb39 100644 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c @@ -73,7 +73,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); #endif - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); return 0; } diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 71a7bb5..2c836da 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -394,7 +394,7 @@ int ft_board_setup(void *blob, bd_t *bd) /* remove dts usb node */ fdt_del_node_compat(blob, "fsl-usb2-dr"); } else { - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_del_node_and_alias(blob, "serial2"); } } diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index f41985d..8a44a9a 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -201,7 +201,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 7d95deb..e1b17f6 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -317,7 +317,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory_banks(blob, base, size, 2); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index a65cd4a..31fee53 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -281,7 +281,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory_banks(blob, base, size, 2); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index 93e1c50..b4a0dd5 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -164,7 +164,7 @@ int misc_init_r(void) int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index ed611c5..3cec09b 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -194,7 +194,7 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_PCI ft_pci_setup(blob, bd); #endif - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_tsec1_fixup(blob, bd); return 0; diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 572913c..045841d 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -332,7 +332,7 @@ int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); ft_tsec_fixup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); #ifdef CONFIG_PCI ft_pci_setup(blob, bd); diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 565f815..07c0599 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -210,7 +210,7 @@ int ft_board_setup(void *blob, bd_t *bd) ft_pci_setup(blob, bd); #endif ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 7b0f461..cede1da 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -282,7 +282,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif #ifdef CONFIG_HAS_FSL_MPH_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif return 0; diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 1ae1540..8eecb06 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -463,7 +463,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #if defined(CONFIG_HAS_FSL_DR_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif /* P1014 and it's derivatives don't support CAN and eTSEC3 */ diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index d7dd478..345feac 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -345,7 +345,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif FT_FSL_PCI_SETUP; diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c index 074b713..0451722 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -143,7 +143,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 61b7a91..d61c3a5 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -454,7 +454,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif #if defined(CONFIG_HAS_FSL_DR_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c index a40bea3..f54a6ff 100644 --- a/board/freescale/p1_twr/p1_twr.c +++ b/board/freescale/p1_twr/p1_twr.c @@ -282,7 +282,7 @@ int ft_board_setup(void *blob, bd_t *bd) #if defined(CONFIG_TWR_P1025) fdt_board_fixup_qe_pins(blob); #endif - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); return 0; } diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index c6a7242..21fb66f 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -225,7 +225,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_PCI diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index 76793a1..1affa0b 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -375,7 +375,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index 01dbf38..24df4b4 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -189,7 +189,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c index d7d56b4..5466fbf 100644 --- a/board/freescale/t1040qds/t1040qds.c +++ b/board/freescale/t1040qds/t1040qds.c @@ -257,7 +257,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index ec97677..6bad6a454 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -144,7 +144,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index bfea3a1..d016329 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -461,7 +461,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index 0cb05aa..1ab05ec 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -128,7 +128,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/t4qds/t4240emu.c b/board/freescale/t4qds/t4240emu.c index f1393f2..35ad19e 100644 --- a/board/freescale/t4qds/t4240emu.c +++ b/board/freescale/t4qds/t4240emu.c @@ -76,7 +76,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); return 0; } diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index d6df144..8f9e7e8 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -694,7 +694,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index 406fb13..bdd6f4e 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -107,7 +107,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index f55893f..c6566e9 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -358,7 +358,7 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index b8dde5f..34e9d19 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -413,7 +413,7 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c index 2f98e47..01064dc 100644 --- a/board/gdsys/p1022/controlcenterd.c +++ b/board/gdsys/p1022/controlcenterd.c @@ -341,7 +341,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #ifdef CONFIG_HAS_FSL_DR_USB - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif FT_FSL_PCI_SETUP; diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index eebb47f..abb2019 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -277,7 +277,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #ifdef CONFIG_PCI diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index 688cc12..234a387 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -65,7 +65,7 @@ void pci_init_board(void) int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); return 0; } diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c index 79c363c..74f4473 100644 --- a/board/varisys/cyrus/cyrus.c +++ b/board/varisys/cyrus/cyrus.c @@ -97,7 +97,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 9c48852..906f9df 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -131,7 +131,7 @@ static int fdt_fixup_erratum(int *usb_erratum_off, void *blob, return 0; } -void fdt_fixup_dr_usb(void *blob, bd_t *bd) +void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) { static const char * const modes[] = { "host", "peripheral", "otg" }; static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" }; diff --git a/include/fdt_support.h b/include/fdt_support.h index e9f3497..8f40231 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -114,9 +114,9 @@ void fdt_fixup_qe_firmware(void *fdt); int fdt_fixup_display(void *blob, const char *path, const char *display); #if defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) -void fdt_fixup_dr_usb(void *blob, bd_t *bd); +void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd); #else -static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} +static inline void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) {} #endif /* defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) */ #if defined(CONFIG_SYS_FSL_SEC_COMPAT)