From patchwork Thu Aug 1 06:02:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1140276 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="W4vHhiLF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45zfpj2st9z9sMr for ; Thu, 1 Aug 2019 16:02:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0A9F6C21DFB; Thu, 1 Aug 2019 06:02:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8E175C21C38; Thu, 1 Aug 2019 06:02:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D3B0C21C38; Thu, 1 Aug 2019 06:02:43 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80055.outbound.protection.outlook.com [40.107.8.55]) by lists.denx.de (Postfix) with ESMTPS id 8927BC21C27 for ; Thu, 1 Aug 2019 06:02:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hhm8AzCS74ChZZxvh+SwaAYP9nTUGFVNviHZPans82fioBzp+47ZOa4Y6cD0yE1PCIX2/3TiwQZdp2sCrVA26wa9F4IogSPhHdxKs/LFfYTHLOEqmallAltHIKKS0z5XmAcx7y8b0Dk3qEftuMdxFy5CJg786IKH/N39pVZNGfbrxOGXdYYLXsYbd2KFCX3QZmLZlRSyfoclEy7X+04pB1MIGkTmMjubdKIxm6FCqvAvifMUYdSljANkgvBm/EPsXiVywnr7alBOIZGQ+/6ycpMZeDJ/vIZB2hqwWr7zye0O9EZZT8KZIn+3BowEccM7D6aL/0mf7gQM8LVMv4Q6vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZLp0jnnlf8fnSw9E6rz0eLxMKpk6XhZtj9CcNJqd0zk=; b=Zn5VZ3s4T2vC3cdcw622SuC0ejUkYMA0GCrbsNVcBM9t7Yxcb+FUjU9dWzcIm/fYF4fuu9dTd4s8bwQeoHn6BHGBeUK9q6nY70fm2/VTScdqN1dzvpv/cL1TqJIenjNOv7GmEAjJLSxLWfPKyM0wJDbj+viPRjqNRR9O6vSP8oIvHUiIwhhI5cvAiPES/gb08A+96suZAGWSx9Lc66g3kLeF1xX3RM9bf593Ot3agz4j0i30C/0MHa+e+B+vAl0d2BO8cjKhLk/9gk0vPzwQhotuIGuyBf+4yVTV/hzfv0LwyiTnD6nuDo2hKVeaybu2Cdbz/GlvU7Fm/y4gUF9AAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZLp0jnnlf8fnSw9E6rz0eLxMKpk6XhZtj9CcNJqd0zk=; b=W4vHhiLFVXlApFfLXUuZIXPVfggOa8cPV3nRraryhmvk2ZQJZ22fnl2gGb7o8vUDNtHsLq32h/V4YdQgVUmFfU8MgU6/+bnM6LXUx1BKS9G9JMEdeIghAuPxC7JBdUr1sPycDEDCmQW2y179grOQBJ30n8yV1/78nQxC/8RAJMM= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB4612.eurprd04.prod.outlook.com (52.135.146.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Thu, 1 Aug 2019 06:02:41 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2115.005; Thu, 1 Aug 2019 06:02:41 +0000 From: Peng Fan To: "sbabic@denx.de" , "agust@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 1/2] imx: mx6ul_14x14_evk: Fix SPL boot Thread-Index: AQHVSC663VE0Ligo8kKI8tJdZvQckg== Date: Thu, 1 Aug 2019 06:02:41 +0000 Message-ID: <20190801061818.23585-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK0P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::26) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: dc26ee16-23b0-47a0-3fb4-08d71645dcf3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB4612; x-ms-traffictypediagnostic: AM0PR04MB4612: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 01165471DB x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(376002)(346002)(39860400002)(396003)(189003)(199004)(316002)(476003)(6486002)(71190400001)(71200400001)(6436002)(44832011)(110136005)(1076003)(81166006)(2906002)(54906003)(86362001)(81156014)(5660300002)(256004)(8936002)(50226002)(478600001)(68736007)(8676002)(14444005)(486006)(4326008)(2616005)(2501003)(14454004)(53936002)(7736002)(6116002)(36756003)(6512007)(66946007)(64756008)(66556008)(66476007)(66446008)(3846002)(102836004)(66066001)(2201001)(52116002)(305945005)(6506007)(99286004)(386003)(25786009)(186003)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4612; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: TbnamOyQacLi8z8lqqzkzZFUQBVH2+IfoQZ6PTjT7D9gZBQ2ZAwiUqkrJ4CtOeXQ93WP6ryuAy6FwYnZCuj3NKnIL+DBjwRByG/UsZ4gC/82Dqbm+2Wly+rVD5WJz3wIGMQVJoBpdrZt+I3Y8WTq6dDHWClMZElxYZImevVQzYG16R3A0DtrlM7TxksYIqY7pvVE1zFi4ngHv0Y/E3ST2N3HaL8q7SqcHQzJayTQBgMfBcH819WDcmn1QTLmT/vbF/of9gu/6O/PmCqzPtvJTHoXqPEemMgxACB9zCEyIG2ZolBmdGCDU2dsbG1qXh8+su9Zq3ha72+lldTTB0QBPJBtZANaCz2MEqgS2cVOhAFJFKPulsXL9wVOJKP3HRvcnwtgaRhdrlzUawfZfQ87Tjb97gkGYCn7lzSwTyjpOSo= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc26ee16-23b0-47a0-3fb4-08d71645dcf3 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Aug 2019 06:02:41.3237 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4612 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 1/2] imx: mx6ul_14x14_evk: Fix SPL boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" When booting SPL on the board, met boot failure: " Trying to boot from MMC2 MMC Device 1 not found spl: could not find mmc device 1. error: -19 SPL: failed to boot from all boot devices " Let's register the two mmc controllers in SPL stage to avoid boot failure. Signed-off-by: Peng Fan Reviewed-by: Fabio Estevam --- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 785247f7e2..af5af4d50a 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -110,7 +110,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#ifndef CONFIG_SPL_BUILD static iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -126,7 +125,6 @@ static iomux_v3_cfg_t const usdhc1_pads[] = { /* RST_B */ MX6_PAD_GPIO1_IO09__GPIO1_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), }; -#endif /* * mx6ul_14x14_evk board default supports sd card. If want to use @@ -237,19 +235,6 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { -#ifdef CONFIG_SPL_BUILD -#if defined(CONFIG_MX6UL_14X14_EVK_EMMC_REWORK) - imx_iomux_v3_setup_multiple_pads(usdhc2_emmc_pads, - ARRAY_SIZE(usdhc2_emmc_pads)); -#else - imx_iomux_v3_setup_multiple_pads(usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); -#endif - gpio_direction_output(USDHC2_PWR_GPIO, 0); - udelay(500); - gpio_direction_output(USDHC2_PWR_GPIO, 1); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - return fsl_esdhc_initialize(bis, &usdhc_cfg[1]); -#else int i, ret; /* @@ -296,7 +281,6 @@ int board_mmc_init(bd_t *bis) return ret; } } -#endif return 0; } #endif From patchwork Thu Aug 1 06:02:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1140277 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="po344ySs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45zfqM1kr3z9sMr for ; Thu, 1 Aug 2019 16:03:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EFE34C21E50; Thu, 1 Aug 2019 06:03:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2194DC21DD7; Thu, 1 Aug 2019 06:03:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 73C1FC21DB6; Thu, 1 Aug 2019 06:02:53 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80041.outbound.protection.outlook.com [40.107.8.41]) by lists.denx.de (Postfix) with ESMTPS id 011C1C21DB6 for ; Thu, 1 Aug 2019 06:02:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExK2OJ09I7KJ2n/5xg2w5pdqpSC3F9TPjoocuwwCZjHL5uNxwh03Bc+K+0J4ZPfOF+E/5PFDPkB8FZC3nUpRvo6oBBj/RpLMWTsRIZolEVW9hQC63rmiIouYPF0cWyVoPxxENDqG/9K12X4F7MTMib+CwOtb/M4gP35FEZdoKSXLCefY+LebfCGtiJDWGJ3nU+39CTZHJH2UnGHutSGZgqihIocnSSsENBJjZViLOd6zgOHkzp7GUFbKR2NWqKnMlv4MkL8LoGdTB2sp0+E25ekLv4ZUA9JJier0adaCRyA1ll479/hgcmKbVdTebt3ynkjOXx91rCSAn2SlHf6RQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dDtlC46Tk+wNo0DE+Blsk2MlGS1Uwg6St9SgWtpz0Nw=; b=DDqLzp0CWZpE9sf8h+MtadJpYPjZ6dFcq9f0GP0EfHsCBbv+Q0EE0oUkG0B5U4vLTBNEM+Hf1U41+5eLKariMzVEXgTWgwkn9+oZmSb8liSLpuz7PLirwnaJ6u51VrJ/W5s0FyX+QYiEbXE0+khBZigT3X33uYQMSqYoPTD8AM09sb+MDVMaPgR6nlVSrTMglN+7jbqx/hz5lIov5eQ2cSedWI8TAkA+9q9vdnBYUVDVY6OWlddeDM4yNiGQc1o6GgPBQMHc9n2zyFWT2Se0yn+ZsXUFyERFWRuSTXUwLaHyxnvG5zEYlMEFVRovmilGgvYq1TBtoSRF0RQ401wu6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dDtlC46Tk+wNo0DE+Blsk2MlGS1Uwg6St9SgWtpz0Nw=; b=po344ySsZmPtQ6mBl3N2w9moQe9S250X1Z9Zfctk7/JVSzzt02CKWAvWNDMqjt1HaO69Z6d/UmCwQ8TDu8TTUjTPtzALqviXscfmLx9vSIJBgLYv+j6iwwqwZ51fygObVc/vnsRzTrqPHypmO/TBCjEdavXdGTrIlj0y9rMtXOU= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB4612.eurprd04.prod.outlook.com (52.135.146.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Thu, 1 Aug 2019 06:02:50 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2115.005; Thu, 1 Aug 2019 06:02:50 +0000 From: Peng Fan To: "sbabic@denx.de" , "agust@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 2/2] imx: mx6ul_14x14_evk: convert to DM_VIDEO Thread-Index: AQHVSC6/pmcvJ1jOf0G8QbctLvjt2g== Date: Thu, 1 Aug 2019 06:02:49 +0000 Message-ID: <20190801061818.23585-2-peng.fan@nxp.com> References: <20190801061818.23585-1-peng.fan@nxp.com> In-Reply-To: <20190801061818.23585-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK0P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::26) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cb492902-4200-4d80-c9c0-08d71645e21a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB4612; x-ms-traffictypediagnostic: AM0PR04MB4612: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1775; x-forefront-prvs: 01165471DB x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(376002)(346002)(39860400002)(396003)(189003)(199004)(316002)(476003)(6486002)(71190400001)(71200400001)(6436002)(44832011)(110136005)(1076003)(81166006)(2906002)(54906003)(86362001)(81156014)(5660300002)(256004)(8936002)(50226002)(478600001)(68736007)(8676002)(446003)(14444005)(486006)(4326008)(2616005)(2501003)(14454004)(966005)(53936002)(7736002)(11346002)(6116002)(6306002)(36756003)(6512007)(66946007)(64756008)(76176011)(66556008)(66476007)(66446008)(3846002)(102836004)(66066001)(2201001)(52116002)(305945005)(6506007)(99286004)(386003)(25786009)(186003)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4612; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: xXntmHWlnBQn8hmrzd0plNpsoAaMFn4pFJK98hFrvXYGb+taUolG3R/tOFBm+arn7zW4AHPvdWTqdOQ6cJuhSS1aSj/lhTOl8dqvrAzKxxDZaDeUS54a7Re0LvpQGar7Fm2KYP+w8xfgmLHC9/Q7H/ZZ2uIDvvaT5MtsxfN1ZOYfJTQGXCWfhEUFK/MZYlGWLv77+uUCYx70mBGuNjXM5Xuw2rwpVIwzpqYRzp5942cTYfHgRVt6TaD6RfJW8gvnohZdxUvxXNU1UfEWAAjHrvmiR78XCAscvHDcnHEAEq4Y+gvkcEcFi7M1No1IFRNFuMLKDIXR0r0ixHbX34kIOtE2vOu8fHkEcJwmfQdL0phBYZYqJ/P60GzPRFXFTLnh3DQC3x14FX/om0dMcVBxWQ30RMj8Lkbuxed20MZmOhc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb492902-4200-4d80-c9c0-08d71645e21a X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Aug 2019 06:02:49.9614 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4612 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 2/2] imx: mx6ul_14x14_evk: convert to DM_VIDEO X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" To support DM_VIDEO, Add display node for lcdif Drop board iomuxc settings. Enable DM_VIDEO Signed-off-by: Peng Fan Reviewed-by: Anatolij Gustschin --- V1: This patch could be applied directly, but it needs https://patchwork.ozlabs.org/patch/1133224/ patchset work let DM VIDEO work. arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 49 ++++++++++++++++++- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 57 ++++++++--------------- configs/mx6ul_14x14_evk_defconfig | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- 4 files changed, 70 insertions(+), 40 deletions(-) diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi index 77cb461a21..e9efdb9831 100644 --- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi @@ -3,8 +3,55 @@ * Copyright 2018 NXP */ +&{/aliases} { + u-boot,dm-pre-reloc; + display0 = &lcdif; +}; + &qspi { flash0: n25q256a@0 { compatible = "jedec,spi-nor"; }; -}; \ No newline at end of file +}; + +&{/soc} { + u-boot,dm-pre-reloc; +}; + +&aips2 { + u-boot,dm-pre-reloc; +}; + +&iomuxc { + u-boot,dm-pre-reloc; +}; + +&lcdif { + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display@0 { + bits-per-pixel = <16>; + bus-width = <24>; + + display-timings { + native-mode = <&timing0>; + + timing0: timing0 { + clock-frequency = <9200000>; + hactive = <480>; + vactive = <272>; + hfront-porch = <8>; + hback-porch = <4>; + hsync-len = <41>; + vback-porch = <2>; + vfront-porch = <4>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + }; +}; diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index af5af4d50a..126a805163 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -27,6 +27,10 @@ #include "../common/pfuze.h" #include #include +#ifdef CONFIG_DM_VIDEO +#include +#include +#endif DECLARE_GLOBAL_DATA_PTR; @@ -420,40 +424,8 @@ int board_phy_config(struct phy_device *phydev) } #endif -#ifdef CONFIG_VIDEO_MXS +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const lcd_pads[] = { - MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_VSYNC__LCDIF_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA18__LCDIF_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA19__LCDIF_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA20__LCDIF_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA21__LCDIF_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA22__LCDIF_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA23__LCDIF_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL), - - /* LCD_RST */ - MX6_PAD_SNVS_TAMPER9__GPIO5_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), - /* Use GPIO for Brightness adjustment, duty cycle = period. */ MX6_PAD_GPIO1_IO08__GPIO1_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL), }; @@ -504,10 +476,6 @@ int board_init(void) board_qspi_init(); #endif -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - return 0; } @@ -536,6 +504,21 @@ int board_late_init(void) env_set("board_rev", "14X14"); #endif +#if defined(CONFIG_DM_VIDEO) + struct udevice *dev; + int ret; + + ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); + if (ret) + return ret; + + setup_lcd(); + + ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, 0, 0, true); + if (ret) + return ret; +#endif + return 0; } diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 1d777b5fb2..10fb07dd2c 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -67,4 +67,4 @@ CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 42e511591c..f8a5fd30f3 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -196,7 +196,7 @@ #define CONFIG_IMX_THERMAL #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO +#if defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN