From patchwork Tue Feb 7 03:17:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Gagniuc X-Patchwork-Id: 724967 X-Patchwork-Delegate: trini@ti.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 3vHbT35Mmcz9s2G for ; Tue, 7 Feb 2017 18:24:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=adaptrum.onmicrosoft.com header.i=@adaptrum.onmicrosoft.com header.b="vk24KWu0"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 664EDA77D8; Tue, 7 Feb 2017 08:23: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 lBIp2UjdxGYH; Tue, 7 Feb 2017 08:23:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBDECA77ED; Tue, 7 Feb 2017 08:22:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4644A4A05F for ; Tue, 7 Feb 2017 04:32:47 +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 cY-vUwQuEbvF for ; Tue, 7 Feb 2017 04:32:47 +0100 (CET) X-Greylist: delayed 23206 seconds by postgrey-1.34 at theia; Tue, 07 Feb 2017 04:32:43 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 NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0051.outbound.protection.outlook.com [104.47.36.51]) by theia.denx.de (Postfix) with ESMTPS id A6F144A01C for ; Tue, 7 Feb 2017 04:32:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adaptrum.onmicrosoft.com; s=selector1-adaptrum-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=/33qNlko47uOds5KocE6xNvW3TFpCCz4H7kNhZD3n5M=; b=vk24KWu0EIIJAK48yLdOuvLD5LNopgI0JQ+CE6M8hgy9mHTg/Qi1oJVrB+KkrAMhwvQHdAyYK5VFrHshldF2shNQ7UfB4Z070enNthzMjrpmzTBlIOiw/cSH0K3tpr9tF/b16ufpFNFMNDUebeoymth64xCtlqF13135853tYGg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alex.g@adaptrum.com; Received: from dev2.adaptrum (198.0.218.81) by DM2PR0401MB1182.namprd04.prod.outlook.com (10.160.216.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Tue, 7 Feb 2017 03:17:57 +0000 From: Alexandru Gagniuc To: Date: Mon, 6 Feb 2017 19:17:33 -0800 Message-ID: <20170207031737.2680-3-alex.g@adaptrum.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170203234220.28589-1-alex.g@adaptrum.com> References: <20170203234220.28589-1-alex.g@adaptrum.com> MIME-Version: 1.0 X-Originating-IP: [198.0.218.81] X-ClientProxiedBy: DM5PR21CA0041.namprd21.prod.outlook.com (10.172.92.155) To DM2PR0401MB1182.namprd04.prod.outlook.com (10.160.216.148) X-MS-Office365-Filtering-Correlation-Id: 81e88337-dee7-46f3-da22-08d44f07ea2b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0401MB1182; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1182; 3:a4p3JqIWca95rOcyeEYaQMXRiuMpZb3W72lP4a2us3L0MFIU+rIG6OefqMqE6rey5pqNkwaaYCgQfl0sqB1nzY9G3x/UYGldh3L9K/V6vmP4k8/e61B16IQk1vFUxkMoqv4FaujvwjOhGkzH7A3U/g0PGsZIO2MKoI1/qjMwS/B0wS8oEbBky9QFg3bELwpd9lDJPilnjNlftrcdiToNPu4FYtI3kDvOlrjVeYIYQMW9Ux8dpx6I42edswVk51wDFUh0/s9HIPExV/SH0QSFew==; 25:hz2BleSpfRXnEsk2H018rP3fut1uhbK24aDloSlLjPQfbG/Yrv0LP6syoH4peNWH6Woob3Zdk1JjVGWzlhI2ClqyMujNyD+/ssbWdsSUiWm30phG1TjGARFvLfkQxyaLdP3Cyju0oaC1G9rwTLsF4ee74uybdifMq3AlUB8AbdA/+YqukdDKswVh8LaOQNI4ncDtKhcr7KikCJ0O/S+Zpb6vyr4O9Pv6Q+xA1iWyKUJnZ+yUSmlUPAkWqhEjYAYrto1+pKoS423gTWoRFFGBkZ7Va9GWrOEuBipu0hPPEItuwXHiPqC53j33F1ELNMNHeAec58OcOVH4u3WcF5eaNrXigK/FlNeC3A7XSZGcNY5g/wPUvuIE/6OTE2za0kWONdcOuFvYYe/F3epmYiSPze23ZGNjmsqim8e9HohAsw2vGUrJACO/hHisCx0Rb4Mxq9nXviLqbPHszkVHv34oiw== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1182; 31:A1unGL/DlRhRTMWu0um4LMZWYd+bt+fCkzSRbLtKtkcYyYd54UOdC2dIyzT4e3UlHlfK+DkOzP6aP/E3xKgHZPxD2X8c1vT4nemVcU7vHLgY4Zb7tbEwgf7IEHvhPy8/RONOkxyhlDcrrO3Phmh7/r4JZWKb0zbrNlxy7tAY3eh7isT7pCF6s3rSsYl1ozwUKgBWKF9YX3gwLHfwa6vwME8iAN7X/MqPa6Xjp7Iic0xtiRiU2WEOuoJoAPLkXLS9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(20170203043)(3002001)(10201501046)(6041248)(20161123555025)(20161123560025)(20161123562025)(2016111802025)(20161123558025)(20161123564025)(6072148)(6043046); SRVR:DM2PR0401MB1182; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0401MB1182; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1182; 4:aD4oYwGomOcAFROKV/M+kPfY4qFflzN5rzDaq5DNbmuFWn7OD1rCwWIIVExaOtWfZHo7ByCj0doUsKQRCzW0WJL7GyEFoF3lQF3Dn+yCKJYhmjzzY7QbZIvbyEgSR1g18t0k3CVbVN8JWjCfHBWOWli7+wVlBjWlUtl3R5wAwRcnI4PFet323kh41r6p0HVPLni5YRN0ovO6TLpA3S8NHq3jAKpVogHq17WrsX7giSGFwhQ9SwbyIiuhOWpd76tO9FMM6iyYlsZ1kVUivSccBvP159ZW9sG2ZpQwCPcunGG/0vhuHzjbLmqbVm/ouB9GASW/k8G5CEER1kjhj6qXKFS60dZ1TG0Z8lAxETzHlBOfq4zPxM/DVCGF51yHSN656/DtxHnnLJ0bX0ppzIQsdtU98Llr2/W/ap1jKxyOHkQFLlk+iv6Ll9w/frAPa/7LbgGVs7ck93pEELwuNlJOI6q/tOC4kEv4sDhyEYfnxZ1MMILb3qBi5GmcA/RDa2gOpEnP3fmIyJ3buco/VehJFtuR0g5uVqkY7Seg0PonK+H7XwvCfffr50QwrznWasqPcSXo7NYK7eM9qXVx31pHxQlfiNDBLNGys+gZ7IgGte6tkJHXORsnYZRPwUL7qzjUJQ8tT8VbXDYZPODQXqA1YKNuokPbabqEztWvUcQWRXRfQgIZXZ6RvWiuKgF5m+ay X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(66066001)(6506006)(7736002)(38730400002)(305945005)(33646002)(1076002)(76176999)(50986999)(97736004)(92566002)(6486002)(5003940100001)(2351001)(105586002)(50226002)(3846002)(6116002)(106356001)(110136004)(8676002)(42186005)(81166006)(101416001)(81156014)(6666003)(25786008)(47776003)(2906002)(5660300001)(189998001)(68736007)(6916009)(50466002)(86362001)(6512007)(36756003)(4326007)(2950100002)(53936002)(48376002)(54906002)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0401MB1182; H:dev2.adaptrum; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: adaptrum.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0401MB1182; 23:Q+DxuPdeYYPb/6BA9ngpu5EbSgcX1F5PXK/nnye?= =?us-ascii?Q?bT6LNcN8G78E+hmJl4RwDJRhxho6vyJRs0GAAzVfWOlPDoiB9X8yE4VqCg/x?= =?us-ascii?Q?Zprt9SLCeP8ks7syv+dprhALyejiXNwV597PQWv+RcmDK5ckIB0yXfn2vNUl?= =?us-ascii?Q?vz2dPtXSY2N+wv9w++JqO6KQkfbOSPUG6HTmLfOBch6dBPBzyGTDVZBFRxIi?= =?us-ascii?Q?8bjyerd+csMbNYtTWxgm8sYR+hEkdt60N8CL7wazxAE07unJ0LNz78ldTwv0?= =?us-ascii?Q?EUMWCjGa+PfBYH1zEKLlc06uaHExMxL8WuSL1L71yFnMfTMjFcY8XPl5/Lu8?= =?us-ascii?Q?LQebsH5oSi03Q2OEDQ25SGll2nYFsyfqIOiClTUYg0UC5js+HoxrsJBN9FAu?= =?us-ascii?Q?NQe/ks8xRvKFmtETiBgbiYaFOqv+EuN6BDzUExW2ezwwONkxYJfUFMDFhPxt?= =?us-ascii?Q?Lh4RQ1SGDajgv18GE4Fyy9M4WJ2pbFci9ZNJ7/28vuD1Lvk0CXN7D5o8EScC?= =?us-ascii?Q?gp+7WWEX4PwR/R2DbpR7fTk9fLQOpqFqqaznXIlKcp2X1uYj8cA/1z0TOP7c?= =?us-ascii?Q?7cda9NhGk+6aDz9iAs7s/WKJSfRIRXFxVmxhZ9yqRtSNAzkBmiiIbUkjQXYN?= =?us-ascii?Q?eL5Ad0ej39gyA5WnNoBR++PI9oyVSjfAz/BY3SbxU3sCAAjveKF3XSkJ6JLK?= =?us-ascii?Q?4OqhseiLcN1lSizYYUb46HAumqzNVCK1BaT/tIohfbcG2hoj+38o1D8S5bUP?= =?us-ascii?Q?NR/+DfFcdgBRkJsbKR7kd1uQefZe1DHpS02fH5j5imacJwlQ2VyBS43/pYim?= =?us-ascii?Q?NFZ6IH2N4ZucyqsQRT1VmldejD6rJUW1rGsKjjlPB0DrpMJDbyLhqSrKopKT?= =?us-ascii?Q?/rZY4axsyZd+l+Ai/VO53AuVL9AkvP5LF/rop5h2Ma3c1St+WZ063r3NZWIn?= =?us-ascii?Q?pOG6xAB7XlpuMcD2AaPgPSOCTIHoYiF5SveKSSp2zb9b05QkhiYoOVyvwKxX?= =?us-ascii?Q?UoovooEIS3B3wNWfohwGu+J+8Le3A1kfk2hcUb6SJGer59Bx8B1WimJF/faQ?= =?us-ascii?Q?1yMOpDoIX5iPzEm/HnVThxzmz7cVK5ACdWebX/q0tG/GzPbLvxSlLykCFQ8v?= =?us-ascii?Q?+DgmLXMtGdwfd7S2c5qwmp7ufXdtIJhU3mN8MA00kbkGh0OJvhuhFlWSLw4q?= =?us-ascii?Q?DCfQ/rOrmzANSBsU=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1182; 6:Os7mPMqU4NEXCOhpkxmGau0bgLMsGG9etjImk+rpJkyz/wAzpOMne9o/dNv0Y0ewzY+HLp9EvGi0h3DkY9eiXMraTF40bcDqISwOjACbUwcTp39Mqfm2I+WBvDEh0Gx7bZbMEw8JGs2g5OBJRSCnlK+fFVOgViJd4I4oRv/pP+WrlGWF/xFBsh8M3gRpvRAEDt8NGfpCVhxr/bHNJOsXnBuil6sECERV395rNVFtBjNDFvfppyEU/49Ytl+wozD/nQ2+4CxQ9SpWa/3i/S2Ay3f/PbLYyOXhwUezETPCAWPUW5iiuddyIS603dOsq/aOgfLDkIclyOdOP2U/MnufzWsUYEKd84nqkcIX/zJyz+OOL7hTc1mDQ5cqmDsAc2bOdT5xWWhp+I89fly083DGtJLXNmMuaW8/XUn5v2ZZi7U=; 5:GRQeNh7j+kww2D2dZ1Ggg5EkLYV03AHyfu0Dm5LgOCEnzjiAT9tDsPXhUVlJV5N6N6OBB+A9a+uaS3aTlw2TRVzVIbBbeONMqT61s2ooOHhuB2WoGwnObCrlzpTk3xFm6sV6/CTrbx7P+LJ0Ywg3kQ==; 24:SJriud9cHgUwK+9UQOf9jT7HzxlGpN/2Gq6eilXOAy2i/XgL0qsh+hAWS4RmIycJVQz5sIqKolbHVcL1F6dNVa5GCOUmP0oeCJ2heeG50hY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1182; 7:1ljCaAlqEr7e6nqAX/L+Kn+L0nBiKmOCkmMYfP7pqbL6a2/aUEMv6jHdOJ71X6T2dXerN0DIW01IepzV4ckTh3ZSYD7e2S2LCeybKQmEYySKKAxl/3yLGjP6UGdpFscR97iBWgT0ja/R7RleOeW/uDCnNXY1kN4qPkcDDYpGk1FQJdBe90XsgyE43se0qBhet2tqL2I60DmreK6t458T0llZAczMFpwxhQCt4CHC+zxGSwyRu7IMGztd3wnBp7simQ1RSLw8ckedLIQdpqD9CLnbzhJ7bm0NgvHRsCiarPtsC3xRxjK6aapHwKPPKKxFK8PsmKTeUHmUbIGeMBwIggfoWYpOkHBm5cC3WUFQ5dVI93VpOqOOtZpBY+DpzkqiUrOeKfo5doIHKvl9HDGtHdOQiKU3HARBXfg9gyT6vCgTu+wVuu8I/RmqKI+7vwTRGsvMGu17QNIzTlkfqyB3LZFIKHEJwMIPw2qydCYMjAvdQSQP9nVcDE5RT1AMYa2YeBDXFjkKkk8uL4hSQynOXw== X-OriginatorOrg: adaptrum.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 03:17:57.2877 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0401MB1182 X-Mailman-Approved-At: Tue, 07 Feb 2017 08:21:32 +0100 Cc: gokhan@adaptrum.com, albert.u.boot@aribaud.net, alex.g@adaptrum.com, joe.hershberger@ni.com Subject: [U-Boot] [PATCH v2 2/6] am33xx: board: Refactor USB initialization into separate 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" The declaration of otg*_plat and otg*_board_data is guarded by CONFIG_USB_MUSB_*, but their use in arch_misc_init is not. The ifdef flow goes something like: if (CONFIG_USB_MUSB_* && other_conditions) declare usb_data if (other_conditions) use usb_data Thus when CONFIG_USB_MUSB_* is not declared, we try to use the data structures, but these structures aren't defined. To fix this, move the USB initialization code into the same #ifdef which guards the declaration of the data structures. Since the DM_USB vs legacy cases are completely different, use two versions of arch_misc_init(), for readability. Signed-off-by: Alexandru Gagniuc Reviewed-by: Tom Rini --- arch/arm/mach-omap2/am33xx/board.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 190310f..422b1a5 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -190,11 +190,9 @@ static struct musb_hdrc_platform_data otg1_plat = { .board_data = &otg1_board_data, }; #endif -#endif int arch_misc_init(void) { -#ifndef CONFIG_DM_USB #ifdef CONFIG_AM335X_USB0 musb_register(&otg0_plat, &otg0_board_data, (void *)USB0_OTG_BASE); @@ -203,7 +201,13 @@ int arch_misc_init(void) musb_register(&otg1_plat, &otg1_board_data, (void *)USB1_OTG_BASE); #endif -#else + return 0; +} + +#else /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */ + +int arch_misc_init(void) +{ struct udevice *dev; int ret; @@ -218,10 +222,12 @@ int arch_misc_init(void) return ret; } #endif -#endif + return 0; } +#endif /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */ + #ifndef CONFIG_SKIP_LOWLEVEL_INIT /* * In the case of non-SPL based booting we'll want to call these