From patchwork Thu Dec 1 18:37:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 701636 X-Patchwork-Delegate: sbabic@denx.de 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 3tV5xP2q6Dz9vFD for ; Fri, 2 Dec 2016 05:52:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4EC99A7599; Thu, 1 Dec 2016 19:52:07 +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 YMZlqeLyrKTT; Thu, 1 Dec 2016 19:52:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A903B3830; Thu, 1 Dec 2016 19:52:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DFE78B3830 for ; Thu, 1 Dec 2016 19:51:59 +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 0qtU7i1so4Mf for ; Thu, 1 Dec 2016 19:51:59 +0100 (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-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0076.outbound.protection.outlook.com [104.47.37.76]) by theia.denx.de (Postfix) with ESMTPS id 2C111A7576 for ; Thu, 1 Dec 2016 19:51:54 +0100 (CET) Received: from BN6PR03CA0015.namprd03.prod.outlook.com (10.168.230.153) by BN1PR0301MB0738.namprd03.prod.outlook.com (10.160.78.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.10; Thu, 1 Dec 2016 18:35:54 +0000 Received: from BN1AFFO11FD007.protection.gbl (2a01:111:f400:7c10::129) by BN6PR03CA0015.outlook.office365.com (2603:10b6:404:23::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13 via Frontend Transport; Thu, 1 Dec 2016 18:35:54 +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 BN1AFFO11FD007.mail.protection.outlook.com (10.58.52.67) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Thu, 1 Dec 2016 18:35:53 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:626; Count:8 Received: from b58964-3.am.freescale.net (b58964-3.am.freescale.net [10.29.244.171]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uB1IZoil032241; Thu, 1 Dec 2016 11:35:51 -0700 From: Breno Lima To: Date: Thu, 1 Dec 2016 16:37:36 -0200 Message-ID: <1480617461-9893-1-git-send-email-breno.lima@nxp.com> X-Mailer: git-send-email 2.7.4 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131250909538419702; (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)(2980300002)(1109001)(1110001)(336004)(339900001)(199003)(189002)(81156014)(39410400001)(7846002)(39380400001)(39450400002)(4326007)(77096006)(2906002)(39060400001)(36756003)(39400400001)(356003)(8666005)(305945005)(68736007)(189998001)(104016004)(48376002)(92566002)(81166006)(50226002)(8936002)(2351001)(105606002)(106466001)(85426001)(50466002)(110136003)(6666003)(626004)(6916009)(50986999)(5660300001)(86362001)(8676002)(38730400001)(33646002)(5003940100001)(47776003)(97736004)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0738; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD007; 1:TpSg/eho+VbhGF8+BaG94aPIoqqzn8rMunCbAEc76Bk9wFEOl9Ngp8wOOrOBsD1xnr0r58avmUp8j1WfAa6Z8IHZxpnZeDAUhD6xLYQ/ZLfjgVYmga7SYO0AC/2g6vV3j7uer3AQryo6dYkFtV1tWkFptHipZADD4V47DdmZ26DmaI6AlK/GLYbMxMgzXPMv0cFPi2a76XghVWvZZrsc8F6KiZBlhEAxYz7ajFse5aJhV81u2IU9WGd2eMoC7An3U1m0+6ed+xKeZrnmbNAJYYldEG7kicOKLLotjDMAk826NnB+qngK7enFm7oEZ7dPAqxi69xvojIaFZfgutSDwXQjnrHTifzlWKH/NENrsasgLs+GhINxiKVufv+O352Pzy96LjHchffSuUfIWeKf69/t+tIKFhNfZYKgKmak3gLF1QpkRajOM0Rc6rT/2iWw3wxSeqr0tXZVj/ybsVSXkp9IBooBaKAhg5bqiP5POVJUPUoxbh2gtEF9k40gvsbnsPM+LLZv0DHLKaP1ytulBN4GGzKv6OqgcFctobBuMrGY/EG3/bdXQ61S5hdxiFKCiyzLw2ChuKJRRcBRLWeJ9k/vWVWEbsO2EK42j4YAPGiR8Az0HwnWmDJ1UsFdgH22k4r3zr2fh08PFcBj2D2OJVtgw4AEfB4NwLSZCmyHHev2YUDyXgRByz552vcfX/pFKZjLzerQTjV4kp2h04kgguzg9y0fp5/nyH9m9dvGi1U= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 17f741f2-b261-44f0-a295-08d41a18e1f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 3:rqWne2LLLx6xRw7/UV4W0vDUQoO/pqvnZAleR+dpqxyxrax3F1eV/BWTgW1yUTkLy8gkbRrDgfAYcmgY3HQvGqBkqbJyQ2V5+Z8EfStdFs1MnoKXLLChzxg8n6hHOmmE165kLKqjfdUlAoV6hVp9SJbFbUIp9a9LWnZcRPGs46Bh5UMuOE5fzsv0zqIImHq1LuLRU2Y0ujMPShiUGXEUvKsG/kYn6IYKDxYubP1QBl8iA7EfGztMEqn9tkeHLSlrwqPfIZiME4/oYEyoPSWwlVtNNGrFXM3xYfDiYkDbQYXja0iUFV/ZcJSMFDUnFXrXfitxh8mhPwOruAgl8pk5TUpk7siESU/RCHxnEydWrus2BjTHgIqj6H9VYeOkeNts; 25:rE77iJGG7z1ek8c9sPdaSKvjSSPKb82vDgPhaWraaBgZdiIuTVlqsrW5rCus2/JsnWr1FEyKe8nlCvPpnjkW3aTXfIDfEDO1tPNAikCu4iKbdetY1wFId0QG2pXY5uQNR7t3YVtDrTRGazdxWNTD2QWpq8MRuWKp/uHPhz3t7Qdgjgt6lpRLTta5eYzgXB0YkoJl3qjYh/XBZNHG4haTlK0rZDOJYx+YG/DpOKoS/362Ro1qAZ5Gc+8MBBhUOSYHIFhy5h8w/3go85AMficjg0VKsyuE7HNBD92VlTs1iUBLV+KSEcTKud9NSGWN/jcSMemVcec7dxpi4f8X+yU8l3aN0gFjmNylTodWp0mhWn+oUhGelLtjAqGUBE24wuM8MdVM649CiDcend3WudBxOaM1g0QSw/wDongGI+dxi3QZZuydi+HePsvNnW+iEWQm9EqKMzj5x3avSKwEL0DCAw== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 31:t5x5etHoXnfZ7dqM62KprMYa13SAlWeD3vY4VnD734vHyjbZaJye/t9aZv10Uok+2x+yhCdaK9TDtJr+4Rs74lKUd7p7xDoHXWmtuS3unP4kbl7fru+Kuf8HPjv/oKkaCQWAlyaU+TDUG03aJe6lHmIINq4TQh3M9SC3Qlj5P5GHwPTVuylIqn/W6HuYC0nK66Tb3XLwUC6NBxt73PfIrUXpYMYDVrNmgqvHaObsUoqtRaSpwblPoW3eAWweZkAwpW2BUUkJRRQwtDQvqJm8MlNqyHnxxaQiPtS0/ibyCL8= 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)(13018025)(13017025)(13015025)(13023025)(8121501046)(5005006)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123565025)(20161123563025)(20161123561025)(20161123559025); SRVR:BN1PR0301MB0738; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 4:BOW0iEM2EG3/SG4Mr23W5Dx+S3gkNTmP7s6yCnMeJsNJz6DHOMxuP4z9S1E57II8EwWAgc8qGGyUmmFIjITtMqDZq+ufnJ0kGG+2Wk1K3vxwcL9+PiEQ0z5GP6770ZBpRC0UG4disOBkAXydDi+tdkkMG55RfRXdoKB7/wZl7MeiblDQrB9ZMoIo1wNbazEEmP9mYmXzB1Dgo36kXWX0I7SO7+paarsdx2XWM2Ub3MF2LNneNNPjEs/YbEJUvDSc81XC5KaTaGsWyOVvV/G/tUkYNrXFOCen8KUgxFJs7RPSufvHM2mTQ2h6BqONvaXNxtfSc0OIR3l6Kj88xNyyWlvk9xMiUJa396lkWrrvVjs8M++M2xhB7xlSFIJWZ96wWy/BXk0xzYNBMdgdvFSTvEucYd6n3+Zvh04sNRJ3cjsdkl9dZorduewUX/p5pu4qdAauNLLaw6ySvoH6RtChSISG4ZPPyuqaLOTqAERuvGhYNx85CCdB2ybC29urwMY360ZHXJZtJn9VxvSkTG16ROUKWA+MhRmL9+jrhO8XgwXgEEVX2cZa+/YjxLRMCFV1lFV5hMrHoELYWFzC+oooB0+mpvkxV/TRQCfQiWc247zNbO65cZ/lbgeyU2eOMgaE+kJz5HtWnRI5I5On05hRK0A73h24PBKXXC9GUA83KNhB0NaqE28B2ULdHDteYcFGmiaiyEuVabPC64y34loD48pDp9G9pf4HyTmRns7hUJDK4bXOTRU6o3bG84HXLSSs X-Forefront-PRVS: 014304E855 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0738; 23:OXVnPeLTMs9vRseRY+H688PbhZA7xxijuJw8ukf?= =?us-ascii?Q?eqSM0P3OWZmcxJT3wt07+putQPzcS/v2M6ZVDG3TpRo1Ssue9QtCnJiif4+X?= =?us-ascii?Q?FSe2NGJWIRV5sbu8IfeJU4pKgBU5HwinevnIJoT2jwgsUgIwK8DSg16f4L38?= =?us-ascii?Q?2kAXTLQBG4C/HTCljbKrFL5XuxhrLBbTHR0fwQtAxuE0CN6fWdvCSMzUWWyt?= =?us-ascii?Q?rhWaHZ7oTKSVSlHIZjqE1AthtlY1sPnzkque9Bl1wE7B5qJ+p/DhlS6BHNHD?= =?us-ascii?Q?bmlvXN36oinBfVdXf28rq0yk4euELzUHzuu/7gTctUi+PfXKOerryt9iEsPo?= =?us-ascii?Q?krnZcxcFk0saApSx/cQzERRKwWCTdYGNfiOWK20zP0Sq2Ee8d3HIj/tA2obN?= =?us-ascii?Q?C/O1YwyaS9s23yl2ssD5XGWgdc7aZmeq0+jZPDzVHO9BD3/Rj7I/OwxGIexg?= =?us-ascii?Q?1dgQRsUXI6tey0G8bVQaeeH/MnjWMUV/qg2wkaurYEspHFaVkrrMUaaeGt4/?= =?us-ascii?Q?e1NUniHQNphQQuF/0VyQ+LRXdMoytiMbHOQysgZJ9nxxYD6l1ndyR7cFsziK?= =?us-ascii?Q?UcnF4zQ7laOAHD7d6t9Ty0xOXZfOW86vz+aRLZs5OLZ7UZao2GUPnyVqsj5T?= =?us-ascii?Q?Qz09OTcV/oLT1u04F+9DnnmSEQPdszY1p7kEhNSlEE7C3Z/8xn4jyQ8k7JnY?= =?us-ascii?Q?9JdfzkZ0yuEyGSCKlYhUQ01Th0yhCuvMK+3JGFBnw2IIvZzMo6nZo0NJgXGC?= =?us-ascii?Q?NxuU1gfzr3FX74rAMCZTR3AEOM0iJB/fAtqbimVDCzfLBI8OkbRgMjkh0DW+?= =?us-ascii?Q?QtP07ejS8dnlQg93MfA6zPtYtq0Cqwh5tuxCb2BGMwg1dnCtwpdaz0jj8Di/?= =?us-ascii?Q?GqamrhvrFYu0IQT4p9TuSKbVzm1cfDp1f5GntEcCQubJfB9bQJp2rOmiwazs?= =?us-ascii?Q?JxPeTCVgEdGO1gKBYOhpnDd8MuCvF+kjNEIbphkUqvs8LiTQf71l9tSyBoQa?= =?us-ascii?Q?gK3aKphpLTcM+FlIEASi+FmXzZzx6ckHSiOChxwFoyoESwiz+A13pNT4mKG9?= =?us-ascii?Q?nR5kClDDWLavl7oGtAG3PfQ7OB09j6bpMccfXuNeiYzoBPv8IJHfTWBOrjUC?= =?us-ascii?Q?JEcA+zIEpiQ2EQYWCgW+St5rDV0eP1XvCGN04GGMKhjDdfmwqQMaOOjKoOvx?= =?us-ascii?Q?wh2HaFEYTZu/OPOgYUYBsc3bac93P4Ye5Kf8c?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 6:sFxtc90Lejb39R1Sa1YNSsytHVtz2v7xVTcdYPZqjEjaxEXog78bzAPDBuYOMhVyF4WQAAgdtrOps0w8GnPYcxT3tP3kQUi/wmE0n6O5ta/9nJL9Uj4rwriG2aJvr+Yl740RBSux6SoExSV0OJ6BMdcJQTGuTo5ImT13OWE2eSJjrRVut6xo//PSlatSpwuwNpMZs+D7cWoi4+kyR8ErelW/rtoKYciJV9IwEM+RGHxJWaHgHJuxxoYRlJDsMQ8Zbs51M34+j1lZ9Jn1S1mi5qsfgVrm9tlhWsJ26UeARmwMZJuCrDVLcR/dNGJ0OijFkTgAIr+jwjZYUvh1A4YOnWh5fDbi9U7t4rvYonSTN64Bpv6slP4sd9cWTSmjGGyrtOv24RdfP3FtMv+CIcfs3CPwfu7v0BWThP225LCHcZb7uXYfDu3yU5y39JV0CrXh; 5:YAThrQGFG5r2kIplNj8pWaqAiqexh0b69Uce49QUBSszhUjFk2JidLvRFGCI0XEEl1QDYjteIKtPkPAHNgfGpHhlnCgspaanzyX2Yezgdcuw2zQwTyGbwC9xfGzgo9xNn5ZLRf3F/yXdLn7X4JeuOHzaiwHkAUCaIlfpq2OKvnj8Ny1I34kYmPLzohYYqU8P; 24:CaCpXBXezdsjeHeEVaGvxv9hX0V/QKNQbCHZPxDK3d+Uf6CnczlSHuzmp+LrqEYAqjD+4tXok2YE/PXhPwuEG5MT7ceVm0EJ6cwUCuotTb0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 7:SPPsIpiSO/8azUUWicOPX2N7hCW/eMMZ3Ja4+NmkEll8Z+0o9OLGAZzSCANzO18UIOZ5zWwmuiMmYXkVsAi9Fe1YXwIilMXDovhrD2ohJ9uquHUi3MgXe3XXV9xb3SUImhV+180H/+1SnjjtmtX++UiT220+Yg7A7bQUBvyYqpjPQOoS5+sJmdBVvakzX2Itst+y69k4CWO47IH+/wk6Gt36xX/6lbmDGO79AB8wYUp25r5C2WYDlG5ziZ9GaH0cA6RXSWXy+K+zwhs5mdMSU1LV/N0lVhHSCZgNSXViL5f79gZZRRKbSaxQ3Fg3QJI9AsONlQCCkvvsrDtfN2dltbysRFLVcP1bhHpYZwXVJpmml0zEtI8CU5ANyspUlhxxV0aB5tMdS++Y6U89Ww+GxHXKekDEvC7gt62iShttkp4Z4oD/uxdTQVsdHfRHDwYFLFR7DO0pssblCBWuPsM0NA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2016 18:35:53.6547 (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: BN1PR0301MB0738 Cc: u-boot@lists.denx.de, Breno Lima , francesco.montefoschi@udoo.org, fabio.estevam@nxp.com, brenomatheus@gmail.com Subject: [U-Boot] [PATCH 1/6] udoo_neo: Remove USDHC3 support 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" It's not necessary to support USDHC3 in U-Boot as it's being used for the WLAN. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- board/udoo/neo/neo.c | 94 +++------------------------------------------- include/configs/udoo_neo.h | 1 - 2 files changed, 6 insertions(+), 89 deletions(-) diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 7f17469..efe8605 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -81,16 +81,6 @@ static iomux_v3_cfg_t const board_recognition_pads[] = { MX6_PAD_NAND_ALE__GPIO4_IO_0 | BOARD_DETECT_PAD_CFG, }; -static iomux_v3_cfg_t const usdhc3_pads[] = { - /* Configured for WLAN */ - MX6_PAD_SD3_CLK__USDHC3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_CMD__USDHC3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DATA0__USDHC3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DATA1__USDHC3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DATA2__USDHC3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DATA3__USDHC3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_b_pad = { MX6_PAD_GPIO1_IO13__GPIO1_IO_13 | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -171,91 +161,19 @@ static struct fsl_esdhc_cfg usdhc_cfg[2] = { int board_mmc_getcd(struct mmc *mmc) { - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC2_BASE_ADDR: - ret = !gpio_get_value(USDHC2_CD_GPIO); - break; - } - - return ret; + return !gpio_get_value(USDHC2_CD_GPIO); } int board_mmc_init(bd_t *bis) { -#ifndef CONFIG_SPL_BUILD - int i, ret; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC2 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - imx_iomux_v3_setup_multiple_pads( - usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - gpio_direction_input(USDHC2_CD_GPIO); - gpio_direction_output(USDHC2_PWR_GPIO, 1); - break; - case 1: - imx_iomux_v3_setup_multiple_pads( - usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - break; - default: - printf("Warning: you configured more USDHC controllers\ - (%d) than supported by the board\n", i + 1); - return -EINVAL; - } - - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning:\ - failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -#else - struct src *src_regs = (struct src *)SRC_BASE_ADDR; - u32 val; - u32 port; - - val = readl(&src_regs->sbmr1); - - if ((val & 0xc0) != 0x40) { - printf("Not boot from USDHC!\n"); - return -EINVAL; - } - - port = (val >> 11) & 0x3; - printf("port %d\n", port); - switch (port) { - case 1: - imx_iomux_v3_setup_multiple_pads( - usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - usdhc_cfg[0].esdhc_base = USDHC2_BASE_ADDR; - gpio_direction_input(USDHC2_CD_GPIO); - gpio_direction_output(USDHC2_PWR_GPIO, 1); - break; - case 2: - imx_iomux_v3_setup_multiple_pads( - usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg[1].esdhc_base = USDHC3_BASE_ADDR; - break; - } + imx_iomux_v3_setup_multiple_pads(usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); + usdhc_cfg[0].esdhc_base = USDHC2_BASE_ADDR; + gpio_direction_input(USDHC2_CD_GPIO); + gpio_direction_output(USDHC2_PWR_GPIO, 1); gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk; return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -#endif } char *board_string(void) diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 81e0481..cf75186 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -27,7 +27,6 @@ /* Command definition */ #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC2*/ /* Linux only */