From patchwork Tue Apr 9 15:24:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082381 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 44drgm5n2fz9sND for ; Wed, 10 Apr 2019 01:24:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5A9CBC21E3B; Tue, 9 Apr 2019 15:24:44 +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 1D988C21E07; Tue, 9 Apr 2019 15:24:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D68EC21E2C; Tue, 9 Apr 2019 15:24:31 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 32190C21E2B for ; Tue, 9 Apr 2019 15:24:31 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MFaXj-1h8bgE0itp-00Eawt; Tue, 09 Apr 2019 17:24:27 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:07 +0200 Message-Id: <20190409152420.11394-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1FN+6+HCXdPH3zksesolmyE1gFy5S44/mxouYUd52ZdCkt3bf9G s0ypDzAQNoNetCzHZDcGfwx8pXhA2IgY6Ph0SJ1s3xnDOGLqx18TOz6k6HlYrqBqs0PRQ9C +qVot/sTBbYfi2NWZJ8QpvhUsQ+kmGkT9mj1oWVVALfiCjI7Bm5r6XEisvCMT/UbicV0ITl nzKJu0rw4GzEzuCZ2t7Ig== X-UI-Out-Filterresults: notjunk:1; V03:K0:Rw7eiSa2AFQ=:SC/Z0UONeILg379WFssMKP kEK6KusFrxE4PPLxGn1IcixpN+3q9ulijFgwt7pMBhlSxTDD4sZDesM+3/DfPfuUKk2UUhsGt owg/fQaglDQthSgZQ5WBliv6/muJMBb42mwkYSvhLblLB2zseHjT77jdreyV6cib6Vr1bU0KJ xURCMdabWY6BvFSQVPDjLlD+8DVlZ7eDvF5gCnVQhp3ytqKmVGb6cdnDOsUHPBHtFVhAniME+ KzR4pGD/fkwr6r18EVaAjfQZaSiwaYy0agxD17uRDYCNOjkUY5mVfn2YVM+dnZsnIjxaHPylP othw9e6zTs2oIqOUBfxKCaeMoZEw61sj59oltnlpWfC7Z7E+I73vep0j3g5rgRsk1QI0sBeZP KaX1uz+Vedtg44XiHOj0nQ7akJWnm5KRIRXFOZh/5LOWgbTVMcY43/jQw+8yBVx99Wde1wiIU XAiWilN4kp3zWYIuM7jWDXzGBXfJStl/fltCv0e7Inw7RL22yRi3donoz68TYfahm/w2RbdF8 R7Sf5AvMktoznlQD49tq3Zip73S3SRNjKCkLSQ4oQSBk3aweQdkEO5LiEr9IQDlM3VSZ1+lsW MtoZuLvpvmrl/BTXpdtLI1aIououQg1R+pzHBZrCigM/xI0xffs2FsaDA23fzVR6YMscdOEHe fESbCj+vifYdtWFI5Y1JnRoZE5G8H0ORtOLor01C4hw7/z9gjIrrzWgr3uYXgbhkPG5jazjUX mE0oUK8YxROT1FdQ2LuBSIk6CnZSBB2iswLnSQ== Cc: Gerard Salvatella , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Max Krummenacher , Dominik Sliwa Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082389 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 44drjm3xQ6z9sSl for ; Wed, 10 Apr 2019 01:26:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0CE99C21E1D; Tue, 9 Apr 2019 15:25:13 +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 AD1EFC21E1E; Tue, 9 Apr 2019 15:24:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 63B2EC21DF8; Tue, 9 Apr 2019 15:24:33 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 66C4EC21E2B for ; Tue, 9 Apr 2019 15:24:32 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MWRXY-1hPRLC3V4U-00Xe2O; Tue, 09 Apr 2019 17:24:29 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:08 +0200 Message-Id: <20190409152420.11394-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rrNtzfDXzjafb5ltB8Vb/QoQZAofh8Gbd1LLdiHEeNkFEvYL+mk Bph2V8x1WzVKVskGz1pcXv9YQ067uRz3vepQEkxjVmAPcr5b9phEkN9h19AYnVvXgzDDmUT 4sTm0fKXme734vZpmCMg2YfR1Ol//OVYNW8Y2O/w929AGZrEFieB4SIsq8K5onPXSPShQ9z 90w2Oe6ePOcyRmErjuHHA== X-UI-Out-Filterresults: notjunk:1; V03:K0:rslz8b7lCgY=:zfCmEtbYSEZXS+pEnk+o2L bQKXd0QC+ar94/EaP9RRSE3cxon9p5uEQYgQrMJzyY4l6RmaaTbCG3hHF+MCFk5TebRoI3miR 2778SeGWJyRb4LgVTGQkFD+of++PQUG8ISDCFDwJPsprk3jo6DEN7FgxuIMZHGfK4XeimwOq3 m58wgLLudF4rhtE1rep8e5ed15wP1QCQ3PyI1WClUtsnDBo+SEJjGwbhIClm1QrhJRiILE1J6 0rmyv5e6s5ytWX45voDZZnNpMLNjZHCnPsuX6m09TdeDXEBq26f7kUBFmNrEDtIlsd2GAG3TB H5Ef9TSLcOOYnYMZo/hInjHw5i9VmVDqin/BXSesrp/FvampmVGEYwnUXGlj8zMX3nisW4QZY kF72qSgk6/kw+HLfur5g4xzGVoj+UXy6MrfYYsm9G+WsvjoTO4J2a7hTVQCsiFDGAeste1tEb dnIRXgf2xLvWY035Ev0+pRWuac9cY7HraVnc840jt33jss5LZznbw5Xslr4/gu+qO80BKwicD 509kPmllJCJ+CDuX+toC5al1ftncZ/swEJNAFzyV/9wnuYDTr8XJ2n1bzIyL2gRRn/7hKGV4I WGwrbsw26fQayWoiC8n1B3dIqKj/9nJoY/e+iIPpKtNlh3BR8U46uBwM2C7ZpYfAP7ysiHvbo nC0/F0p71J2Gbx3+sUV2PhH3jhLTxD8fc7tqqxYTv16xI4RWBdNlpq6SJSu3UFoIIGafDhZ2E aAtD1KFERj0MCJaOtrPnCPmdwyyzc/QRthUcsg== Cc: Marcel Ziswiler , Gerard Salvatella , Igor Opaniuk , Dominik Sliwa , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082388 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 44drjJ6sdjz9sRd for ; Wed, 10 Apr 2019 01:26:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 82F1FC21DF9; Tue, 9 Apr 2019 15:24:59 +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 07AE6C21D74; Tue, 9 Apr 2019 15:24:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3148FC21DF9; Tue, 9 Apr 2019 15:24:34 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 1560EC21E36 for ; Tue, 9 Apr 2019 15:24:33 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LoY3A-1ghGsu1XTO-00gY2O; Tue, 09 Apr 2019 17:24:30 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:09 +0200 Message-Id: <20190409152420.11394-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:yBT7xSDrg68PD9syzsa7lXD+Ld/ZLFK/1goFE/fT/6bUmqKagmk nxnkXoCGHZbzfYbuQhwyEfcFq4UL1/lN4omnKY9OtdiZJtStA7owiN1wILaRSC067WYvYRE O+SEqkWZNgaGjlFNP+gpftP4h0PcYdZWrThz8/EoBiB0sYGtYrtO3F5juAfrAyhMxx5S1NA T0uO0O02HgvKM2QiUdCOg== X-UI-Out-Filterresults: notjunk:1; V03:K0:r5ZWhux1ccg=:SSsuVZiJgfvCSfCBNeczAi 3DLAABnOyjuYa17p2uzCqNvCXdltCgJiVmwqQML5XOs7XfYX9e9K1DPAvZcZExm2zK4vZhqbf ge2R3Z9Aq4DBbOLqhZFDpgwG9k8QHct3cpdvVQwmhT549vs5ffO0HOU9bvLWeY/gZxfELjZ10 GdC807sK6JG+6Pzn+O7OvEKYhxhMT6CjmV6hNfkU63vPUEkXobR6M3eSwOo/mI6Aswf8Xws8t XzCAdQqa9Tv9oijAGHhc+xEtu6Wle0gaJGWbQvTsuZ9ZNlPGEF7EYJGdX0jfbNRRh/Jo3sPYb a6uo1xj4NKBUIMTHVSKZiwGTIboE1xXByzJ182W+BsAl9HBn2Be3SH0ssodB35oP0r+80BER+ BepQkMfrcxJ5ebL7IQewVKmGMtAYqtuzwH77Q9IkDjO2aw9ZjC084UKN8nGO+e7AABOdMGLwM d8rbyoAZCFBCwc/UK/tOVI3GMSvX//iMXghBFssEmDLEpeoavaJ3CVA6gqdWD8+a6Z+2fMdnU 6mGP1So/WZWrwtfxTsrlF8H2E9lcnNXDBu8cO0uRYzl2nDtFEFCX101WiSp5Lfhf/gvZpdZVK 5TIsXJfOc9YpOdaylkB7686emgssTshTKRbzpnlY1jySWSpmq9ISGIGqkJMQIZ4dd2xpm7uLC sI+cIzRWw6dc095+niw7fuXttUaRPeZ/hFe+0NAcM3nd9B2uNFktnslXiR44ze341IMCHCydg jYnI7tN0AA4Bffjj/2upMgKa/SGfV1XeH2WQxA== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082391 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 44drlg5GjXz9sRd for ; Wed, 10 Apr 2019 01:28:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 49C0EC21DED; Tue, 9 Apr 2019 15:25:53 +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 032B5C21E44; Tue, 9 Apr 2019 15:24:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EC230C21DA2; Tue, 9 Apr 2019 15:24:36 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id C4F2EC21E1B for ; Tue, 9 Apr 2019 15:24:35 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MgdbV-1hZf1D0AsR-00O373; Tue, 09 Apr 2019 17:24:32 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:10 +0200 Message-Id: <20190409152420.11394-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rxjtJ0QEqpfjdRqMDLXbWVxR3xvG0NPby0L1X1pC2J23pl1RqQa nnS9oyfz/11f8XGyOLFEn0v9bJ8p1XG+cVSLUrF2/VRzV0w3TuVupuxjyrFViZuCEsqigxW YDxPr9J+lrWIapKZPOB+cg5HMTGnV6XmXWwOuIrGQNR9C7u7v7qIWin+5BRb5kIisobp9iu nIs54ikhHzIYUZ5VXQK3g== X-UI-Out-Filterresults: notjunk:1; V03:K0:9J8LxGB5NVk=:/3WbqnNtRR1+n6iZlcn3sM /YklW7MQWItmyqdfBcdPpBq7U6xxdA7JPKKF/sX3Q7lKnuThQolfyExAY14hr/V7iFSWKEtxo 2HJsLQc7pYL9o2lDIygceD347avEBM4+SSS7MF57ahaxecnpWMhOI2BEGFvqCY6dnzNTpg6g3 cjhgQZbgiMrSxg+c9GiAlxU5hf1tjpJm65YhIagJntP1nNHB6bE9T9J9OUCBeBYcqbHgF1OBj CKN+D96X9PdVn4lw8xUdJpyiVBKjnZ+PNqpefpV+Yo05dL6eg74UbQFooFbzSkS0d9Vh+V7d5 Z3esq6PP4zXW2tsyPBP5/Qfu5Q2XIzuzMteOvQkZEKIzMdpCZmVUEFIRhNYDasqM0/cye3U3T 2odMBmbJXriEZ3+1QmWNHti0kMk7zIlyECxYHYZek6PFlA94yjoqsoV4PgFdH+6RwDTXj26sm o1BIjvD+9dcKV+UFSWoGzVvKVMVlt9JKTPf9hCd1bPlQ/hsoSVtszZAMpZ59/2dmEr7GwaKJq eg99ZcdfHC38oE6fip9yhLbIgqELWevE90KLeYm7lxrS+gyA6PlmNhETVJ0+zYS/epVovYvw5 O6SvQT45WgrNsVK2c7V84yUauyjMBN225I5didLrTUtDKfN+XsGojBDd2HU5lTmee31RAQAUo Mb3BM6Wd2o29oAX1fN3bGsj1q0f+mOUBTE6GWy05ZMo8SWT52NteZEQT1Tjw1W66V3zCkfIJC KJJOu62O4oSHqMj7rPMlgjsyGrGncCpMWAMpaQ== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082392 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 44drlh21DBz9sSQ for ; Wed, 10 Apr 2019 01:28:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 93421C21DA2; Tue, 9 Apr 2019 15:25:40 +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 101C3C21C4A; Tue, 9 Apr 2019 15:24:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C3FA0C21C4A; Tue, 9 Apr 2019 15:24:37 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 00177C21E0B for ; Tue, 9 Apr 2019 15:24:36 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MbyuO-1hV0K72Nra-00JMHo; Tue, 09 Apr 2019 17:24:34 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:11 +0200 Message-Id: <20190409152420.11394-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xWW+CgbpHiVt7Jkm/0gFrwy3MWRzKWRzYhbD0lT33Cewse1Ba01 sMSdUettx4/P0eF7qoVkqN6JQA4FePeeCwY9Q9ePq072S2psqcOb5ifqQbjtPVzzFKGSbEq JD0UjfGg2BhfR9q23i1w5ZRJ9MulNVoBVsmb5pxx2v11Nszj6soSOpxxYjJsP4R0TWB322B lYJuDsFyEQ+2Fa8ZAqvDg== X-UI-Out-Filterresults: notjunk:1; V03:K0:QywmQTnj5Bw=:16ihsOmUjxqj1wibWfZIF5 byjn9FTdYcDtDncJXjKg0v980BguqlFwMzc0wsIfJXBJnoTnVruMFtXPBTVAXCdcbkwySWVLV kCt/IfB4/YDT4yfWuIb4LBD8r7EDEiiV9yDvKEOSRTRQyikGO1RwGG70GLq9XV+U8j5kIURUz pdM1Y08ExWbTdaayRqm/LidqHojtdTkNYvYHT2YsmXjpfFqy4NRBotOQ4kmyxS/mR7rGIAf5x hgeKs7ZEyuebaJRr9NZRDcWHIxYERyG3xO0kYHk033zDkm+fwleRxrUZm+q1EnZ7ENwRL0KXE Tquxib8KANGqS05g564Dqf4ARGaH9J63zjj68T3rIqwFH+qXsNIdreyw/u86UiovUApvCmULM a4qajNoPOwOvlbNI+sN7gKPGWW4Xj4YIry3IDvr0VUSFmGk+VfEH9rA5BL6xfJv5GcVyjJ3oD udUFQqxTynrAZdDezBiAIUE4UI5yIJu1/TNxU6XPnjoSYngwcpcMH+8/dFbXDqjfSrdQyCoUd wjy6pYH2G5P8TVX1Hy5uaQpbQr87oADt46cVdzOPz8D1d27StGA5UrSNNW1YcopQpCdrFcv5k +sHqwQh5x3N9aSpxPiVoCy0/Na6j19X51EERkcTEex5jYkOMRsabHXsOY9a61+3c0qKJ2LD6f H2g9CHBScITHKXpNMTb5J+GUC0Jidg2CbPdU3W89P+RzV0WFt89GRe8vBObNeAI0/hu/lGH/S YimLQJZiw/koNAQp9lLBMvI1xa/675W4s+HMEg== Cc: Marcel Ziswiler , Toradex ARM Support , Stefan Agner , Max Krummenacher Subject: [U-Boot] [PATCH v2 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 v2: None 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 Tue Apr 9 15:24:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082395 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 44drpM25Wdz9sRd for ; Wed, 10 Apr 2019 01:30:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F2E9CC21D74; Tue, 9 Apr 2019 15:26:07 +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 D4FFCC21DF8; Tue, 9 Apr 2019 15:24:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8C129C21D74; Tue, 9 Apr 2019 15:24:39 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D53E3C21E2C for ; Tue, 9 Apr 2019 15:24:38 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LqSvP-1gjCYU1FQH-00e3rb; Tue, 09 Apr 2019 17:24:35 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:12 +0200 Message-Id: <20190409152420.11394-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:SnFgTrT7IWR8YzW+agdTPJedgGMwlfj7jPG9v044yaaBtY8Cd8c zcCkxOyU0OBKHQ2yh2B67OYWm+O8CWv3QzPzCnLML+AELLEYC6Y7Dm4tgN0TVjLIt5bV/xS RvTOO9zpyJA8+1OJm4Hf2m+OCbUdMHurrUIAM+04pg5BiWlT4GbBGwNsvs1WNCx2YbVUKA0 S82Vva5Kqysi6tu0OPavg== X-UI-Out-Filterresults: notjunk:1; V03:K0:u/zpv8fRitA=:Yo34VWeLWWTItxCLWbhvsH 59M8mAVM+bV59Wm21JWcyg89XffkBkVJRCGQKS+L6ttSWF/HZY0BHcUlrxylALGuFfKOBS2rF TzNAsBQuwvgT73Q72kktm/jBMujEGb/CWMxR/gdc3S+Tem7MaedSZhCgFEgMLcKuCJuORqP+3 HndNuYzHEgnoHjKO1FiidpOHRacncm6mp33Z2E+iUVQPNvHOrGarAw/kPm9uddXxUgKBBOPpj gBiJBezmO9zE6X8nRL8v8VI2obXmdgIlNGT+vH+qNi2B4S2zFkso6FnliYZveKAWmn/EnZsqX YLtpWHEeLzhybNAkms9Tq2MpzenlWcICNZGE1B4a12NhwQ8SyvgISox+oyhDxFwMfKxKL3EFb om2O9K5vvGJTsU7Mgw9rGKyfxji+5IW0gP7GKbtbymLjUwAw/bPGI8FXZ/M6BtRtkeP/m+gT4 wsC445lpXrY7eZVOlf07y7H8f74sjbvRPblwLknjnEL0rfcA8EgHJvKlzFOaPDoSI3nykpTpl Vje0x15G1mKQKs1Mg7hlbU8NIvfuoS7Z6LjmcM3HWJi4qamXbXhmTGdciRR0M90sTPPv6Xb82 kIjnIZtZ4xr48P9aeFUiiApkPlpWYsSQaYwja5SVsYjxUVg71BbZOMOTafuSmMjuv0+b7HRvM 8k3E47Z4UjkrKOgaEgAsOtcNKhGfH08c7tbzGgciXa2CknqUhWYKu1YNxhtxhRaW4JvKfMmJj pZjOAtQLGua70hmZSmjsnEeEptVJhfUyZkHjTw== Cc: Marcel Ziswiler , Philippe Schenker , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082390 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 44drkX0zSrz9sSQ for ; Wed, 10 Apr 2019 01:27:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B44A8C21DF9; Tue, 9 Apr 2019 15:26:20 +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 4F594C21E63; Tue, 9 Apr 2019 15:24:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0EBFCC21E45; Tue, 9 Apr 2019 15:24:41 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 934DFC21DF8 for ; Tue, 9 Apr 2019 15:24:40 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LfRNf-1gY9vh3Y1B-00p2ER; Tue, 09 Apr 2019 17:24:37 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:13 +0200 Message-Id: <20190409152420.11394-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7rMlQxARR1WZPuX5Hjopjs91/w4571hEGRuVFgSmcXuIDNxp8Q4 o/rkuhYEhkkb/tpav5jVpml5V1KOkN6Uv+2Kdkt2BNeh+5OSQOsbpfR3EgUAzfWZXck14Fp MUrbIuHgT3ojF3kASdjcAQKMFeykoCNK6EeBbzrLr/T5VlOabIY2781AtdXrZOupbvlzua9 mlzkqpMBMYAjB/WON/JdQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:K+YeQ5zcqkA=:jFTQ5mZnYxrIBpsKVYNjGb 4chrj97bMe+qwvmAcfy5JLfjf3eAXZ50uLkLzwd54U4rP3ldcaW+7wDklXmdtsB2AhwGP6mFb kWG7vJMBF+YZxfhc1CAq4xnMxfwTHwsl+dleQWsE/c1/cepKidPCritKL5uErh+AeNmOCuDt4 wpl3a/UnLyiCI663BtI410a6XnzsrM4ItuZCEAVbMRuKNlJl8mXF946ZxyutWCY8oO2SwTpZU lCyYjIftl0Y+Wc0d+CBZaQdgzVSm92vqhAs4WitkTifMmm32+3GOVe5QmWJ7erWZTmrrWIzl5 yU0RWXo8DXRpYOR5Ltg3oB2Jtxl1es0FWD7rYFfOxWtXfqlQ2sNsKI2r4FVjspSvr7afCrmdV Sg+I/iNBv782MrFJiQ8R8oJ/MuntGJPeD1nU6EpoDOB2R8n5oma6xh47YA+wssqZRuPDhcfz1 gAeSZ+xmVKWhLVmeQTLU/8POt7wRJOinb2ytMtZVDPkgGGqZuXw3d+ew573Hv6L4meAFp+hIi yq1BEEC3UYF7ilIpK13IPbRw0HAYjoGVL8SNZEcCx9meHnteTzFofBOsiFyCXkWdWMwm9ip+Z tzn+Na3ustCHjaTL9nHSXTbmoSC32UfZapAsYq2wmIsvTlbTkU5G8pB7ku0MCPw/PfmjIirtc r8JJzRqsmLSknCIqdRSD5Pq7GADb/BzYInYyDPQNrRcOOG+Fxas4A5bp5rzzkl7buRItpAhzN s9H1ezP69RarQBJIk9ZxzESxhpqJ+nixadxvQA== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082402 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 44drs43FZlz9sRd for ; Wed, 10 Apr 2019 01:32:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0D324C21E0B; Tue, 9 Apr 2019 15:26:46 +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 E1103C21C38; Tue, 9 Apr 2019 15:25:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 09D62C21E56; Tue, 9 Apr 2019 15:24:46 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 2E841C21E0B for ; Tue, 9 Apr 2019 15:24:42 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LpdRY-1giNsG1cvu-00fRZY; Tue, 09 Apr 2019 17:24:38 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:14 +0200 Message-Id: <20190409152420.11394-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:HtS0hquWHwNR0iez8H3W7RJUyLSOqyOceKnsHo9A9NI8iz4pvnv JYfu1hb8P9OvZOPZc9nVy5BvaQxO1eRzLVheeI2/QFwwUKUHn6Nw341tzaMXS/oyxN02WJk 7rmf94wOGh+1t5SkUEL45yEloTIbEl5/em6a9b+qaiLcFoZAUYQNbltM34wVkZ/lT7E1mVc bU4FChekfJDSO+nr83BUw== X-UI-Out-Filterresults: notjunk:1; V03:K0:TUUWIDyM1QY=:KLm79Pgl/81RHZXuSMFWa2 iv/s325CMcylpiTXI3xhL1Rks+zeEk4RzEF3B27RQqJHSigSj+27kZLpd/nyHliqoAw5UTj5c /gR1wh4pqWjjkhBed/aiaDNrGRHHTl/YaA5YdAZrXCVrMPX4drc1M2gAecSfi2yWz0pb95vIU YmSN8C87DDo6LpEf/K/i9t121GQ61szQ2Ct23Kag+u/vJlb7EmpBjTqmE1te5BY2qQMM0X0ou j4Tr5fgvuZZxcZUzyMI76ELIamB9Yl2g8lBQMZ1x+3j4f9k6LQ7J4W6cg+gqirgeu1CEWsMta rBop+PIsPsAm9eleLC7RibgMpyz7EL0k737YWjhWGccv1pS6T3+/KlcD4rBBGJNmcO6V6T/GH 9QzOna9HvDuLWdo/0TKHS1cu6rK4fRMEOhJeDrDh4/Z3vPHp13m7ATdkolYIUU4BcI2UmkJuJ GPKh0H6ZuaUD2mDb5EE2Z02+VmZH9xAwA2Z7CSLj+P3M/ZZEg1btNcP7gTbAKjE1936sF7zoM KiorlFjz5i0p0Tel6qaeEv0m6LglHp8iUI8E+FLYbLJ5Ied76cR6WFH6hDcDGgVCXmpDsAGLr KnPY4aCH14UjYhw4qLtPA9ENK5cpIHJvwbhDzXmUsmLvCSy3w4manUgonbt3PbpCQ4e5XnLVE STG8AtX/sZ22i2l/TFjZsRR2LJxeug9Ydhe+Jktfas9I0OSJzi0INBwjhFCVBiG5MzotJQgYX sJvAktAha9I+AwXW4OiD+uriPeB43ct/1Nkt4w== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082403 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 44drsC1QX3z9sRd for ; Wed, 10 Apr 2019 01:33:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DC771C21E12; Tue, 9 Apr 2019 15:27:01 +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 814A9C21E1B; Tue, 9 Apr 2019 15:25:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 73B2CC21E2B; Tue, 9 Apr 2019 15:24:50 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 27C91C21E47 for ; Tue, 9 Apr 2019 15:24:46 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MWRXY-1hPRKs0Kbq-00Xe2O; Tue, 09 Apr 2019 17:24:40 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:15 +0200 Message-Id: <20190409152420.11394-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Uj2NuQF3T/KCef7ukYdXltOkyREan1nI/9f9CAXKKgPY44U5c2a czZPefOcgbsd3enKGbTPdWhE99T+klEtfRmWmcLEQK+/7s2BeBV+0SCbztpz6RJSY682Ra1 6pvebtTHC8sEvCPIvV9aIR0QDdxuigwxm+zHKYXL+aSN5Biln54egRv0sWfemhCDZ0HSLbo R/DjOCh6jBKS4rIUZCl0A== X-UI-Out-Filterresults: notjunk:1; V03:K0:R5rCJcfqB3w=:XUoYNZ9UDF6lndUvjz+7Db eAr0kxvWlNztatqNnLevzOXW/O0zKtfLRKX/sej7/s0NB73SMWNzcb4ihSVzoHlh8im/6t85p 3s/ScJFnMsFFzVV+gYZfOwUwXZp3cvZOy3Ijfhz6Mtbjgrv6eS1WF1DFvpggbSyqxv116d+RT JqF6HjluEXJysJpW/e7mZ23dRaUcfJSfbSRDAhWcqqT0fOrcs5K2EKziXLHUicDhT+SbYr5Rq TlCwRXJISXfX7eukuPyXGOysD5r5i5qDUCWVhV2fY6Bgf+ndf8SC701yrzvkr676/zi+LAvT1 m8YvoT7d18HM4nQscLyoUvFhRxwbUIduGWzp2Pfebuw0HaMvj/yqD0auDg0qsGhteMypc1t6V 2ChY69HmvxqbkuKxkmeZEtjjP4aPyFpuewtpRACme6wWcMN+41LwsKwwAokwoUMTzBI7VmB3H nbTaax3CQUhYTVbDMrzqo8Fs1raBDeSt3Wu1Jbpab4XbYNrqgkxXH3xwFORY2+Ymw+YoziRwl 2Z/d9IOLwUu1g2CI28nO3lgUyeGYkCJeGl5/meDBNwazrFLINGQJGWzLeixllAT+M6YflyVx5 XaJFLZ+0AhI3Tc782rCCBWtr3+GsGj0wadGIVd7MY/tgCmu64eR+S7Eiw/Nm2v+l3XZjykNMl x3xkUDIlhIsIXbCgv3kcUV3+GM8yJw4cgSAqr2opqCzOl5lBkmqG9IVH3B4b4xhW9O+VFllBc EgouRhZdrrYIOrQSxf41QZSchfyaGngotrHlGA== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 Tue Apr 9 15:24:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082399 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 44drqv6Xwtz9sRd for ; Wed, 10 Apr 2019 01:31:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5AEB0C21E52; Tue, 9 Apr 2019 15:26:33 +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 D5EAEC21E36; Tue, 9 Apr 2019 15:24:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 53F13C21E50; Tue, 9 Apr 2019 15:24:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 5EB90C21E50 for ; Tue, 9 Apr 2019 15:24:47 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LuMQz-1gn6qs3P6d-011jWr; Tue, 09 Apr 2019 17:24:42 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:16 +0200 Message-Id: <20190409152420.11394-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:8GwYq60D5MlfgiUeXpxphygmvQQ7TmLSz+KztiT1TBX66aG+2vO iPCK676+T7sRqpAizHX7q6kpdaFra3rmrZVlcCPU/8NBmh9QP4gRxqLNLfmqdIrXXkUmgn8 jFpQ7aZc2YAO1a47lUa+yqPaQp8WAa44N1/RSI5TrZpj+/AwVzbaLAwuYlmHYv6vbs9e2ey 142hgkZeyYz/F4BAzY7Hg== X-UI-Out-Filterresults: notjunk:1; V03:K0:usgq0+Jt5Wk=:O1mW+5TdkNGu0LikOF54Kj lBkIGSnMb+XNrK/Ai4iB0cTvkPAl9e/tbNCASu7Wxl7/yuBEPnAax6akzMG7Dsn+2JCuJ8psA MFGi3dx42Fe/ONhM3LlM4sC7+WU86WvhzNDS6rRJp6/tKX7RlU257tGvOVOFfYhQS6+M12JQt acVaQ/HtY4m3+vIDkI8ynvXLMkYvgj7VN14dmcqslOSS8cDj11eCyXunFRo1cglgmXV+mUDvn P3g43dOM3Fkhr5v7KVQJoU7uW15DIk+bPRyuP7vdoA25QmDX9P8naHUzeOorWftMKescOXIjf XuFRNhAGrOvpQMFPnY5c2hKpYh/UddpIWA/do6uaaKVJHf/aoxXEDKl8XfmEkfAEw/Xr9uQ2k gMTsyc+N3OhbhsyQ1VOajfhXurx6klb8GlDbdpuGRtfJ6APZWkEWpamqSfei6ZRrr16hcmrMA EqDjS2KribOvWjwAjRXdlARdU6s2WCxLuM6NQfYUrzsTLWLgwFo2HJtN3MU+VeCe/ifX5JnNd SpUe4mp6tP5reohJi4KMLc4BiCuICgdQqGzd27O7i+neugFqkrzol7b3eIsnQkDk+iGjMudhT wDU64i7K7lrjUW6FO8nsFTKfJtw9kBrFR+5rH+kB/dxOXvSZoGBngRSoElhqjH0/b2fMtEyvv FsZNg+kdGC/5WOSTfvrwqNOuTE5QoodMk5BMjY32CGHGm/8pirl9iEvoIGr1zTOV7QQOOJciQ +m3UL3Jv5RAswrmbfjJf+vBWiP8UwhN+fRSyPQ== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v2 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 v2: - Added Igor's reviewed-by. arch/arm/dts/imx6ull-colibri.dts | 24 ++++++++++ .../toradex/colibri-imx6ull/colibri-imx6ull.c | 48 ------------------- configs/colibri-imx6ull_defconfig | 1 + 3 files changed, 25 insertions(+), 48 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 0d416ebd10..91e48aab61 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"; 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 Tue Apr 9 15:24:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082408 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 44drv81KxLz9sRd for ; Wed, 10 Apr 2019 01:34:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D43F6C21E52; Tue, 9 Apr 2019 15:27:15 +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 1B0BAC21E2C; Tue, 9 Apr 2019 15:25:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AAA4DC21D74; Tue, 9 Apr 2019 15:24:53 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id E5643C21E35 for ; Tue, 9 Apr 2019 15:24:48 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LdnUL-1gWXN22RcJ-00ixgz; Tue, 09 Apr 2019 17:24:44 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:17 +0200 Message-Id: <20190409152420.11394-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:nPrx45T6vHknv7awETeACnKiuIeoWpDU2pquJ/8MPmw1VCqWQ+E Lc6AImLOLmUV5TBmBgum2oSrneH8u2Kj7UfxC+V87fr3Ue7qoJWIwkvROpnPrRCBY2iD312 SbWR9Obyc8dc6P2Xq0Be2EaiWIM6JMFzfSBfHJsVSJ5KUe75DOOUvEb1NZ8vv04y/VZ9Mly 2Tov9QvTrxN/RucrfC9qg== X-UI-Out-Filterresults: notjunk:1; V03:K0:t2F/t24FBUg=:ifcvl7O7x/+/S8FB2R5VJR ZqdPgPYMTfWxpch5OmFKMfQomhbKyDIPZqqTNuNWyuV8FLFZW7yXN1KFSdLZDzLFDvccnIgkP 8T77Ypaf5X1utdNY3Z0MIb03JYDqDm3+fpdtc72WGgiRJFTBeFtCx4G/5G685dByTlcdmTVgn 9KJ7jGILgVQXV++Bj3776XMUVJxauL9VU4jZjHaFeSpbOuVpf7HyeuS3Qxq7tOpei8Ce0vDoY pxfsJdiHsJkB9Tlv+uc4Bi/V33XFs/0yq2ICF5nGOvkdfG11RgJMQtZz/MQw3ntD/6d8RhFt6 KsbOQnruVyrcwop9TnODjjVNP2mgNs+Jl8gy1f21DP3FQnXIPrPyeIoUffhgOea2nQJqO0kgj trgoyauFOs9XXXxduSi+K56J0M9fR7ZaNO2B61J7KvQFTinOORO6M7uFu1tjEO0/7x3eEa6lE 4BIMnCxR28i87CQjRCzIK71gADBwfJpbBtl/H1R1dSXeyu9C7hSUVlt6/fde9TC1/MJN/8lK+ 6txPQIpe9TNvM7QbULlDj6OiWVE+4jrxSKY46kN0aQdj45oNfj2lev05QpSbx4C9mBYybENu1 uYXI/qFKf8SP9mNHyZDsRXwcitOnxYF9vPJbAQpI7noDPXz+3OCBFfrzpa12wC0DmlGwE36s8 +I3NuKhAmYNuZ2uaJT+GtyWqEcl7XQbPgFYgZ4TWU8IrpDz2v+6AInle5CB5hybU4VvPNz6/j lZXnsiUnQQja6ja0JNvz4QvaDm4Ma0hAZyXCjw== Cc: Marcel Ziswiler , Igor Opaniuk , Toradex ARM Support , Stefan Agner Subject: [U-Boot] [PATCH v2 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 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 91e48aab61..2f8865c29c 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 Tue Apr 9 15:24:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082394 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 44drnm5nMqz9sRd for ; Wed, 10 Apr 2019 01:30:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 77754C21E02; Tue, 9 Apr 2019 15:27:28 +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 AE99EC21E39; Tue, 9 Apr 2019 15:25:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 83314C21E0D; Tue, 9 Apr 2019 15:24:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id B3FDDC21E6C for ; Tue, 9 Apr 2019 15:24:51 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MNsnl-1hGscA2pxL-007UCb; Tue, 09 Apr 2019 17:24:46 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:18 +0200 Message-Id: <20190409152420.11394-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:hLb/q963DkskXKHEl2RozhBxQkAc150JtBZm9hSufo5T4O6M5jE whWmQRpay2wFWarQW+ftKEuXWNbGd4AetWMROPRq4fI7/wwKwTJQUfGJHoPhPy5Z59gXoIj JFeHY1aqykdJTlCt13MK6YRQlCo3xfFnLiRWbXQZTncxZw3rzEaixV8/nULHV1fr2JsO0xg GMo+Vex9EbfR+d7BpSjsw== X-UI-Out-Filterresults: notjunk:1; V03:K0:02IVvTAl7Mw=:K3S22W2meeHJFfNNCnlI6l 0Yp18fhIpFvdfDdQ/hUhUwZKbuBjxD+92vV7dngtncFB8iwFkwxUj7RqeoFfm+7dX6gPpjZ7o SCqEe0MBaH9J9aay6kEbXx+EdxSf9kOemlfo/irxm8rC0PiFCawMgnWVgyuvN3ofXwX9q4t81 Cp91VvkojbcewQObxe6cZjFXXlFnXEltxRXFq2K/iddNfWJO3O75RCl63XUGHdeK6p9gS1wh+ asz9aHIVZuf5nPY0Ja5tDWmERIqG05X2hHRf7NKhDIeRCdItL3jsAXqh+mZ1WHEWvf5RU9etG VrEfxzzUPruylsnM5slaiNRsDEnLUtP3ki6cOJFQxf/Q8clFms/iy8Zy86IjCH6GPbXjTudJ9 KtnI41bJaSat0mJSNnlgJcf/C3j5ANVODsbaAhaqPar6DJ4txcoyvhArDaoNRpwBvgUHZX9aw xvOHuhHBCEXzzpXM1RoRd4B4Z4Tw1kSkmnyPzcsKd37b2tQPhV4/LA+nJjIaZ0vjrEsAgMaeI Y++p5S3OAoKTn5hwsbs18ew5AkPxuYFfw4GStQ6KEzbL/CnUiD19U5qWQUy8uEsVrIvR9DfSR UDQSTbHI5/B12v7jrGxaS1ZZ8Eh9Oj1dT4Xw1DUzfQ8cxRtoetmL/E2rLaAI3DJ/chVfZrHsy nCBn3WnrpUalPX4uxZQpJOlPHcnkPgZPDseTwlBxdZQzONDJVspFoPt1VgfIFmvlCu0wg3G0H VbKU5DgM2dUfWvPB3JoWejbX9Nodm4jRv3lONA== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v2 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 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 2f8865c29c..f05c72eb2c 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 Tue Apr 9 15:24: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: 1082404 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 44drsb3qrGz9sRd for ; Wed, 10 Apr 2019 01:33:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2C84AC21E0D; Tue, 9 Apr 2019 15:27: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 5CAD7C21DE8; Tue, 9 Apr 2019 15:26:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 46771C21E12; Tue, 9 Apr 2019 15:24:58 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 46C20C21E1B for ; Tue, 9 Apr 2019 15:24:54 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M10GX-1gtjd22yzf-00vB0r; Tue, 09 Apr 2019 17:24:48 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:19 +0200 Message-Id: <20190409152420.11394-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VEu+itrFjDS9Usb1xQl6L4Qi9pbPRRkme0c5dYky20uqJD56lC2 lcB22FdLlc+5Zqhe+771bOoCftDjTNCR/794j6NwGHkFeCvtJMyzEriJM1Hsaiqdlx+3VNi LqD+QdRL/vYeTx3SnVyO+MaKA415IQJcW6ufnZTYTjg781bZZEuvhfVJ0Sawie+r4/y5dDB gwgVrwYoIUVSnHiIQ/dWA== X-UI-Out-Filterresults: notjunk:1; V03:K0:ACLgGO+ivWo=:XbwWEEcvVWeelTnwCMDU42 Bh+aNbbP08/xIxklR/bW/tf9RMvJoHAxdgI9KrECpTALZJqgMwfq31CMXQ4ZanTy6g8tLayyw L9QDsvxbRl3fbtJ8SsKze2Fe9/bcWPMOKjReNidYemVoeL7trZntYRMqzxzvN2ugSGOE6R4cz s31WTVk8bGJyqpvsUKKwkHU7oj9rK0R2h9safV6KSKGnuB/rrE6ywtETp/CG4LG4k16rbCTF2 gDTKw7KoRbJi2Ci/WYMoPv1lolm6rtnZVJWux3IFn+vA/M/KLvmU2cOlJ5XmihjYhzGVYBqoc 2U0VPoMUqWfMZ4uv7Mkk7lfk5rM6NFYeDYujqRq2NNTN+Y3fEI+wxAzpz/gQjgwSNBnf5a8qS 5wIixA5FW+S9S84+N8kKzzVFH8ba+wxmfp8QSq1sbVdCwls96F7lWdnBm4SJx3UrFPNYFyL3h SJjJ0TRmn13D7k66O0HU2stXwAQkNXcl95u+oX5Nurn0Ir50iSjGvMqm/HsHZWr/1S7V+FsN5 K6AboHYGJREi1CQ3mJ6Oc+1CFXSTNpy1SmTb1OS0eK0wORKfKlVkUBRsLRToORTpm7Cv8b87H CzbU0FcytX4f46vCqIq08qv6xUiO1TWtG1J6LuWYCnMhcZfiMvh1gbINBeVmdPXTRJzNwP5uR OU3PX28Zk31HKRCC2brI5Hzz47wW8jCQnMzZveUYPgQIFlI5TamQ7a+h41OLmeVBa/2AXwW1g sYtwZVsfTJzVfs/SY6vZntrNCkaXBNgDybeYWA== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v2 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 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 f05c72eb2c..84f70deaa1 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 Tue Apr 9 15:24: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: 1082401 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 44drrq3TQ1z9sRd for ; Wed, 10 Apr 2019 01:32:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 349BCC21E29; Tue, 9 Apr 2019 15:27:56 +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 44A6CC21E1E; Tue, 9 Apr 2019 15:26:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 500A7C21E1E; Tue, 9 Apr 2019 15:24:59 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D970DC21E36 for ; Tue, 9 Apr 2019 15:24:55 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MAOQ0-1h3OEl3JnO-00BYom; Tue, 09 Apr 2019 17:24:50 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:20 +0200 Message-Id: <20190409152420.11394-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:g/DsvVGLEEUAXEA9Y27i0iAvYRbMnGHei385BN+Ee5KKtSy4slH m0Tw8dwcDWuMAz7YD4QwHHwebDCcCp7Xpc7zSP+FbunOQKVnkEvvHv4O6GA90xaaMAxfmnj IkVPH2cWY389JfobqI2pHF5SbJLUsJg4hAYAcTQNcyJbuZ7baGg6KkkvenxkDRpoVfwLfiW 59kBoII5qC+ZfvguIigQw== X-UI-Out-Filterresults: notjunk:1; V03:K0:uIJKa//nH+s=:zifV3HFgHd690tPPnDjF6J 2+i6nVt9yxYmRbi9nEotEycTdO4qQf/P9b7Xju/uVq9FMom7EFRps/QfcCY6n3iEnXlRGTsOs qQ8+TYvTAJgVE7WZQbLIxThIKXwSlZbRl32rliH9rgB/DwR5doWOx0Og7wLL+zdti0rcJCz5N p6e+g9VlVAAkKJZq+/HeDvVIWnkbgjHSCKsHtl42zVf5h6C7BHcpZV88cSfuHL8na1hQhK+IT hjfrYP15NWQzZDoaoC1zV4uRdNtatmqAZggRfwiOQxRnrYraRA0Y/7OnPYF07avVd4553Ws7S Exe7dhpUO6uinPKXwszoeBbB9MeOZoM0WlxE0W8l6KifbsaMmKpX64v2Jd9h8/UCQ/aspeVQt gFIz2TEtHqPCTEAT1SOwiEan/eU0e/pYiyloUVFgLL+1Sm1H93zU7jwkXLzjsL0EdExIai18S D4QidNwR+qTWQRJIaAMQtlnjqiN6Vfeur024ixbK4TTwswzooXkc0DHNf3cO9s0QWBifC7etQ SFEQvUOnmzpCjUqHLicEZID7kNi9jJJ4ceJM0Zn7gBd9cahxDZvhGfqG0/16PEqUpLQKjh2ZQ 777xahCcp53JWu5vk6IVkOoDmPTlsg+0JGXwVNDu5gDUO9an1UI82uKLIFoJ9FK8m6jBzAVMZ 37DHDcq86Jj7oyhKO6aUeCZ/EbyLxSkj5I1aNYKV2N2O8lDJJQIeOmeV8VjCmzc2oEbZDymp3 3K7V88+WZG4e5WmniM3MiW1NVlvxd9rzlO+OnQ== Cc: Tom Rini , Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Toradex ARM Support Subject: [U-Boot] [PATCH v2 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 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 84f70deaa1..4196cbdf22 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 >;