From patchwork Wed Apr 17 23:57:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087307 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzh10ycMz9s00 for ; Thu, 18 Apr 2019 09:57:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C2274C21DCA; Wed, 17 Apr 2019 23:57:49 +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 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 B20C9C21C27; Wed, 17 Apr 2019 23:57:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5775BC21C27; Wed, 17 Apr 2019 23:57:45 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 9C8A5C21BE5 for ; Wed, 17 Apr 2019 23:57:44 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MLxOM-1hDZyi33TY-007lYf; Thu, 18 Apr 2019 01:57:41 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:19 +0200 Message-Id: <20190417235732.13643-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:kmwn+Vb6HT+gm8eVtr8NrnKO9niWa3y6VHIaJxyPa2AyIgBL9tO m5x22q6txh/NdE+28iU6EqYC9jrvcn+ujbCA7Lg9pGGbRrBnshvrQ9+fP2FLFWLQ9fmlpTR i9VYGZuiRrqlxuIZ9RYb/bt6PhQBhEPyoE7ronRMzkXbyUPQnrj+eSgnAjaHrILF2CLtSqg a47c9tsz//hM3o4t4jEMA== X-UI-Out-Filterresults: notjunk:1; V03:K0:DDkxWs4VAJc=:JiD9a8E4YEQ7BMxymeHJtm dfKk64mJ4xWLCIr3RkFU6OSkXFt0elI8QdjdjaikPMDzina5sYZ2VGlowVaMJoAGNMU/k84NZ EOcnq41I1aITIng5Olb8DOQiz+rXxjLe4EIfZw6V6H8asY7jKG4YcaFhKzwY9ILvj8fGPBIkG Vp1VzV8Ul50v1phdD8OFGpkOWGRK/0vChQHJfs0di+syKYfQrE3LWp/8TTenvCUzaDiouv+OP 6GlnE2qC0thvm8Bd5BUCy6cOyGzPuoWvKP5vvwr29dtCfbyJ2VfuE4lZnHxQ7xH7MAzIicHQx 9Dbmy9TM8S1RSOj9KQa/WyYiqDX+aXcBYWNSHtPfnKd/HMKiF2GT12vedL1QNXcyQM4/dBKPC KdYgWLDBNqbAjyPqI2K/r645ExiCzoKUOhf37xWpThDN+ulk3AL3H0u/WKsA7g9ONsK4YdBnI zEJhXLsoxboHOit5AQxwxYhVs3k7TpyS8k/dr5FDoOkRk4neHOlSxHunMzYa/I5ABbQxJmcld SSXCfkLgmI9Lk+DNahg+x5iCl9734fHO/FwsrUcVouTXyam/1qvfGdvUQI6xi5Z7iBioriPrt YN8DedGh5yVu9oxZWunKn4apz2WI6E5uNc2OWCiECkgae3iMtYcnduMdu03YBRobkwHXAxR8/ pjcE1vi5vmE8U2OKPCNLTb4qo1RKmNX5yHWx4wIp5mzfyco7QN8bV2DHTbpfi7/mS71SyCIdI uCr8Q4N8dYs+xHzbnenb/A1OC1ttAHq31ma/jw== Cc: Gerard Salvatella , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Max Krummenacher , Dominik Sliwa Subject: [U-Boot] [PATCH v3 01/14] tdx-cfg-block: add support for new colibri iMX6ull skus 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" From: Gerard Salvatella Add support for new Colibri iMX6ULL SKUs. While at it also checkpatch fix the whole files. Signed-off-by: Gerard Salvatella Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. board/toradex/common/tdx-cfg-block.c | 62 +++++++++++++++++++++------- board/toradex/common/tdx-cfg-block.h | 3 ++ 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index b90077bedc..3b73421243 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (c) 2016 Toradex, Inc. + * Copyright (c) 2016-2019 Toradex, Inc. */ #include @@ -98,6 +98,9 @@ const char * const toradex_modules[] = { [40] = "Colibri iMX6ULL 512MB Wi-Fi / Bluetooth IT", [41] = "Colibri iMX7 Dual 512MB EPDC", [42] = "Apalis TK1 4GB", + [43] = "Colibri T20 512MB IT SETEK", + [44] = "Colibri iMX6ULL 512MB IT", + [45] = "Colibri iMX6ULL 512MB Wi-Fi / Bluetooth", }; #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC @@ -299,22 +302,47 @@ static int get_cfgblock_interactive(void) else tdx_hw_tag.prodid = APALIS_IMX6D; #else - if (it == 'y' || it == 'Y') - if (is_cpu_type(MXC_CPU_MX6DL)) + char wb = 'n'; + + if (it == 'y' || it == 'Y') { + if (is_cpu_type(MXC_CPU_MX6DL)) { tdx_hw_tag.prodid = COLIBRI_IMX6DL_IT; - else + } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { tdx_hw_tag.prodid = COLIBRI_IMX6S_IT; - else - if (is_cpu_type(MXC_CPU_MX6DL)) + } else { + sprintf(message, "Does the module have WiFi /" \ + " Bluetooth? [y/N] "); + len = cli_readline(message); + wb = console_buffer[0]; + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = + COLIBRI_IMX6ULL_WIFI_BT_IT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; + } + } else { + if (is_cpu_type(MXC_CPU_MX6DL)) { tdx_hw_tag.prodid = COLIBRI_IMX6DL; - else + } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { tdx_hw_tag.prodid = COLIBRI_IMX6S; + } else { + sprintf(message, "Does the module have WiFi /" \ + " Bluetooth? [y/N] "); + len = cli_readline(message); + wb = console_buffer[0]; + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = + COLIBRI_IMX6ULL_WIFI_BT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL; + } + } #endif /* CONFIG_MACH_TYPE */ - } else if (!strcmp("imx7d", soc)) { + } else if (!strcmp("imx7d", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7D; - } else if (!strcmp("imx7s", soc)) { + else if (!strcmp("imx7s", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7S; - } else if (!strcmp("tegra20", soc)) { + else if (!strcmp("tegra20", soc)) { if (it == 'y' || it == 'Y') if (gd->ram_size == 0x10000000) tdx_hw_tag.prodid = COLIBRI_T20_256MB_IT; @@ -330,8 +358,9 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = COLIBRI_PXA270_312MHZ; else tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ; + } #ifdef CONFIG_MACH_TYPE - } else if (!strcmp("tegra30", soc)) { + else if (!strcmp("tegra30", soc)) { if (CONFIG_MACH_TYPE == MACH_TYPE_APALIS_T30) { if (it == 'y' || it == 'Y') tdx_hw_tag.prodid = APALIS_T30_IT; @@ -346,8 +375,9 @@ static int get_cfgblock_interactive(void) else tdx_hw_tag.prodid = COLIBRI_T30; } + } #endif /* CONFIG_MACH_TYPE */ - } else if (!strcmp("tegra124", soc)) { + else if (!strcmp("tegra124", soc)) { tdx_hw_tag.prodid = APALIS_TK1_2GB; } else if (!strcmp("vf500", soc)) { if (it == 'y' || it == 'Y') @@ -373,7 +403,7 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.ver_minor = console_buffer[2] - '0'; tdx_hw_tag.ver_assembly = console_buffer[3] - 'A'; - if (cpu_is_pxa27x() && (tdx_hw_tag.ver_major == 1)) + if (cpu_is_pxa27x() && tdx_hw_tag.ver_major == 1) tdx_hw_tag.prodid -= (COLIBRI_PXA270_312MHZ - COLIBRI_PXA270_V1_312MHZ); @@ -441,7 +471,8 @@ static int do_cfgblock_create(cmd_tbl_t *cmdtp, int flag, int argc, * On NAND devices, recreation is only allowed if the page is * empty (config block invalid...) */ - printf("NAND erase block %d need to be erased before creating a Toradex config block\n", + printf("NAND erase block %d need to be erased before creating" \ + " a Toradex config block\n", CONFIG_TDX_CFG_BLOCK_OFFSET / get_nand_dev_by_index(0)->erasesize); goto out; @@ -450,7 +481,8 @@ static int do_cfgblock_create(cmd_tbl_t *cmdtp, int flag, int argc, * On NOR devices, recreation is only allowed if the sector is * empty and write protection is off (config block invalid...) */ - printf("NOR sector at offset 0x%02x need to be erased and unprotected before creating a Toradex config block\n", + printf("NOR sector at offset 0x%02x need to be erased and " \ + "unprotected before creating a Toradex config block\n", CONFIG_TDX_CFG_BLOCK_OFFSET); goto out; #else diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index da60e789a7..961bb4394f 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -61,6 +61,9 @@ enum { COLIBRI_IMX6ULL_WIFI_BT_IT, /* 40 */ COLIBRI_IMX7D_EPDC, APALIS_TK1_4GB, + COLIBRI_T20_512MB_IT_SETEK, + COLIBRI_IMX6ULL_IT, + COLIBRI_IMX6ULL_WIFI_BT, /* 45 */ }; extern const char * const toradex_modules[]; From patchwork Wed Apr 17 23:57:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087308 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzhg2bhnz9s00 for ; Thu, 18 Apr 2019 09:58:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 04769C21DEC; Wed, 17 Apr 2019 23:58:17 +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 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 B220DC21DF9; Wed, 17 Apr 2019 23:57:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6062DC21C8B; Wed, 17 Apr 2019 23:57:51 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 3927BC21DAF for ; Wed, 17 Apr 2019 23:57:47 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MatW0-1haDhk429q-00KSat; Thu, 18 Apr 2019 01:57:43 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:20 +0200 Message-Id: <20190417235732.13643-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:EDd9U1UoDJBkMGfoG8fibHjpQzieabvqllzHbu1VPDiqBOtGCG4 N8PEexU3CPIeR3bEMtwE4p+iE2k7Trg2NyD74w2IyJUhBUAkfB23qZpK+SuqQ0bAkcH32Oa 584zYEruXKwA9dxjmfyNmL0REslOBSztH/MrZcBsC42Rj+BQemaGYUFu7M+qdOPcFxcVm62 IqPoOE30AeSolrfH3QYlg== X-UI-Out-Filterresults: notjunk:1; V03:K0:ZBghk2QS/FQ=:jk3dptQzK1OOg6CMxDCn3b riPBWpxTPgKKO4qO39EolmwlsaR/NhDVDaUqUrhC1/7pKB4fBhsT/ox0gsdMh7Vx1Fm8yaSjM gYgjpXGtU7yXDYzxtgHfWn9i7J3TmDqJOvK/G2FwVmTXxo89a4lFPvMy2Tk7S4/oKpf8GKoly rQZ/PmmbMjO6VAFMen/YawNGo1T3vkavaN/y/8N6urfJfBmVTFQVd1mItRKwdmvqftCjoR4NO aADK/CsofWvHZpY8QZePa9s+eqrkJMSphUaPRQ2ti1wW2C8XpTj+wI3U8lFNmoSjR0iB0Xgcx SbT1hpRXc1/AK4Z6lNQ3/WcSYb6pQ5UP2v5yxju6pXdn/Rsi9AyxQyjAQY8Byq0Hce7wJ7nL8 WFYmukjqZeWVVGVALW+M+5+IHOa6a63BJQaGHAKgYV+iwXWxKYILp0qQDnuZF1miCxXOKmmR8 B3LnWjcu+dmOaZmgHXjseRVG+7AktFwQls9P9I4AEcbabuZv4CVPfTBrilO87Br1duaF/ZBEE ENPkfdW7x3EmIuQPKzWgTpPd98OT6oNBi5aUkm+pWt06T6VkRzT/LKRFopT7RghDyqfVUUiZt UOWLHeUPdNoylHy4OzXZkaVltUsnJQtdtbxsgtsitZ+GYZyQl9kZynrrDj+G4vucfGcZUdcPd vg+3VesQsoEwl5iwYOQWDhn5krZxIOV6++sJDw86kTz5bgbzqYUM1oG9mvH1mkj98JJqnyMFq tvZNFZayN9qQQBOMPiC6dfVjndrNFKkGvwMb3A== Cc: Gerard Salvatella , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Max Krummenacher , Dominik Sliwa Subject: [U-Boot] [PATCH v3 02/14] tdx-cfg-block: simplify i.MX 6 module detection 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" From: Stefan Agner Use CONFIG_TARGET_... at compile time to differentiate between Apalis iMX6, Colibri iMX6 and Colibri iMX6ULL. Avoid code duplication by moving question about Wi-Fi / Bluetooth before IT/non-IT decision. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. board/toradex/common/tdx-cfg-block.c | 68 ++++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 3b73421243..71ff40cfad 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -280,6 +280,9 @@ static int get_cfgblock_interactive(void) char it = 'n'; int len; + /* Unknown module by default */ + tdx_hw_tag.prodid = 0; + if (cpu_is_pxa27x()) sprintf(message, "Is the module the 312 MHz version? [y/N] "); else @@ -290,54 +293,49 @@ static int get_cfgblock_interactive(void) soc = env_get("soc"); if (!strcmp("mx6", soc)) { -#ifdef CONFIG_MACH_TYPE - if (it == 'y' || it == 'Y') +#ifdef CONFIG_TARGET_APALIS_IMX6 + if (it == 'y' || it == 'Y') { if (is_cpu_type(MXC_CPU_MX6Q)) tdx_hw_tag.prodid = APALIS_IMX6Q_IT; else tdx_hw_tag.prodid = APALIS_IMX6D_IT; - else + } else { if (is_cpu_type(MXC_CPU_MX6Q)) tdx_hw_tag.prodid = APALIS_IMX6Q; else tdx_hw_tag.prodid = APALIS_IMX6D; -#else - char wb = 'n'; - + } +#elif CONFIG_TARGET_COLIBRI_IMX6 if (it == 'y' || it == 'Y') { - if (is_cpu_type(MXC_CPU_MX6DL)) { + if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL_IT; - } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S_IT; - } else { - sprintf(message, "Does the module have WiFi /" \ - " Bluetooth? [y/N] "); - len = cli_readline(message); - wb = console_buffer[0]; - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = - COLIBRI_IMX6ULL_WIFI_BT_IT; - else - tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; - } } else { - if (is_cpu_type(MXC_CPU_MX6DL)) { + if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL; - } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S; - } else { - sprintf(message, "Does the module have WiFi /" \ - " Bluetooth? [y/N] "); - len = cli_readline(message); - wb = console_buffer[0]; - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = - COLIBRI_IMX6ULL_WIFI_BT; - else - tdx_hw_tag.prodid = COLIBRI_IMX6ULL; - } } -#endif /* CONFIG_MACH_TYPE */ +#elif CONFIG_TARGET_COLIBRI_IMX6ULL + char wb = 'n'; + + sprintf(message, "Does the module have Wi-Fi / Bluetooth? " \ + "[y/N] "); + len = cli_readline(message); + wb = console_buffer[0]; + if (it == 'y' || it == 'Y') { + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; + } else { + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL; + } +#endif } else if (!strcmp("imx7d", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7D; else if (!strcmp("imx7s", soc)) @@ -389,7 +387,9 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = COLIBRI_VF61_IT; else tdx_hw_tag.prodid = COLIBRI_VF61; - } else { + } + + if (!tdx_hw_tag.prodid) { printf("Module type not detectable due to unknown SoC\n"); return -1; } From patchwork Wed Apr 17 23:57:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087309 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzjj0G8Sz9s47 for ; Thu, 18 Apr 2019 09:59:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 91FDEC21E12; Wed, 17 Apr 2019 23:58:03 +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 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 27BEAC21C27; Wed, 17 Apr 2019 23:57:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4933FC21DF9; Wed, 17 Apr 2019 23:57:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 91AA6C21DEC for ; Wed, 17 Apr 2019 23:57:48 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Ludx0-1gqPM031Wq-00znsb; Thu, 18 Apr 2019 01:57:45 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:21 +0200 Message-Id: <20190417235732.13643-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:WrkCQiPRi42wESRQtp/j9t73rE4wInDURvC+pevGKhOlVoRnpAZ c83FwV4O2uwXOL+Ke9gM9+dfzjy0Lfz987AxouzU3PKPHGGl2bQiq+du13MaPF/ufYDGV34 vgpP9moU+oaVQhjO5Sx7tCh0uewE89Ksii45txQSE14MFlIVfY+m0ycYcz71RhZ212gXAsz RWnPk/z2SKRVrT6VPf+Kg== X-UI-Out-Filterresults: notjunk:1; V03:K0:+jYlPYDnOQw=:8y9b7UmjLVtn5yCufBKYxI x6bUu6Oyhgw7qfYT67E268wUE6A6UzjI5OhEGxgSMsYkOdL7Zak/rW/tzi1LEZTQLLh3PDOhz SPnoTYaFf1YSAgWWrV81zL550U3PrlWvEXPQSlQycHbYsafKY+KOuPCeGsGNfCdLu1i6Sa1bF FtpKUoFv35eteu2HeL4+QQGeH/28+XiAwq2ieYIeYl1OWKJF5o/Hyu8RTdz89l6Vk6FKEVwT1 ENBq1TZik5sIPtpkSQf00ZI3OIvwrcQclOD9rBFjBMpjTkQR9nWNXhhGEqbeHCudBzI6OUGFL zdB+1PlpRMeTlXMvElfPtJ7vkFVXDI6NxXlcFV83D2/rBJ3Sy2UZyX2pRhcdEbW1TEB/XxwZL IYS0py9vjPb8fnCFLGJ3vfs4K5PhnSZqS4d8rzioTzF4RQ0ICyRxM3/BdJ6vfx7VwlTaui42b cHoHfUciZ4oY8MFdTzxjtA7BF46yVBokV4jE8K1nMgZeJ3GTi2+tMYXuUVitS8Rg7zcNZkDNn Qfdy1B11uhwBUV6iltNf4VMBISnGqdCej3opfiNWzGYq/BVfKYn3pDz2/TraMwQQ+fEsu8trp 4zwpcjW2DpjO+H7Upr7qBLqOLsiB9McPYEKFMsEYctuK3BKSnkLyUTnHSm17P3VFQ/UsiAvPx Y4Bf97Vg3nVpZ4w3BVc7IKqaoAsLUVplD5xYDPguPfPa+Nh7g77R3h9dc7hPnFz56IqLOELcd tKlNJG6f+vWhbQgpdjhHXvMvevPxqJkFlZJf0Q== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v3 03/14] colibri-imx6ull: set module variant depending on config block 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" From: Stefan Agner Using CPU temperature grading as a discriminator if the Wi-Fi / Bluetooth chip is populated is no longer possible due to upcoming SKUs. Set variant to -wifi only if a valid config block is present and the product id mentions a SKU with Wi-Fi / Bluetooth. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. board/toradex/colibri-imx6ull/colibri-imx6ull.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index fcb49a0718..fe60b8e870 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -29,6 +29,7 @@ #include #include #include "../common/tdx-common.h" +#include "../common/tdx-cfg-block.h" DECLARE_GLOBAL_DATA_PTR; @@ -317,10 +318,15 @@ static const struct boot_mode board_boot_modes[] = { int board_late_init(void) { - int minc, maxc; - - if (get_cpu_temp_grade(&minc, &maxc) != TEMP_COMMERCIAL) +#ifdef CONFIG_TDX_CFG_BLOCK + /* + * If we have a valid config block and it says we are a module with + * Wi-Fi/Bluetooth make sure we use the -wifi device tree. + */ + if (tdx_hw_tag.prodid == COLIBRI_IMX6ULL_WIFI_BT_IT || + tdx_hw_tag.prodid == COLIBRI_IMX6ULL_WIFI_BT) env_set("variant", "-wifi"); +#endif #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); From patchwork Wed Apr 17 23:57:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087310 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzkf3t6gz9s00 for ; Thu, 18 Apr 2019 10:00:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1A786C21C27; Wed, 17 Apr 2019 23:58:58 +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 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 69C70C21CB1; Wed, 17 Apr 2019 23:58:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 44161C21E1B; Wed, 17 Apr 2019 23:57:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 5E211C21DC1 for ; Wed, 17 Apr 2019 23:57:51 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MEm8C-1h5Ilk3E8g-00FyUJ; Thu, 18 Apr 2019 01:57:47 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:22 +0200 Message-Id: <20190417235732.13643-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:zR+fBEOexde/uPF7UP8G8rKMn7BFBfsOia5ZcihDKN/f3NScT+7 WT7bAtEAhzesr3eET9Ahxc5Sywr9OE7VHZBgr3vU/bz0JIyzCwNHQsDLkEqRG7pjXNpiuow IHSH4w4lJH4qXsmGCrzV2FHEuCmLLF9/jegGKqfbw2gUYdSIPxOX9jyh8iBFfSThTLfRu41 wWPWuX/k72avTCN2NrTrQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:aMU98UToUvw=:PvQ0TQz4hxlSNNghgerMyw p5GheBQArIAFBAP07ezqiHL3xgIU/GN4Zs6Z/hmW0cTRCRFJQSbD18g5KWvTqg1o7GFT1e7aA V0+t7BzKw3ZSNOgM5Uxm61O3E4FLrvV8cBTH5qogda/xCjKnWFe6W4QZiqFJpwWVa1rhWhGV5 c4z9f9JzdiU05OeYpP+H1B0kzIWclcm7tluNcko+/2TjMDNdEMQ0qytVKNohqxpFby9qYyDp6 KhbUOULuTX9HYdfAyDnooGFRXdX1+RMVSmjNmxW3MWz87zZb06KcmZmaDWARr2HV+1zWWUfPm UZBZMTrwMGYEgIsUFNt+XygBzr6MvbnyRwKxeSkWEvP5yCNshMl5KJQ4yYrfbzhk16dxRuahn 7j6A8WiIyeCU5yglhfn8LbdNt1Z62i0wYJV2BZfa1Vfs6BgZ8pgxUYU3IKh8V9sfsn1wbe3Dv lzVe5mK4gQuTmHWg0Szda564Mg7IuqYEsgZXDwYt36hTBJ1+sK3UQ5zKvun7hUb5cQMDVDvdY sU65mguH7OldFDV0iqVQ0I208UvzeFz3RaDa+6OlpvbUNktUjoYWdUkzMhbZqNL4Rw9K/gXwf eKU9AZRWouJ91OkZMPXG7pi8PTds2YW89si8/kwGao9FgGuEU4wXw3GjND1sBVCsQepdCsOiD LJZ6w8Q4rQfma4R6/IaWHbYANkqovUiOje/UAT4f1IxrWg/gIFSNnEjsaTSMck31XOrQtndTp laWWQNQQ9LM76lXGJg60EhyDNMkjQByfiEXpjA== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v3 04/14] apalis/colibri_imx6/imx6ull: make sure loadaddr does not collide 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" From: Stefan Agner Currently $loadaddr and $fdt_addr_r point to the same address. This might be not ideal for some distro boot scripts which make use of $loadaddr after loading the device tree. Make sure the two variables point to two different addresses. Moving $loadaddr is not entirly trivial since it is defined in mx6_common.h. Move $fdt_addr_r and $ramdisk_addr_r by 1MiB, which should be enough for scripts. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. include/configs/apalis_imx6.h | 4 ++-- include/configs/colibri-imx6ull.h | 4 ++-- include/configs/colibri_imx6.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 96169f55f0..91054d8c05 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -138,12 +138,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7cf550cf9e..31248b14a1 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -48,12 +48,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x82000000\0" \ + "fdt_addr_r=0x82100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ - "ramdisk_addr_r=0x82100000\0" \ + "ramdisk_addr_r=0x82200000\0" \ "scriptaddr=0x87000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 803c9be064..fecea95d32 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -128,12 +128,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ From patchwork Wed Apr 17 23:57:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087316 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzp55zBfz9s47 for ; Thu, 18 Apr 2019 10:03:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9191CC21C27; Wed, 17 Apr 2019 23:59:11 +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 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 1A90DC21C6A; Wed, 17 Apr 2019 23:58:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5D42AC21DFB; Wed, 17 Apr 2019 23:57:56 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 5E685C21DB3 for ; Wed, 17 Apr 2019 23:57:52 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MFrWa-1h20S22zLy-00Es1T; Thu, 18 Apr 2019 01:57:49 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:23 +0200 Message-Id: <20190417235732.13643-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MUITfOonJ3h3pY1FrtVYvgCp5MfQpsUSqEkn+k9INrltdA8/aKc eYCDDjwyJizqdS5A5UxCBMhbffXYLjYdgWBzoCUxBJjYtQ3Hw08LOrs3VPHdW6hVmKKrQN6 bR3c9zdEPoEmGuuvPK4KBdsRGP17oLcP7mSI4f1FVfU7EDdXMPEVqBgeoZBDYEyTHobQhPr SXV+N5Yiu4RFIKtLrBoyQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:qWfHdFGd8dA=:b964oQS3STp7kFtVOnHYfM 6j+vXBoUyv49aCnDYYDtZpnC2usQnw+xpssZI+CZ27y/klrDyNfyVGzYHkBvp+JA07uy2afaw J5/XiJHtT6kWFC1FWx0zKYcGwmbvun2IhUL5eS8rovVcBeC9dgNOohk66v9Jv5cwYferdsXEb af4BWZ9tvCL0joDdXmXSuY7PdqvjWovrVjtjSu35EbYB1bcAfDun4gbpfepvbuEyxVetJ6Swh 4UhnCgSls+i9x7f8YoEV2ElEQUSJb6Q2Xv45UkbTniGlA4XsW0/BWBSV3JdAuDAEiGyCf6Bus cKT6r0fhb1xorJ5njczDP/ClFn7qZaKWU4Pmml/V6W0CcG0RmbRO/9WDLtl0Q+055HFNRj1Xc 7Yv6OgpwQ0HlTBexyiDShkX0D0PBqef+ZnOMjmwqeG6FPddL3enZYadVzJ8kF0CUbNJz9nKx0 U/I36xlGI2z6wRanHYDxYT49Y/3tklfWIhPo0IrAYKIsWM2XYmfC6iY8kutYs0FMmPWl6Hl35 GK9WygnO9PX+IdqL+xiYbCXvFudztujGNJNVBR3eiUJpqw4eCscn8HpHTLJ7+qfOp+nw+IU4E x7MlCf71E79LO500J4OP99loN8uxXZMCQbR8egNqCS24Hm14S/PCREoMF8BG/htf3nM3Ip2o5 oBI0EZvX7zh2NxmENWNamfWDzDIyDpzmflEU2nxUIfZKZ8AutmBBOyejqA+VELRkh51LxRAfQ xUEMnfc+EhIeejg4bnR3fWTYPL6vA2hJIxaiAg== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner , Max Krummenacher Subject: [U-Boot] [PATCH v3 05/14] colibri-imx6ull: fix ethernet phy power on 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" From: Marcel Ziswiler Just give the new Ethernet PHY power save mode circuitry time to settle. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by tag. board/toradex/colibri-imx6ull/colibri-imx6ull.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index fe60b8e870..b6f45edb86 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -263,6 +263,9 @@ static int setup_fec(void) IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK, IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK); + /* give new Ethernet PHY power save mode circuitry time to settle */ + mdelay(300); + return 0; } From patchwork Wed Apr 17 23:57:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087315 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzp36Gvfz9s00 for ; Thu, 18 Apr 2019 10:03:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7C8D0C21E34; Wed, 17 Apr 2019 23:58:43 +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 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 EEA34C21E16; Wed, 17 Apr 2019 23:58:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30E5CC21DAF; Wed, 17 Apr 2019 23:57:58 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 9DD9FC21DF9 for ; Wed, 17 Apr 2019 23:57:54 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M5fUk-1gx1423CeG-00xfDx; Thu, 18 Apr 2019 01:57:51 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:24 +0200 Message-Id: <20190417235732.13643-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:QQttT9nqnlWKiG6CErZ3gBDK9OzRQTXWHi/7RVSQc7OzkJHTQcB qJpnKWFkY6671A+kXziqp01rwIPbC22zoDwv/+1O0E1F3fC7TxyS6+2s3tsdalXDcZoUbV4 kBhxyyARPwhJvEBKnxJipA/z9YCmHFv4ndLQbHT+4FGYoOyIL3K8efiLHIf1N+qaFvpfJHF TFEqsv13fyBf+DspZNKhA== X-UI-Out-Filterresults: notjunk:1; V03:K0:nL7Qr6Ou2pU=:0sBLtReCVOy6Jvo2t7vLNM QMeN983h04A5Im4dBcvTWn2dqn8rEEYArDZ+M2cOxKiidkXH/GQeYALy9CSts/EnOJjONL0vh /yy7+SvfIwfS/adnOZPFN5dqJLRi9zUQvSk7jf1BWYT2CT/XIlXZcYHQnvzfPhVRu9Yeqh81L /bqjpdE7SusC7vQr8NtL9r3la6WDhYZC/flvgz1dBpI/Oaq7ohD7PRrx2+Y7OAawfj2si3if2 GOmoWFo4qCh7ntZaONgVNVhLQgg41QdQ8muIRWvzi0zRbL1UKclLehCYasAR+Lr1tok4JxPYr yjo0a3Uk09HuLO/Wv0uUNihOAQSltCEaAj8Modgc4308edvfhRTR4IiYGmqB2cbXDyFZDvUA+ Zv62bldfXyqko36KwAmrhl7f5Lj1jNnPoElBM8M+387EZyWw50WihJYSpTw/wqLY7Bm+DBU4b cyiWCbffjQAAf+3t6NDib5Eok/swpUsZpinmesWRzKgseRGuziV9fbS2Wo1S0SphIQ0T8vk9t 8mwYR5EAnXPzJqj8+SBg/GMfngZ0vmyOUBycaY0Bh/ZyBm+mpOoi3JeSFV3fkCe6jYtfKD5Fs E1MrJ5S/f+XDVNVQ4jUjgGE2GCX0FItUe8r0Ubg23kfQqysra062nNfYx81802dE0Lx9Au9WX WTw0Mj0w8B0aLmsECsqXiKgH3NsD5Li4yi3tITQK/aiGBbjXIoaYGnBoqGdtXz3pKQK23f+ha fGKBQafTBkPqyIgSRdV1J60oRmUds+UJphDIIg== Cc: Marcel Ziswiler , Philippe Schenker , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v3 06/14] board: imx6ull: Add disable PMIC_STBY_REQ 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" From: Philippe Schenker Disable output driver of PAD CCM_PMIC_STBY_REQ. This prevents the SOC to request for a lower voltage during sleep. This is necessary because the voltage is changing too slow for the SOC to wake up properly. Signed-off-by: Philippe Schenker Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. board/toradex/colibri-imx6ull/colibri-imx6ull.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index b6f45edb86..f1d5cc6655 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -50,6 +50,8 @@ DECLARE_GLOBAL_DATA_PTR; #define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_DSE_48ohm) +#define MX6_PAD_SNVS_PMIC_STBY_REQ_ADDR 0x2290040 + #define NAND_PAD_CTRL (PAD_CTL_DSE_48ohm | PAD_CTL_SRE_SLOW | PAD_CTL_HYS) #define NAND_PAD_READY0_CTRL (PAD_CTL_DSE_48ohm | PAD_CTL_PUS_22K_UP) @@ -331,6 +333,14 @@ int board_late_init(void) env_set("variant", "-wifi"); #endif + /* + * Disable output driver of PAD CCM_PMIC_STBY_REQ. This prevents the + * SOC to request for a lower voltage during sleep. This is necessary + * because the voltage is changing too slow for the SOC to wake up + * properly. + */ + __raw_writel(0x8080, MX6_PAD_SNVS_PMIC_STBY_REQ_ADDR); + #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); #endif From patchwork Wed Apr 17 23:57:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087313 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzn22ldpz9s47 for ; Thu, 18 Apr 2019 10:02:14 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 30BF6C21DF9; Thu, 18 Apr 2019 00:00:19 +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.8 required=5.0 tests=SPF_HELO_PASS, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E2D10C21E34; Wed, 17 Apr 2019 23:59:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F00DCC21E30; Wed, 17 Apr 2019 23:58:05 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id E4A51C21DB3 for ; Wed, 17 Apr 2019 23:58:01 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MbyuO-1hWvQ61fdu-00JM83; Thu, 18 Apr 2019 01:57:53 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:25 +0200 Message-Id: <20190417235732.13643-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+3Wvdiq6M44NjL0b8aKOXzQu9++P1C8UMqo/7VcxB3QXM7B0Vjo sEXLY2ruhPmVxqnSpNIGmySYkj2RenwsHw1jK3LQ+ubiBjoK2QxN9mzzCs2Ya4358sbkSVI irhxzrfzYT0I5gJz11Rwp8c1jwtTaLFSBjsPUgrglCEweTdIUMovpG4bgZyxuCOQy3rjFtn t06CDm8xDsn1WQ/FTw30A== X-UI-Out-Filterresults: notjunk:1; V03:K0:fgpGMU5zuWQ=:x7pak7DdAHvU9osX4QrihQ 8A6idzHz4hiFvg88ihZpqfkfPNhdaLkwYQttr5ui7DEi9AD4u3W8eVES9cMQljxkl2TGL1TVo EJx//hGwCk4gF/DdcoT+nLNZSv+FHEu9dmYymn5CX2oNX77tCEFIWiwkxLvg6O7dy8rZ3JeiK 9tHozuAtuGPR7yXgMEnf2GS3a3jNYrdhutoYZkaCFQabuQDFTQ9eWlDeFGOHvcuHr6r+PIjZl hMIF2hbiLJHlP8s2RVJ/zMfKwDbzBR3onbag1649JQzi8qi2KztE1NcNgqHc2UKinB2VmuODQ +ta7agbCxnKcLHqeL0gu9E+d5YXrLcz0H5XZviGOA+A2aWb8R3TxT3AJ9CxDyPbykSkVUS6s6 V0SrP7yeVDtvRavPpbxc6qEkipePaEmvDm0tkhtQsaPxl/d6zbImsCT6AmSNmH4hCYFe30mGG i5qk3t0TglFYVWxjzbjYHUJHufQCdCO/YLEE+gEezinxW9tnb7NlUNWlRKA4PF4fcDuY9CjM1 SeG0B99iD0vpIC4GiloHRrJb1NrVL/SdQEA/Khqs7Ae+5NvSPVMz9DiZC2VC4k4mVxov6yJGJ 6J0IeGFlPiFPZ6k2oAu4E0bp+6a4q302LbIG1/zOYwZw+8a2PllhBbSR3hEr78oWnwW4fO+e8 lWLoDNpKqJlOd1wO1gGFtfIRqwFvzXCIDbhsiomKiTvRJshXc7kBvSBuNBmj8Fs2IvSXO/v/I EDo1yDhNBwhJeplI7SF8lUoY1ff5HjeEt+I5pw== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v3 07/14] colibri-imx6ull: configuration clean-up 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" From: Marcel Ziswiler Drop disabling SPL_SYS_THUMB_BUILD as we anyway do not use SPL. Enbale CRC32 verify, USB SDP and EFI loader support. Drop CMD_GPT and disabling RANDOM_UUID. Do savedefconfig which drops USB_FUNCTION_SDP. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. configs/colibri-imx6ull_defconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index dfe6ec1ce7..b19b3b7fb2 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y -# CONFIG_SPL_SYS_THUMB_BUILD is not set CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_COLIBRI_IMX6ULL=y @@ -18,19 +17,20 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="Colibri iMX6ULL # " +# CONFIG_CMD_ELF is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_ASKENV=y +CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -# CONFIG_RANDOM_UUID is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TORTURE=y CONFIG_CMD_USB=y +CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y @@ -73,8 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_FUNCTION_SDP=y CONFIG_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -# CONFIG_EFI_LOADER is not set From patchwork Wed Apr 17 23:57:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087318 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzpy1jyGz9s00 for ; Thu, 18 Apr 2019 10:03:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E10D5C21DF9; Thu, 18 Apr 2019 00:00:32 +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.8 required=5.0 tests=SPF_HELO_PASS, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BBFD9C21DDC; Wed, 17 Apr 2019 23:59:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 41A90C21E18; Wed, 17 Apr 2019 23:58:02 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 08700C21DED for ; Wed, 17 Apr 2019 23:57:57 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MG8VV-1h1jMb0bF1-00F98c; Thu, 18 Apr 2019 01:57:54 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:26 +0200 Message-Id: <20190417235732.13643-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZIlcQgZVrKj6kR91LKa9S3/KvWgEQbzguAS6fwLMvMMbhIrg3ZA Ksr3U5yxeSKfGEoUx16DNHo23ei3eCtXPA2mNH/Itze77hJPIMnDNEgXNwWmbRIxMCmKAdd TSJZOC2QVs9GK4z2/qs7P5Ityxcc474U3fEUrjL1Eg/0FYPxNwg7AfxFqgrZUqkcf2UONbn Y4/t0+LpP6929jAoiSv0A== X-UI-Out-Filterresults: notjunk:1; V03:K0:qSJBysLjLyY=:JJqOD4TpTqGvD93HCIAY5p ZenUQbaIN9sN7uKKi3RR5gza/W28/9RyuJAAWrES3SDKDQO3xZnY2WB3eYG8+nBR2kFG1LqpK 2t38kC8SiekTAqhaZC/Pk2hDAX3glG+tbWdjnWGIFjNa1+Jzu5vJIT0oJSn5/oub5YMt77arQ Wtj7MpsT4kZbKnS06Oqyasl4A9hSEz1dqF5w8SOBd/4pry2XGZ+F7p2y7aHMCVrnF1iT6fk7k //A9oIAAEAI1odXJUOC/5svjO3TBIrzSBI4HmOy12L2E9/l1KMm3znJSRoJHEwSpC3ajnu0xE tXdjHZw0yJm1G3VWA2Ek6yBgxbwMpgPpnEreyg2Ef1H5+7zp813K418FWFL7WC2yfw2MTy9I6 GmO2dF/Xifhzi6FWMrTfRY2s6K5puSJ1MXev5GrhfMeH6sNsma/f5L5BD7n6tchcB1ipLEWjg aaxTVHmzdmI8k74YTfAEb98BxOlbkZ32idp5MsnefujUXsDBox0BLNG5tVmYLGrQRuwO/McLI JAfhkLnHy32z331IX5M7LxhpCpf8SJ4bUpOP7QPcOqo3U3feqAKQwfbcwAV6+xBOpaxG3xhAU rE27p/JAmrVq80nzPEhyun+Q42/F0PY3Qc0UUptOwwSkQ+D3ciQqpSnfHoGt8BxxdBFZdy45I 7ddNFY1q1nFQOT6zaZYHQ1AI3GKrEaf6qTGChATsAAWjQGT2VcQXWbkxEQgordHT3crYtt64a rs8Q9FyHRTNfLyrEyR4OtGoWNOvNOmn02eICjg== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v3 08/14] colibri-imx6ull: migrate pinctrl and regulators to dtb/dm 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" From: Marcel Ziswiler Migrate pinctrl and regulators to device tree resp. driver model: Ethernet, NAND and UART. Drop BOARD_EARLY_INIT_F as it is anyway no longer used. Enable CMD_DM, CMD_MTD, CMD_REGULATOR and DM_REGULATOR_FIXED. While at it also update copyright period. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. .../toradex/colibri-imx6ull/colibri-imx6ull.c | 82 ++----------------- configs/colibri-imx6ull_defconfig | 5 +- 2 files changed, 10 insertions(+), 77 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index f1d5cc6655..8493b1dfdd 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2018 Toradex AG + * Copyright (C) 2018-2019 Toradex AG */ #include + #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -28,25 +28,16 @@ #include #include #include + #include "../common/tdx-common.h" #include "../common/tdx-cfg-block.h" DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - #define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_40ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_40ohm) - -#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_DSE_48ohm) - #define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_DSE_48ohm) @@ -65,13 +56,6 @@ int dram_init(void) return 0; } -static iomux_v3_cfg_t const uart1_pads[] = { - MX6_PAD_UART1_TX_DATA__UART1_DTE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_UART1_RX_DATA__UART1_DTE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_UART1_RTS_B__UART1_DTE_CTS | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_UART1_CTS_B__UART1_DTE_RTS | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - #ifdef CONFIG_FSL_ESDHC static iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -90,31 +74,12 @@ static iomux_v3_cfg_t const usb_cdet_pads[] = { }; #ifdef CONFIG_NAND_MXS -static iomux_v3_cfg_t const gpmi_pads[] = { - MX6_PAD_NAND_DATA00__RAWNAND_DATA00 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA01__RAWNAND_DATA01 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA02__RAWNAND_DATA02 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA03__RAWNAND_DATA03 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA04__RAWNAND_DATA04 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA05__RAWNAND_DATA05 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA06__RAWNAND_DATA06 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_DATA07__RAWNAND_DATA07 | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_CLE__RAWNAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_ALE__RAWNAND_ALE | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_RE_B__RAWNAND_RE_B | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_WE_B__RAWNAND_WE_B | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_CE0_B__RAWNAND_CE0_B | MUX_PAD_CTRL(NAND_PAD_CTRL), - MX6_PAD_NAND_READY_B__RAWNAND_READY_B | MUX_PAD_CTRL(NAND_PAD_READY0_CTRL), -}; - static void setup_gpmi_nand(void) { - imx_iomux_v3_setup_multiple_pads(gpmi_pads, ARRAY_SIZE(gpmi_pads)); - setup_gpmi_io_clk((3 << MXC_CCM_CSCDR1_BCH_PODF_OFFSET) | (3 << MXC_CCM_CSCDR1_GPMI_PODF_OFFSET)); } -#endif +#endif /* CONFIG_NAND_MXS */ #ifdef CONFIG_VIDEO_MXS static iomux_v3_cfg_t const lcd_pads[] = { @@ -170,31 +135,6 @@ static int setup_lcd(void) } #endif -#ifdef CONFIG_FEC_MXC -static iomux_v3_cfg_t const fec2_pads[] = { - MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 | MUX_PAD_CTRL(ENET_PAD_CTRL) | MUX_MODE_SION, - MX6_PAD_GPIO1_IO06__ENET2_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII), - MX6_PAD_GPIO1_IO07__ENET2_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII), - MX6_PAD_ENET2_RX_DATA0__ENET2_RDATA00 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL), - MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL), - MX6_PAD_ENET2_RX_ER__ENET2_RX_ER | MUX_PAD_CTRL(ENET_RX_PAD_CTRL), - MX6_PAD_ENET2_RX_EN__ENET2_RX_EN | MUX_PAD_CTRL(ENET_RX_PAD_CTRL), - MX6_PAD_ENET2_TX_DATA0__ENET2_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_ENET2_TX_DATA1__ENET2_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_ENET2_TX_EN__ENET2_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), -}; - -static void setup_iomux_fec(void) -{ - imx_iomux_v3_setup_multiple_pads(fec2_pads, ARRAY_SIZE(fec2_pads)); -} -#endif - -static void setup_iomux_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); -} - #ifdef CONFIG_FSL_ESDHC #define USDHC1_CD_GPIO IMX_GPIO_NR(5, 0) @@ -247,20 +187,17 @@ int board_mmc_init(bd_t *bis) #endif #ifdef CONFIG_FEC_MXC - static int setup_fec(void) { struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; int ret; - setup_iomux_fec(); - /* provide the PHY clock from the i.MX 6 */ ret = enable_fec_anatop_clock(1, ENET_50MHZ); if (ret) return ret; - /* Use 50M anatop REF_CLK and output it on the ENET2_TX_CLK */ + /* Use 50M anatop REF_CLK and output it on ENET2_TX_CLK */ clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK, IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK); @@ -277,14 +214,7 @@ int board_phy_config(struct phy_device *phydev) phydev->drv->config(phydev); return 0; } -#endif - -int board_early_init_f(void) -{ - setup_iomux_uart(); - - return 0; -} +#endif /* CONFIG_FEC_MXC */ int board_init(void) { diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index b19b3b7fb2..ce2c09338d 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -15,7 +15,6 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="Colibri iMX6ULL # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_IMI is not set @@ -24,9 +23,11 @@ CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y +CONFIG_CMD_DM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TORTURE=y CONFIG_CMD_USB=y @@ -34,6 +35,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +CONFIG_CMD_REGULATOR=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx6ull-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)" @@ -63,6 +65,7 @@ CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y # CONFIG_SPL_SERIAL_PRESENT is not set CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y From patchwork Wed Apr 17 23:57:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087317 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzpd0lJnz9s00 for ; Thu, 18 Apr 2019 10:03:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BC3EEC21E1D; Wed, 17 Apr 2019 23:59:38 +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 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 D0570C21E2C; Wed, 17 Apr 2019 23:58:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D7D49C21E07; Wed, 17 Apr 2019 23:58:05 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 2F2BCC21E2F for ; Wed, 17 Apr 2019 23:58:02 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LloEI-1ghZcS0miO-00ZN4v; Thu, 18 Apr 2019 01:57:56 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:27 +0200 Message-Id: <20190417235732.13643-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:RkyDT80M+HX6xIZtYwQkR6S0VtA5iA85x76sHMYGTQHwfLrTL+h zzMNykXEZnbuHEeXoVk+yCHH+ScNI2YHZsf22PaZ961KFOxnM9QTayQ9nfFs/H3miiXOWyt f+i5pnhTnVJRhS/W6spbo0qD5/WcqYBh+u3r5T3RKJsycDlXgbiYx7o67Gl7xnGX9ee5TAa 6NdxyfGp9Y6uWnFxcgGRg== X-UI-Out-Filterresults: notjunk:1; V03:K0:wBijcz9syH4=:30ZlnhLny9/V+dZAZHZ2X4 JvRSwqC5nDN4T/pXvaxBx0orPeRfE42Sl9IN5g9yFxJhoCZcwzQyjKaAjUnIp9LtEAoXyBmJh 1OgYVb+/WrgPJKFdCmdWZBC41fcAQilfPg6zmgii9KdpgP2fsftdfc+7p9xC1FqJiy5g30YK1 5Ziwzxwq5eWRfMwqwnLiV3crBfpx2u7RsmAAtQDWz1VzY+nmeWzEKdYoy4vCfHgesuD8VYti2 biny7Xi8MLpjT2CVVG5hP444mRoi56BblAWkDDybP9N1hJL5dZqsH102CWxVS38XtBkKnNNYc JdDdJlay9olkhc/paAcZO3hW+V9eThExeHdD1DEXmIdTbDPv1T7Lrn9+e9hh4kwQoMefqpzGH 9ErYXIpVNUtYOTvIJ4qWk+H16VynyPEzoqBALqXDlLNwgyMsS/Qs8XCt0RNcdZ6ZIew+ZxQpd BJFJSIIFJOcfzmdv5U4OsHr3zWzEDviN+L7FcYm15L3tpoXL8rd19ivC2TlL5TpXEOpz/+wCh wUeOSDyRojdc4krdeV0cMDUuSW2V9bODskdU30SrUGoD2U4TfpXFPKs/X0l15cC+ozfA3r2i/ E+UieM9b8KsNxOZnbmHSuCAfyRQz7Ep665MFPK6yLMPaNbQQVQmj/qRH+aU5VoDNBpAPo6YoY UcTfQxMSVhZBc3RzQ7O2DQ47gTF0rDPmR8OZLf3h7rzKKnTPT6+EA2MW6MZPd7IpQqWGnv8DP 9CmCck6cvaqPZ+fAXEfBdi3s9YdKZM9IBMwnBA== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v3 09/14] colibri-imx6ull: migrate mmc to using driver model 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" From: Marcel Ziswiler Migrate MMC to using driver model. Migrate USDHC to using pinctrl. While at it also add GPIO1_IO03__OSC32K_32K_OUT pin muxing. While at it also update copyright period. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 15 +++- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 70 ------------------- configs/colibri-imx6ull_defconfig | 1 + include/configs/colibri-imx6ull.h | 6 +- 4 files changed, 17 insertions(+), 75 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 95c67be438..0d416ebd10 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright 2018 Toradex AG + * Copyright 2018-2019 Toradex AG */ /dts-v1/; @@ -11,6 +11,10 @@ model = "Toradex Colibri iMX6ULL"; compatible = "toradex,imx6ull-colibri", "fsl,imx6ull"; + aliases { + mmc0 = &usdhc1; + }; + chosen { stdout-path = &uart1; }; @@ -190,10 +194,18 @@ dr_mode = "host"; }; +/* Colibri MMC */ &usdhc1 { assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>; assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; /* MMC_CD */ + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz>; + vmmc-supply = <®_sd1_vmmc>; + status = "okay"; }; &iomuxc { @@ -547,4 +559,3 @@ >; }; }; - diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 8493b1dfdd..c9af44e30e 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -18,11 +18,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -34,10 +32,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ - PAD_CTL_SPEED_LOW | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - #define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_DSE_48ohm) @@ -56,19 +50,6 @@ int dram_init(void) return 0; } -#ifdef CONFIG_FSL_ESDHC -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), - MX6_PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - - MX6_PAD_SNVS_TAMPER0__GPIO5_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; -#endif - static iomux_v3_cfg_t const usb_cdet_pads[] = { MX6_PAD_SNVS_TAMPER2__GPIO5_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), }; @@ -135,57 +116,6 @@ static int setup_lcd(void) } #endif -#ifdef CONFIG_FSL_ESDHC - -#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 0) - -static struct fsl_esdhc_cfg usdhc_cfg[] = { - {USDHC1_BASE_ADDR, 0, 4}, -}; - -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 USDHC1_BASE_ADDR: - ret = !gpio_get_value(USDHC1_CD_GPIO); - break; - } - - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - - /* USDHC1 is mmc0 */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - imx_iomux_v3_setup_multiple_pads(usdhc1_pads, - ARRAY_SIZE(usdhc1_pads)); - gpio_request(USDHC1_CD_GPIO, "usdhc1_cd"); - gpio_direction_input(USDHC1_CD_GPIO); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_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) - return ret; - } - - return 0; -} -#endif - #ifdef CONFIG_FEC_MXC static int setup_fec(void) { diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index ce2c09338d..69305323f2 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -50,6 +50,7 @@ CONFIG_DFU_NAND=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_NAND=y diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 31248b14a1..7a7a70e457 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 Toradex AG + * Copyright 2018-2019 Toradex AG * * Configuration settings for the Colibri iMX6ULL module. * @@ -30,7 +30,7 @@ /* ENET1 */ #define IMX_FEC_BASE ENET2_BASE_ADDR -/* MMC Config*/ +/* MMC Config */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 @@ -182,4 +182,4 @@ #define CONFIG_VIDEO_BMP_LOGO #endif -#endif +#endif /* __COLIBRI_IMX6ULL_CONFIG_H */ From patchwork Wed Apr 17 23:57:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087320 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzrK0RnFz9s00 for ; Thu, 18 Apr 2019 10:05:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AD80EC21DDC; Wed, 17 Apr 2019 23:59:51 +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 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 8B6C4C21E1A; Wed, 17 Apr 2019 23:58:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 605C6C21DF8; Wed, 17 Apr 2019 23:58:07 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 7304AC21DF8 for ; Wed, 17 Apr 2019 23:58:03 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lkhla-1ggT9m0Zb2-00aTXV; Thu, 18 Apr 2019 01:57:58 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:28 +0200 Message-Id: <20190417235732.13643-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:mzIDPpJtHVMU/W65wFkBEzRKoTjIAR0szjX6hvGx7YpgzJ+n7mp qDPXVMfv+UxB6kUEP2zvI2t/EXzVlZ26Fhl+fhNcr+JtAQXgHldSGSrK0GP+lCQcCCf/EaQ vAmGf7j2uvXO9l5R4S8XjCXC8DsDXXQkfo+19cXlj+W/EoKxXrX0UdunVMk1uVKbxJy5gI7 oHiZjsCn9qFOaPAApWJ6Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:ssfzW5TQ3+w=:JelUTbXFFlFWzoCOr5Wg9K Dav5yLM5k+YZ+N51ELzrkeQp0+nOFSnrxPKDJC/msSRR16F7fX64bJNDPWj5gVyJBSF8YR+r3 VS0CaoM/R89iglr3IV41RE1dJUCPeUVp1WIuIWQqte5XL80aDSD83yplpsHWprYScNLVW396x /5AYL08RY5L1O2dGJLiGOpymEsutsv9Hfx9/E0S4t4soxIQl+R+DDrWdK+TAuYMUdkOVGULdF 8tEy7UAFOf6xvQ4sbAcZIGbSdSlYSe6P8TefXh7vZ/xLFT+r8zYjNqZHhMFVSEk65h8Iw8IU/ UaL/T+xbrXfNJ50quW0xMnBjq6DewXkXAA71VZRyn0xvxLyOnpOFtTK6BER8x7/1Y0ngG/Vsm pcn0mhqh8flqb2HZwqLV/W27C6I2bsGfNdM2lASUml3Ol00c22+p7NL5iiWUAV1PbJKDfL6i4 y9LPN9XZhwsKHgsqBbK4fihGqN8K25WTFr3bLh7koki54MuBRbjzVplqt16dnYWBxBtxpWQ/5 RC/eYGgjc88yOo6UZIqROYNo3bAzLCRhMAq9qb3oiHepewXo88d10UyrDGPHXFkdnPQkT3EMr Biw46PEpEWLh7dsiaup2Zo6Sgx2FmLydegLEcI7iCbieRX/vee6k0BS1FRWuMvBPJIHA9w+8E cD8+ze5zFAT5ZnxXE3IM1bObSAm+Mt7ta1sPIyC+AyyZ4LOu540G02CrxaW3HyBpPHyBt1pE+ oWkLmHuKnuevF3AjqoEvokNuRwZoNEt5twUhAA== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v3 10/14] colibri-imx6ull: migrate usb to using driver model 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" From: Marcel Ziswiler Migrate USB to using driver model. Add USBH_PEN GPIO regulator. While at it also add alias e.g. as required for UMS. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: - Fixed issue with host mode as pointed out by Igor. Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 26 +++++++++- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 48 ------------------- configs/colibri-imx6ull_defconfig | 1 + 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 0d416ebd10..42ae70deff 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -13,6 +13,7 @@ aliases { mmc0 = &usdhc1; + usb0 = &usbotg1; /* required for ums */ }; chosen { @@ -35,6 +36,13 @@ regulator-max-microvolt = <3300000>; }; + reg_5v0: regulator-5v0 { + compatible = "regulator-fixed"; + regulator-name = "5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + reg_sd1_vmmc: regulator-sd1-vmmc { compatible = "regulator-gpio"; gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>; @@ -47,6 +55,17 @@ states = <1800000 0x1 3300000 0x0>; vin-supply = <®_module_3v3>; }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh_reg>; + regulator-name = "VCC_USB[1-4]"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; /* USBH_PEN */ + vin-supply = <®_5v0>; + }; }; &adc1 { @@ -183,15 +202,20 @@ fsl,dte-mode; }; +/* Colibri USBC */ &usbotg1 { - dr_mode = "otg"; + dr_mode = "host"; srp-disable; hnp-disable; adp-disable; + status = "okay"; }; +/* Colibri USBH */ &usbotg2 { dr_mode = "host"; + vbus-supply = <®_usbh_vbus>; + status = "okay"; }; /* Colibri MMC */ diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index c9af44e30e..21addaf6ed 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include "../common/tdx-common.h" #include "../common/tdx-cfg-block.h" @@ -41,8 +39,6 @@ DECLARE_GLOBAL_DATA_PTR; #define NAND_PAD_READY0_CTRL (PAD_CTL_DSE_48ohm | PAD_CTL_PUS_22K_UP) -#define USB_CDET_GPIO IMX_GPIO_NR(7, 14) - int dram_init(void) { gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); @@ -50,10 +46,6 @@ int dram_init(void) return 0; } -static iomux_v3_cfg_t const usb_cdet_pads[] = { - MX6_PAD_SNVS_TAMPER2__GPIO5_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - #ifdef CONFIG_NAND_MXS static void setup_gpmi_nand(void) { @@ -163,11 +155,6 @@ int board_init(void) setup_lcd(); #endif -#ifdef CONFIG_USB_EHCI_MX6 - imx_iomux_v3_setup_multiple_pads(usb_cdet_pads, ARRAY_SIZE(usb_cdet_pads)); - gpio_request(USB_CDET_GPIO, "usb-cdet-gpio"); -#endif - return 0; } @@ -241,41 +228,6 @@ int ft_board_setup(void *blob, bd_t *bd) } #endif -#ifdef CONFIG_USB_EHCI_MX6 -static iomux_v3_cfg_t const usb_otg2_pads[] = { - MX6_PAD_GPIO1_IO02__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -int board_ehci_hcd_init(int port) -{ - switch (port) { - case 0: - break; - case 1: - imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, - ARRAY_SIZE(usb_otg2_pads)); - break; - default: - return -EINVAL; - } - return 0; -} - -int board_usb_phy_mode(int port) -{ - switch (port) { - case 0: - if (gpio_get_value(USB_CDET_GPIO)) - return USB_INIT_DEVICE; - else - return USB_INIT_HOST; - case 1: - default: - return USB_INIT_HOST; - } -} -#endif - static struct mxc_serial_platdata mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = 1, diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 69305323f2..0440b4ed94 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -71,6 +71,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 From patchwork Wed Apr 17 23:57:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087314 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kznW6xJdz9s47 for ; Thu, 18 Apr 2019 10:02:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 623E4C21DD4; Thu, 18 Apr 2019 00:00: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 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 436C5C21E16; Wed, 17 Apr 2019 23:58:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0077FC21E08; Wed, 17 Apr 2019 23:58:14 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id AFFD9C21DF3 for ; Wed, 17 Apr 2019 23:58:10 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LrLdC-1grUjk0lkC-0137Gb; Thu, 18 Apr 2019 01:58:00 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:29 +0200 Message-Id: <20190417235732.13643-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oQi58AnBa24ZYE5c6tEzu6DhBnmxjUvGU2qYgSUWT3lElCj0baK nt2IePoY4oE495txUK2uKb/yLIUWM7bgjR9vMRFQDL2vrF63NE16ywMFiRvBX4iOIiwTggD gPkKDzg6O6EQv0JITP0EeRSHrGdmDPeZfOZnRR/Xs8TnVxLBUH63uXmMFnBUtCScTrkN0fv 23tLPQdL3pCJPacpe5NIg== X-UI-Out-Filterresults: notjunk:1; V03:K0:Ce5AVTuvncM=:dLoWDzZgKQdc1wGBnhZ1cD wLE91Of9T8LLwk0E+uMEgueBSuk0VHBaJINYW/iHq7/nV/yqMLpd36HDNjYJ9lsRZ2axmaWW9 IQLiE5e2Jv5O1VnX2XJ7eR5Cgg6r5o0SjUsNEk8l7w/N3RCrhDEJZacRZKsMBzT5biYx89ABN +Uequ58mQQbr79kRZYbI4QpSOEWu6kJT6SCJurFvEInHbujarr+6oLKkAnIIZVnkbi0zHNzk7 rnESIuTYi9lYd1O9dIBW9KVZzbXeMr0LPuVL2M640Iu3KHoAuKr2ALdDRzGBRjc2GwabhvJa1 JQ2yzeaf320Wq+SCHYOU3wea1BLCrITJgPtIuiAhiTCPpdyDOumVI8pBtxb8ZYcIWSrkh82cW GyWPtj2o6GWT8sADdIXLT7JCrnFchcAnP10+ukMIzIziSOcaMLXUigdVfhZPRHtvT4Kljubn8 eq7PM1gPrXZxrJzhf2W2i0p2s9AcXTOLsg4TiA1M0tvtkTxGsvbOqZbjgjE21SerrqFG60hfy FGF76ORpkmK4elQUjhjkKQJ1pfQyFcc34BEeym99PRmPtXZtpsnonESRkp5L0UULiAOUt9XE3 5EW/Xuzt4guJxkRm4FrSccLNV1Zrlxqe8YQzE/6S/gQFhOsGgeP6DNpeg4KuBPRIK8WM5yJry 703CSRkMG2OP8Km3mVWLNIGkaUb+Av8YKseQNk5FQjSeZjZcxWcfyjbqaf68Wvh/jbf8vXuPU 8KfCk7aj1gbzJUo98Ox4akYsBoR/r/Lt1zDbkg== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v3 11/14] colibri-imx6ull: migrate fec to using driver model 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" From: Marcel Ziswiler Migrate Ethernet FEC to using driver model. Drop PHY_MICREL_KSZ90X1 which slipped in from Apalis iMX6. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 31 ++++++++++++++++--------------- configs/colibri-imx6ull_defconfig | 3 +-- include/configs/colibri-imx6ull.h | 4 ---- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 42ae70deff..adb10ac8ca 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -80,6 +80,7 @@ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; }; +/* Ethernet */ &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2>; @@ -233,6 +234,21 @@ }; &iomuxc { + pinctrl_enet2: enet2-grp { + fsl,pins = < + MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0 + MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0 + MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0 + MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0 + MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0 + MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0 + MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 + MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 + MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 + MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0 + >; + }; + pinctrl_gpio1: gpio1-grp { fsl,pins = < MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ @@ -295,21 +311,6 @@ >; }; - pinctrl_enet2: enet2-grp { - fsl,pins = < - MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0 - MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0 - MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0 - MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0 - MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0 - MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0 - MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 - MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 - MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 - MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0 - >; - }; - pinctrl_ecspi1_cs: ecspi1-cs-grp { fsl,pins = < MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0 diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 0440b4ed94..a24c87f321 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -58,9 +58,8 @@ CONFIG_NAND_MXS=y CONFIG_NAND_MXS_DT=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y -CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_MICREL=y -CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7a7a70e457..fc39e807b6 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -19,10 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) /* Network */ -#define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0 - #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 #define CONFIG_TFTP_TSIZE From patchwork Wed Apr 17 23:57:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087319 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzqB4Rx6z9s00 for ; Thu, 18 Apr 2019 10:04:06 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 35F0BC21DB3; Thu, 18 Apr 2019 00:00: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 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 A4E77C21E30; Wed, 17 Apr 2019 23:59:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 66E21C21DCA; Wed, 17 Apr 2019 23:58:12 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D0B62C21E02 for ; Wed, 17 Apr 2019 23:58:08 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MBknJ-1h69D32gZL-00AjII; Thu, 18 Apr 2019 01:58:03 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:30 +0200 Message-Id: <20190417235732.13643-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:U4jdsodoE6ZwF5/iVUou1YwBI4b6RJElJzV9bCxDVh7AjvDnQd0 leu8Oncd9BqCJdrBZHBdpjroEFjHYwSM1ubmK6EOJDxTsjkbhV42I2VNF1N7SJgig6eQf1Q 5ZM2mwTzhNCT5vDDDqgKltZOzgqM+hExoNIyiIk5OehC07s9D4xWPQBAlhPM09rqp/zVW3f 4idt8rHv01KG1W9imnKBw== X-UI-Out-Filterresults: notjunk:1; V03:K0:zxu1hUogtPg=:FIbHxCNj9/7Xz9pcRYLKsr bqvz3zpP9LSOSEXio7/ggbrA4HLSXF42n2b8jrNIEwsGMtvAoGQu+nxWIyiZvJry8fLDszHAW IshrrfhB1kwmFWIxtnf4YdGcqYXlo0Vf3v5v41bFHOX504bND2lM42XLWslIkn89amw6+P3Tv T1LJVlPSKGEGMAPlToXee6/Nzc+Jqd5RLEtMVb+s9idYQ9273W9yvK0pWCTSAS+N/lIXG2s3L dMMm15BF4o4WwqBtAWqRedkbXuBpNTodtZh7roV+6Kr5i4UNehNcQIpY3AGziiG4ZQRg8JqbJ pHf8hGrNSsZXQTCzm2eWZEhU4L6+7sSkzn3Hg3noFdYXb9xRGc6EUDNzgkx48uxe1heCCpuSb tB9Y9tzza2rDYSuwD/fQZOimLJGU7XAjJMZ+ZWFyQFSOQctk4ihKsbvMf91vI4ES9eIg+z7ZQ fVB1gpfFiqWwy67In7Gcq6vBDSOQRLn1v8nUbdsYfcfn010yLN56Uw+XvmoKB29Q9d5NsOgWN AtjgseGjAjCkF6x2LU0xANC/H8PRb1OOiZKInwgJVCp1hgESPO8vJgVOCqwXw7n6XfmxAViuA fS5G1LfS4qHoVCC0yzfaQnUucJb0SFh/L1jwZbfRV4P6c7hlK4ZDTWVzLdWtyRJXaB4cHnVWG v9BiKyinH9ftZl+SKd7qSfHhBTr+t0U06G8rgAVRlXD2CUVOTgrHaLUIvu5H3GksGHhSzziWy k8DxzUy7LfeVs8k//fbUaSRt0vO7yqGOPF3DeA== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v3 12/14] ARM: dts: colibri-imx6ull: fix uart-has-rtscts property 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" From: Marcel Ziswiler Remove vendor pre-fix fsl, from uart-has-rtscts property. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index adb10ac8ca..6a2a934dff 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -182,21 +182,24 @@ status = "disabled"; }; +/* Colibri UART_A */ &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>; - fsl,uart-has-rtscts; + uart-has-rtscts; fsl,dte-mode; status = "okay"; }; +/* Colibri UART_B */ &uart2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; - fsl,uart-has-rtscts; + uart-has-rtscts; fsl,dte-mode; }; +/* Colibri UART_C */ &uart5 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart5>; From patchwork Wed Apr 17 23:57:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087312 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzlx0flSz9s00 for ; Thu, 18 Apr 2019 10:01:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C89E7C21E13; Wed, 17 Apr 2019 23:59:24 +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 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 004DFC21C51; Wed, 17 Apr 2019 23:58:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1BAA6C21E08; Wed, 17 Apr 2019 23:58:20 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D9C99C21C27 for ; Wed, 17 Apr 2019 23:58:16 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LsAZt-1gqfel4BrD-013wLa; Thu, 18 Apr 2019 01:58:05 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:31 +0200 Message-Id: <20190417235732.13643-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:8B0kIBTPe7oFgLaLJv8BHyafVFSY0/nTpoocYmBG7D3yg80uQXZ IwCyBQ9DKg6tSyo2yxrDRFm6TSDyo2thHb2oQniQ/W/UyHzfgtG7OjlhLdwPjatb01pId0b qXLVSljrB98Z5lF2lgc5OdzSRYHq2bsy7EtfRFkdfQ23EA1Jn4XJ8JzduSEzFzcWhmFkctA o3szd5/1GOfDUd6taMYmw== X-UI-Out-Filterresults: notjunk:1; V03:K0:fXF0BALhCmw=:t3y/wBAXSzA/vbIYvLdpwR vuXgpiPJ9RMYMcYqiElW2EBhanDUWcdbcOgsDwr9Dqlw02sy3O2nR27577SMBYxssGG/gnnam SEqooRMPCFsWB30wiahd/7YJu7i+X/zF5XdzbrVFoza0ZD46uPSAntJ5gFzIXapLRyCI7YSTO Nxs9Kt9Cp/Q5pUrR8D7/PCFw2D6RnUXfK+7nktrRk52r/uxy2XGKwWdVV0liX5MRK0shR4iA8 y/ff1SEOk7B6Z3lhlGfOl8tUZba0AFAhqiTohWpL6kVL5Ka1IBXqY2WjDXFjk6pAvEmu62+vd BYIrhdfOidw9vi4bruz7EtbB131Dp3saFXK0ogeOcwjnTlUHi7kBo1GUUAGqmG/EO/fmj0ZxW AlGYLJ+pdWonCARzw6eZLQbVPEpNnfMXLDiZj3AAlNs3sEkQIqdB9Qyus3UhejBIn0FeBulsy +UysRuF7w1EbGBZOa/fLJa1ZqS6vMzy8z6HhxIttX6KRt2JB5vzo5FLLbGrS8cjmxGG7uPFxs z29FZL+FoNiPK6Y6uNc7I0msrcwxozlP4p+4yhF9Nei1k5pUlnX63y5i5TXfo8xTjEHAPe8tj 5lmVCD5azjqZ3RLHAngQx7cazn0uABDUnSZLi4IlS7PbuDvLOVyhOUg8lu93GpEaKu6OP6A1V evaAsLFPqCollKrLxMoJlFJ70Yn0oeIsFc8X8xHRvs/JVKEez3R39kIWfv8UuyF2fxVYaYFsE t8yImOwn+MpaNCF5qL0lpgrQUCuz8IOrhB8koA== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v3 13/14] ARM: dts: colibri-imx6ull: add osc32k_32k_out pinctrl 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" From: Marcel Ziswiler Add GPIO1_IO03__OSC32K_32K_OUT pin muxing. While at it also fix indentation of pinfunc header file. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 2 ++ arch/arm/dts/imx6ull-pinfunc.h | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 6a2a934dff..a827e9ceeb 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -524,6 +524,8 @@ MX6UL_PAD_CSI_DATA03__USDHC2_DATA3 0x17059 MX6UL_PAD_CSI_HSYNC__USDHC2_CMD 0x17059 MX6UL_PAD_CSI_VSYNC__USDHC2_CLK 0x17059 + + MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x14 >; }; }; diff --git a/arch/arm/dts/imx6ull-pinfunc.h b/arch/arm/dts/imx6ull-pinfunc.h index fca003680b..7770ed39f6 100644 --- a/arch/arm/dts/imx6ull-pinfunc.h +++ b/arch/arm/dts/imx6ull-pinfunc.h @@ -14,6 +14,8 @@ * The pin function ID is a tuple of * */ +#define MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x0068 0x02f4 0x0000 0x3 0x0 + #define MX6UL_PAD_ENET2_RX_DATA0__EPDC_SDDO08 0x00E4 0x0370 0x0000 0x9 0x0 #define MX6UL_PAD_ENET2_RX_DATA1__EPDC_SDDO09 0x00E8 0x0374 0x0000 0x9 0x0 #define MX6UL_PAD_ENET2_RX_EN__EPDC_SDDO10 0x00EC 0x0378 0x0000 0x9 0x0 @@ -41,17 +43,17 @@ #define MX6UL_PAD_LCD_DATA17__EPDC_GDSP 0x015C 0x03E8 0x0000 0x9 0x0 #define MX6UL_PAD_LCD_DATA21__EPDC_SDCE1 0x016C 0x03F8 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_MCLK__ESAI_TX3_RX2 0x01D4 0x0460 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_PIXCLK__ESAI_TX2_RX3 0x01D8 0x0464 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_VSYNC__ESAI_TX4_RX1 0x01DC 0x0468 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_HSYNC__ESAI_TX1 0x01E0 0x046C 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA00__ESAI_TX_HF_CLK 0x01E4 0x0470 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA01__ESAI_RX_HF_CLK 0x01E8 0x0474 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA02__ESAI_RX_FS 0x01EC 0x0478 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA03__ESAI_RX_CLK 0x01F0 0x047C 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA04__ESAI_TX_FS 0x01F4 0x0480 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA05__ESAI_TX_CLK 0x01F8 0x0484 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA06__ESAI_TX5_RX0 0x01FC 0x0488 0x0000 0x9 0x0 -#define MX6UL_PAD_CSI_DATA07__ESAI_T0 0x0200 0x048C 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_MCLK__ESAI_TX3_RX2 0x01D4 0x0460 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_PIXCLK__ESAI_TX2_RX3 0x01D8 0x0464 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_VSYNC__ESAI_TX4_RX1 0x01DC 0x0468 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_HSYNC__ESAI_TX1 0x01E0 0x046C 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA00__ESAI_TX_HF_CLK 0x01E4 0x0470 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA01__ESAI_RX_HF_CLK 0x01E8 0x0474 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA02__ESAI_RX_FS 0x01EC 0x0478 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA03__ESAI_RX_CLK 0x01F0 0x047C 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA04__ESAI_TX_FS 0x01F4 0x0480 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA05__ESAI_TX_CLK 0x01F8 0x0484 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA06__ESAI_TX5_RX0 0x01FC 0x0488 0x0000 0x9 0x0 +#define MX6UL_PAD_CSI_DATA07__ESAI_T0 0x0200 0x048C 0x0000 0x9 0x0 #endif /* __DTS_IMX6ULL_PINFUNC_H */ From patchwork Wed Apr 17 23:57:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087321 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=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzrY1QLXz9s00 for ; Thu, 18 Apr 2019 10:05:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E5741C21E30; Thu, 18 Apr 2019 00:02:21 +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 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 EF79BC21E15; Thu, 18 Apr 2019 00:02:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B5866C21DAF; Wed, 17 Apr 2019 23:58:22 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id DDD8DC21DF8 for ; Wed, 17 Apr 2019 23:58:18 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MWAYh-1hNF3f3ZKj-00XN0u; Thu, 18 Apr 2019 01:58:07 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:32 +0200 Message-Id: <20190417235732.13643-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:qjZQ6ABmkxrrqTeNhZwTlwPfFfsXNRCOnqfbI9Kth3qL+Rg50Ar h445M17MHTwPtjwvP2ECEQB0pigTSzhwIMZVZVUY1Qx45sSeNv+TzOjmiUNZ0lachbRu3Lz yO3mN+DCrfK47ccevFBFS8/aDsq52XwCbH/N6YMixFu4WCJtgNCqB9X40Q2DbBt/GilGX9e yqhze4WpodK0dQXXzJB7w== X-UI-Out-Filterresults: notjunk:1; V03:K0:SxztrvA8VhE=:WRuP4WlkMmHC7I30N/nEdK trNUJoNooTMa5Y0sshkgH/UVTnI0edyDmBf1sUSwdB1qkCrK/rimOr01M5gagdJUj9NhtcQGw a0ipjXBoD8y/4rj5eqv/x36QhpPB9+IWn6OzX54MvfjXlUjVyJbChR03oLQrvKoCgmfZTEJcj NTgvRLyQoStpfx7JjSTZDB75yBIh4AYg9ZxP9OCYvJik2ipxaYHVtN9MP6ezypdRJOzj+41F9 Pgklw5TLSUgyDCYQ4Y9EMmMlMo5XYy49Pt8PrxsigSwfPB+YXj1O7O9oZ28Rh9205mLoTBa43 AM7uj+7mVgwG7otpvWH5Kix5J4XFpvNHTF+esq7QH3arR0b2xNVjysbSQAfpOo2SS9Ch+4XLQ +F6CaCMWoGXcWwGM8ca+iiZl4nkOukrMOpIqRW/zvP2r8L64ciipIbeaXNdipz2Y2cKCE47ei fhlYMg85HlOWrlAxM3YQ43vRID3hR1tIT/x2e/DcKlVqPXtowvmRmEzxWR1zM7CP3wCcNedOJ smCvn0IxkjbjcnKTyWS94v0T+poJb3Aoy+zwfFzJqpRgyd3l0+2eGDcVifItk+COKRkkbneOa 00p67gS3FI3EpvOERVRom+ck/75UxOi8C1Nt2l++19fsDq2eQN75F5/OdR1QmYEXqTGe4wmSn 0hJPnMDseM1NPOqPivHC+6TXFZHlj7yDIZwhHWRFHZDL7WqcP2E6872S0LvUv3e7DR0RrDTqM vuZYz7jh9C4vlzJWqm7knDQc8SgvFURAOGV8gQ== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v3 14/14] ARM: dts: colibri-imx6ull: update device tree 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" From: Marcel Ziswiler Fix compatible node to use regular Toradex notation. Annotate device tree with standard Colibri pin muxing comments. Use open-drain I2C pin muxings. Alphabetically re-order iomuxc nodes. Rename snvs-ad7879-int-grp touch interrupt node as per Linux device tree. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 91 ++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 39 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index a827e9ceeb..6c847ab792 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -9,7 +9,7 @@ / { model = "Toradex Colibri iMX6ULL"; - compatible = "toradex,imx6ull-colibri", "fsl,imx6ull"; + compatible = "toradex,colibri-imx6ull", "fsl,imx6ull"; aliases { mmc0 = &usdhc1; @@ -100,6 +100,7 @@ }; }; +/* NAND */ &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; @@ -110,21 +111,28 @@ status = "okay"; }; +/* + * I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) + */ &i2c1 { pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1>; pinctrl-1 = <&pinctrl_i2c1_gpio>; - sda-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; - scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; + sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; }; +/* + * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and + * touch screen controller + */ &i2c2 { pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; pinctrl-1 = <&pinctrl_i2c2_gpio>; - sda-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; - scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; + sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; ad7879@2c { @@ -150,24 +158,28 @@ &pinctrl_lcdif_ctrl>; }; +/* PWM */ &pwm4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm4>; #pwm-cells = <3>; }; +/* PWM */ &pwm5 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm5>; #pwm-cells = <3>; }; +/* PWM */ &pwm6 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm6>; #pwm-cells = <3>; }; +/* PWM */ &pwm7 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm7>; @@ -237,6 +249,13 @@ }; &iomuxc { + pinctrl_can_int: canint-grp { + fsl,pins = < + /* SODIMM 73 */ + MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0X14 + >; + }; + pinctrl_enet2: enet2-grp { fsl,pins = < MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0 @@ -252,6 +271,33 @@ >; }; + pinctrl_ecspi1_cs: ecspi1-cs-grp { + fsl,pins = < + MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0 + >; + }; + + pinctrl_ecspi1: ecspi1-grp { + fsl,pins = < + MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x000a0 + MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x000a0 + MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x100a0 + >; + }; + + pinctrl_flexcan2: flexcan2-grp { + fsl,pins = < + MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020 + MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX 0x1b020 + >; + }; + + pinctrl_gpio_bl_on: gpio-bl-on-grp { + fsl,pins = < + MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x000a0 + >; + }; + pinctrl_gpio1: gpio1-grp { fsl,pins = < MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ @@ -308,39 +354,6 @@ >; }; - pinctrl_can_int: canint-grp { - fsl,pins = < - MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0X14 /* SODIMM 73 */ - >; - }; - - pinctrl_ecspi1_cs: ecspi1-cs-grp { - fsl,pins = < - MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0 - >; - }; - - pinctrl_ecspi1: ecspi1-grp { - fsl,pins = < - MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x000a0 - MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x000a0 - MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x100a0 - >; - }; - - pinctrl_flexcan2: flexcan2-grp { - fsl,pins = < - MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020 - MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX 0x1b020 - >; - }; - - pinctrl_gpio_bl_on: gpio-bl-on-grp { - fsl,pins = < - MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x000a0 - >; - }; - pinctrl_gpmi_nand: gpmi-nand-grp { fsl,pins = < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 @@ -553,7 +566,7 @@ >; }; - pinctrl_snvs_ad7879_int: snvs-ad7879-int { /* TOUCH Interrupt */ + pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */ fsl,pins = < MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x1b0b0 >;