From patchwork Tue Jan 26 11:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ramneek mehresh X-Patchwork-Id: 573222 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 06FA014016A for ; Tue, 26 Jan 2016 22:34:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF6AFA7535; Tue, 26 Jan 2016 12:34:05 +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 z9CwzG724BWb; Tue, 26 Jan 2016 12:34:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 43082A7526; Tue, 26 Jan 2016 12:34:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF4C0A74F1 for ; Tue, 26 Jan 2016 12:33: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 vOsOWVN_cJ6t for ; Tue, 26 Jan 2016 12:33:54 +0100 (CET) X-Greylist: delayed 936 seconds by postgrey-1.34 at theia; Tue, 26 Jan 2016 12:33:46 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 na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0127.outbound.protection.outlook.com [65.55.169.127]) by theia.denx.de (Postfix) with ESMTPS id C3286A74A6 for ; Tue, 26 Jan 2016 12:33:46 +0100 (CET) Received: from BLUPR03CA001.namprd03.prod.outlook.com (10.255.124.18) by BY2PR0301MB1573.namprd03.prod.outlook.com (10.163.28.15) with Microsoft SMTP Server (TLS) id 15.1.390.13; Tue, 26 Jan 2016 11:17:53 +0000 Received: from BN1AFFO11FD018.protection.gbl (10.255.124.4) by BLUPR03CA001.outlook.office365.com (10.255.124.18) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Tue, 26 Jan 2016 11:17:52 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD018.mail.protection.outlook.com (10.58.52.78) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Tue, 26 Jan 2016 11:17:52 +0000 Received: from localhost.ap.freescale.net ([10.232.133.67]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0QBHlgm024857; Tue, 26 Jan 2016 04:17:51 -0700 From: Ramneek Mehresh To: Date: Tue, 26 Jan 2016 17:06:58 +0530 Message-ID: <1453808218-27599-2-git-send-email-ramneek.mehresh@freescale.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1453808218-27599-1-git-send-email-ramneek.mehresh@freescale.com> References: <1453808218-27599-1-git-send-email-ramneek.mehresh@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD018; 1:NltRwlgnCwn1TpWAXw3KRmruRrGjvQyAwaZgtW/Y6TgGGDxKi4k/yEuBicWlvKw8sfZ4NbPIsDi/IcLLcmUyjofBV+CSNHmMuYzT6R735Y5H+3m3adAAdjgZEaFiomOhdsY3g9PCUTdvXgzUOcfsBUcB36NrMkhrNqsG3EBhRGd1fITt/0hieYDjJNOsAwxjcdw+n1P1UFOhH3eOn+lqakvobW42Oi/hmMppioF35UfrKs3KxR3MRY28Pf0rMGSgChgpAjcteK3V5fJPO1CMedm12our22Fp7k5BmY6oMnSkfDSEUdnZXWJN34OymIsHmEgts6JNhGz+wGKSJvpfKydALSd9se6mZHz8LPsN+d5+lZEW3KSacOQIE7Syku1WUMA+r6kPbWnY78dEQe1Nbufj8LPFiF+fgKCupWtNZ2rKHMlVSs2rzK+60ZvmyjNO X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(4326007)(19580405001)(50466002)(87936001)(2906002)(76506005)(92566002)(86362001)(575784001)(33646002)(50226001)(85326001)(1220700001)(77096005)(1096002)(110136002)(104016004)(6806005)(229853001)(107886002)(2351001)(11100500001)(5001960100002)(2950100001)(4001430100002)(106466001)(19580395003)(81156007)(48376002)(189998001)(97736004)(47776003)(36756003)(5003940100001)(5008740100001)(586003)(50986999)(76176999)(19627235001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB1573; H:tx30smr01.am.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 49cee0f9-4041-4665-6669-08d326425545 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 2:QfOm6RxTbq1qYbnWrvuHLqxYaxJTasgtK7vUJGKiESuvSRxFQXr7la/oKJF4YY3KZIw2svI7v4gSvtNnPkpZvLo4zQcHMXGK1d5EdrV55Z47gKvzqcHmoEErEFbS+LwsoUddrPBr8KRaW/AgB2qoEWy2asBJ2ept7ipEmbXKG+mHdZy0O/7MHbsWVNIVwTER; 3:D4baM//feo6YFAlicI3J59C7Co8YkIY491s4V2F2Nj7rwuNj8W2bkn38c7WtagN4BhRE8eA7g2iuv5EuNmgh6jGojrSd13MXmLraONjwGMqdHQLUDp0sKCu4813WR+XrX1QZzDUtlmRb/J1uYNEqwxExvNDvuwK0yjrFpiwyJzthdUxM+da+TMDonlMDOiPUzEh5taYgfBiR/7UdZw+J/NEcB8/IUMgsnIEg4pyUWNs=; 25:tEaqYZwb7ECjzj1t9RP/N30waLXi1TDTzl7k3m5mRLNgnN1e28T8P3FedLytWpQkotWJsKenPU74ZYnz7mSfGbLLLy6xc14AMTd5PlWWpOonijrIpEbCYpay+MBzy4pd88Y7qaTZJvZd8cYMtVS2BGHsB+ZU0/l8E74jC+/iBLsJoFGkfzKcPMeDne3+wCpvQ/BymrltsQbgPvIvYXK4yben9UrEMBCTWHkRWrUv4gyYrpuaqlzs1I6raEravg5g X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB1573; UriScan:(101931422205132); X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 20:eRWZ5pEbiTpRjv9vHsw45eoaOkP5Wi5slbGc//OroNdp67j2CphumGghmNIlFX11DQd17h53vHGRl6m5TYFcACMVbOBcEpWTUqfDr2aVUS0Lml7Cfrgj2A7R/VDWTqxtkJ7zOL+fLdnfqY+1r4AkPgUUuRmBx6rKw2ypoJ0Tm5ZYh5B9P2HhAbX+T0hY4jNQcXfSlTts98yfzTuY3ovnCN4XDWFPkH6Y+pMxo12FfT7aaPDB68jxPPPBTzlBaRMtyiscVgdvc6T04Mx2q3e0SubEp7nZDmKSI1r+isCPi2XIrUC/+cYZ+kodufVfKw0eBtB4oDzx0GPk6HI/zFfB/3l3FqiYu+GlwRntzWDO8e6PgrWtXiId8K6WNzvDWsEOyIlk/2+jy9rFk0CpFONK0ev1SFeCkUHYdVIBfQ5G1i/kBCcNSlCXvgcn9v3qMT6J X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(123027)(601004)(2401047)(13018025)(13024025)(13015025)(5005006)(13023025)(13017025)(520078)(8121501046)(3002001)(10201501046); SRVR:BY2PR0301MB1573; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB1573; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 4:XW4tRP9Kg9YZLo7XGxR2nWhdyPl0JdZt4kRrckexhb+LC7UZcGg6Bzzl/blrzGtWnD8bdUbCfT49VBNXLufvaRoHH6sethFieRdtHadNl4nQab0nzl5wmNiEDMMoiu0DMPEG4ot4c29M/Btym6Tmls3OV7cy+mmv8MuiwXV9B6PBhpNDnpi56RVEiAyfaMKMLO4gr+MvNAlc2htz0KTbCh/KMZ8WyKnWMOOczl0RCHDfau+4Ak65H1llTfdm16VNsE3/z9feHPI5DFR3UnURb+/Bu9ok0CW7PayLOCFHlFW2uT1yJgF6MveJ+Di6eZ7fKA0qoDask3oVBPCfv5QDorN09PdoUS8K5qTnIm91nS3Vv2Z2MYz2ay9+gM/YZQ+0+luaEhKQPdbirp/vdoxMDqEw70xOJEDQhZC77T4MfyL8AkNXt5rn6nWVC7afrXv4Mrh8aJlSnrFMp4VyFV136Zd7pC1S/7v0qP8XZE9yLm4/70fCdaPtA9dXaKGYum+FgpZPWikmn2C994cmS4zBVLvwQGJeVxwxShD99ae/66Y= X-Forefront-PRVS: 08331F819E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB1573; 23:T0ta0jjOqcI+4inUW0FjaRCKi/ZJrdQFIxM2VoL?= =?us-ascii?Q?W319/oU95VlICtpOKQpcN3VQZBrwfBmT4jynUnYOGPucbDiJFYORUoeM1Uqv?= =?us-ascii?Q?Iz9WnsaF6HNKu6K3KgVqX2Ic1KAz+k3E4vUieHdCG6bnP4VuHEvQGlQGUMJh?= =?us-ascii?Q?wPEczIi/YoGbtiUULVECVMOVrqnrGgB2oJ+yPdHF5s4F46QVAe06rgox+amM?= =?us-ascii?Q?Mlwf1l9gCoyxcwkKOzkHruZpsdUHUB8eGdZ0uPAG5WTPAfsi2XCUbCdKDGSY?= =?us-ascii?Q?1cGVwgbaRJvVUWgWFmhluvNnrYE/qAAU3w7xcCD3jBnNCe8cgBN8zX32XlLG?= =?us-ascii?Q?JuynfDMJMV8IS9S6+H0azrVGCzTIiAbRNdhXS5GBhCmkxWcZBgbW3k0IDbkG?= =?us-ascii?Q?/wAEt4JlCDnYv6QfnGavXKEI5ZUMO9X1SxLzpOFfgP4z+MduLyKW8c7Bk3L3?= =?us-ascii?Q?rGx0gTk0rvHhfLaaETWkuu5SPc2IHQL+ZqZunFlZv0xpkRibDfnj7bafLsI1?= =?us-ascii?Q?DdpjreFcmqGgJtmP7ukD98h7T/fNWBoMp3aF+5Xt6qSkD0D0NtsDO61jRsGU?= =?us-ascii?Q?k0Ym0cQBqUVcDdacBOC6Ia1/0X5BSbOYjTEi9XisRYSqsZZFI5YrvwYTJumf?= =?us-ascii?Q?Yj3z6Caw1e7YOSpddGvEoglnmIaUNzUFFhpL6dlD0MzpMCEnexiw1NOVhAbd?= =?us-ascii?Q?LTeWbAMerTGvfHLaP+/z0rubMiyhIeBatoAmvkqK3gAHyAGuBcpHdg/RvpwK?= =?us-ascii?Q?eIxufknfrhKZca+xPIMeyydSMOOY6pRPD2RK9UhG5/eviUqGVbtqs7/BMPGN?= =?us-ascii?Q?JksiOJghDPRViKqwGnyXkviro/Q8GOSv8jvIQv1Hug4sgDRtHnYveDjiE67q?= =?us-ascii?Q?vFkohlz+S0P/TuMOLxUOR87O6mL1gJ6gfP7ECWtct1hjCyQqaPyUGtbemCCP?= =?us-ascii?Q?AgnOhCy+Aym++uRSi3nC9YnfQf1ECoL+0qoM5BQfC0kR5uUB+SpQkgnkHare?= =?us-ascii?Q?Mv73M1IcR2bivBbUB5lfQ7mrB4bSlDbk2GG4HYB5j3KVwr0wNT2wFBqzBBwv?= =?us-ascii?Q?Xdsnjh9ikbPYG1dvsTjpOBSv6Chw/m5Spge9Nxmnv90cOBJXxypYRnLEcAZt?= =?us-ascii?Q?YLFqKZy5SAlMvGVAAgIveLAPcPBEWsV24okGt8ylmA3ri9KoOi3eE6w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 5:KjmOVCde8hjNBK0qL5lJzuHnYDhFCZZCYFizfPxlOAZEh+izGNIRyjLL3jdFyW9ZVuzEPSuAHzWOeUwEgo2+F4qlS1rCqwo0xQhQMYzEfsh64Yv4rUJsVPwOfWgjEFNyI2wLI+74t74wfmVM/yoafQ==; 24:vvm7aPXqFbxV19SpI/OxCYgZHCbIrooQgX0KF4w296d8B8qV5x3Lk9/ln+GX8oekwKUxDzqlDwgbRFHgFfF3iv6x3MbDaoeedrKyla808MQ= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2016 11:17:52.7964 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1573 Cc: marex@denx.de, Ramneek Mehresh Subject: [U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms 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" Add usb device-tree fixup for all relevant fsl ppc and arm platforms Signed-off-by: Ramneek Mehresh --- 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 | 4 ++++ board/freescale/ls2080aqds/ls2080aqds.c | 4 ++++ board/freescale/ls2080ardb/ls2080ardb.c | 4 ++++ board/freescale/mpc8308rdb/mpc8308rdb.c | 4 ++++ 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 | 3 +++ board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/t102xqds/t102xqds.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 3 +++ board/freescale/t1040qds/t1040qds.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t208xqds/t208xqds.c | 3 +++ board/freescale/t208xrdb/t208xrdb.c | 3 +++ board/freescale/t4qds/t4240emu.c | 3 +++ board/freescale/t4qds/t4240qds.c | 3 +++ board/freescale/t4rdb/t4240rdb.c | 3 +++ include/configs/B4860QDS.h | 1 + include/configs/BSC9131RDB.h | 1 + include/configs/BSC9132QDS.h | 3 ++- include/configs/MPC8308RDB.h | 3 +++ include/configs/MPC8315ERDB.h | 1 + include/configs/MPC837XEMDS.h | 3 ++- include/configs/MPC837XERDB.h | 1 + include/configs/MPC8536DS.h | 1 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P1023RDB.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 1 + include/configs/T102xRDB.h | 1 + include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 1 + include/configs/corenet_ds.h | 1 + include/configs/ls2080aqds.h | 1 + include/configs/ls2080ardb.h | 1 + include/configs/p1_p2_rdb_pc.h | 1 + include/configs/p1_twr.h | 1 + 50 files changed, 85 insertions(+), 12 deletions(-) diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 6a8fca6..0831cda 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -1213,7 +1213,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c index 75e1142..c3be910 100644 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c @@ -73,7 +73,9 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); #endif +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif return 0; } diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 586dacc..61f96f8 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -394,7 +394,9 @@ int ft_board_setup(void *blob, bd_t *bd) /* remove dts usb node */ fdt_del_node_compat(blob, "fsl-usb2-dr"); } else { +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif 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 2945339..77f33c2 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -208,6 +208,10 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); +#ifdef CONFIG_USB_DEVTREE_FIXUP + fdt_fixup_dr_usb(blob, bd); +#endif + #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); fdt_fixup_board_enet(blob); diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index aa256a2..6b3a15e 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -300,6 +300,10 @@ int ft_board_setup(void *blob, bd_t *bd) return err; #endif +#ifdef CONFIG_USB_DEVTREE_FIXUP + fdt_fixup_dr_usb(blob, bd); +#endif + return 0; } #endif diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index c63b639..5f1d886 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -266,6 +266,10 @@ int ft_board_setup(void *blob, bd_t *bd) return err; #endif +#ifdef CONFIG_USB_DEVTREE_FIXUP + fdt_fixup_dr_usb(blob, bd); +#endif + return 0; } #endif diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index 93e1c50..266f70a 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -164,7 +164,11 @@ int misc_init_r(void) int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif + fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index ed611c5..85cc45e 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -194,7 +194,9 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_PCI ft_pci_setup(blob, bd); #endif +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif fdt_tsec1_fixup(blob, bd); return 0; diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 572913c..5107934 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -332,7 +332,9 @@ int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); ft_tsec_fixup(blob, bd); +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif 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..a17c0e1 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -210,7 +210,9 @@ int ft_board_setup(void *blob, bd_t *bd) ft_pci_setup(blob, bd); #endif ft_cpu_setup(blob, bd); +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif fdt_fixup_esdhc(blob, bd); return 0; diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 7b0f461..017ed99 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -281,7 +281,7 @@ int ft_board_setup(void *blob, bd_t *bd) fsl_sgmii_riser_fdt_fixup(blob); #endif -#ifdef CONFIG_HAS_FSL_MPH_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index ebffe9a..77ad58a 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -462,7 +462,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) +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index d7dd478..7d49738 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -344,7 +344,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c index 074b713..af81fbf 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -142,7 +142,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif 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..0247149 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 @@ -453,7 +453,7 @@ int ft_board_setup(void *blob, bd_t *bd) #endif #endif -#if defined(CONFIG_HAS_FSL_DR_USB) +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c index a40bea3..bfdcfa0 100644 --- a/board/freescale/p1_twr/p1_twr.c +++ b/board/freescale/p1_twr/p1_twr.c @@ -282,7 +282,10 @@ int ft_board_setup(void *blob, bd_t *bd) #if defined(CONFIG_TWR_P1025) fdt_board_fixup_qe_pins(blob); #endif + +#ifdef CONFIG_HAS_FSL_DR_USB fdt_fixup_dr_usb(blob, bd); +#endif return 0; } diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index e600bdb..250ab08 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -227,7 +227,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) +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index 708afca..a6a14cf 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -379,7 +379,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index fddd240..bd648e1 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -194,7 +194,10 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif #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 eaca57f..33e69dd 100644 --- a/board/freescale/t1040qds/t1040qds.c +++ b/board/freescale/t1040qds/t1040qds.c @@ -261,7 +261,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index 3227652..e2487e6 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -149,7 +149,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index 7c89cd5..539d1ee 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -467,7 +467,10 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif #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 0c2c1c5..49548d4 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -134,7 +134,10 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif #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 5441094..d1acee2 100644 --- a/board/freescale/t4qds/t4240emu.c +++ b/board/freescale/t4qds/t4240emu.c @@ -82,7 +82,10 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif return 0; } diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index 4f2cccd..7ac705e 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -700,7 +700,10 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif #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 fac442b..09a2231 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -105,7 +105,10 @@ int ft_board_setup(void *blob, bd_t *bd) #endif fdt_fixup_liodn(blob); + +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 9fb5cee..e5b3d66 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -773,6 +773,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 4b5ad0e..698f760 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -381,6 +381,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SHA_HW_ACCEL #endif +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index d0e5a25..cf9c2db 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -525,7 +525,8 @@ combinations. this should be removed later #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif -#define CONFIG_USB_EHCI /* USB */ +#define CONFIG_USB_DEVTREE_FIXUP /* USB */ +#define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI #define CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 955ce62..a6e9a05 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -333,6 +333,9 @@ #define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1 +/* USB */ +#define CONFIG_USB_DEVTREE_FIXUP + /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index ba952e3..f3edd75 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -377,6 +377,7 @@ #undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #define CONFIG_SYS_SCCR_USBDRCM 3 diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index df47888..d088444 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -386,7 +386,8 @@ extern int board_pci_host_broken(void); #define CONFIG_PCIE #define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */ -#define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */ +#define CONFIG_USB_DEVTREE_FIXUP /* fixup device tree for the DR USB */ +#define CONFIG_HAS_FSL_DR_USB 1 #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index e77848e..2759893 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -677,6 +677,7 @@ */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 294be3b..2fa53f0 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -654,6 +654,7 @@ /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_MPH_USB #ifdef CONFIG_HAS_FSL_MPH_USB #define CONFIG_USB_EHCI diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index f9776c0..4822699 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -744,6 +744,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 6235bbb..0277565 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -688,6 +688,7 @@ /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index bc479f6..6d135f6 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -280,6 +280,7 @@ extern unsigned long get_clock_freq(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index b2e51b5..d3d0b13 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -628,6 +628,7 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 951cbc4..3b2c0df 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -686,6 +686,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 4a0f5b2..3aff72f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -683,6 +683,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 9e151da..e77c95a 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -569,6 +569,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index da65f56..bfd1ef1 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -626,6 +626,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a0cecc6..87cda4e 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -733,6 +733,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #ifdef CONFIG_USB_EHCI #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 312b0eb..e7c7409 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -15,6 +15,7 @@ #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 1b94f64..00bdd69 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -528,6 +528,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index aef37dd..8cc581e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -639,6 +639,7 @@ /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index ba84248..366be59 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -387,6 +387,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI #define CONFIG_USB_XHCI_FSL diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 116dbcd..aa0689b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -305,6 +305,7 @@ unsigned long get_board_sys_clk(void); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI #define CONFIG_USB_XHCI_FSL diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 60bedaa..718d9de 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -895,6 +895,7 @@ /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 77ba2d8..fde397e 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -426,6 +426,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * USB */ +#define CONFIG_USB_DEVTREE_FIXUP #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB)