From patchwork Fri Feb 8 17:42:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038877 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 43x2sc0rbWz9sMp for ; Sat, 9 Feb 2019 04:55:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 77B33C2208A; Fri, 8 Feb 2019 17:49: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 1B87DC2209B; Fri, 8 Feb 2019 17:43:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8A5E2C2209C; Fri, 8 Feb 2019 17:43:00 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 05157C2204E for ; Fri, 8 Feb 2019 17:42:56 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LzZcy-1hEaaL2c5q-014mBn; Fri, 08 Feb 2019 18:42:40 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:04 +0100 Message-Id: <20190208174229.23562-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ISAXHPMaPWLBWuedHN7F1rTMRYHUi880eU20ltUHqJROmnV2zpZ PrbhFQT+OSbrhYmXcO6exBTsNQA9GvTyrgfq4e+KCQPa5YQjTzIUet3t6mTQkqwxgV+2nJS fLVTqSsR5yIwo/8Q2VRmy7rLVfg2uM8PPAhNQsdlzgmnHMEfXOBeZQv5debdZP9eKBuqxhc 1NjNyPqpXIn5LH5FzADtw== X-UI-Out-Filterresults: notjunk:1; V03:K0:sZjPvfif6iM=:/qbTMA2jmA3rRUZenX8Zdm jRuZaTH2LcWe/Ti30Ebi5e8YYmi3imIwYVf/07eMkkpCxjQ1BEod0ezdxFN9x8j3H6co15udI WhA2qabsym+0r+37ddba7pg6oD/6eS8mSDSU4p/mMJstef26PbSLcN0gJzBLLi66bCe87wTKj v7cYOEDGZAAx+98MGyPHvcID8efi/kLw0rLOP3mMt+bgPoTh4hLff0HcQMSd07WJPcPeppaqu 0obdzsKDzeM+aHGpNvUf7oS+Cg4z7pqW12vwQjLSXR/LyqnfO/xr2q+Uxe4KD2QuzecjFTZyV uP3nr7/10ApRX8zLxlxGuvbCb327uL2m96nZ9dRdr0NWwgjxGuMOa5rtzYtQVKWuFF708GCn/ wHc9LFeLyrHkp3dUGbRvacL4/UJAnrKkupJoGJWw+qTc4GTmgVyCEzR5aBTzFK13gemCDTbRL pW0xwZR0wFgPUfhUlDpInsEUZYOJCZ6LukpUe2W8C8kAqBDACy4NWUHOwWPv/pDzzP5GqhcbG ekGZ2PWx9vlCXye8CWIE+BCdWHPquc1kUUWreLoF9TQFWjVrDYM14VL9sXTlzZfhbCs8/0eIu zpYHzLev+1elSB1KAJcnreZWijcqZhLr7Ei3JGWFyQUjhebI6Y2LMyIpu8ftaEtviXMDp3cYx gCikdsfXkUaD41FJEmAAx65MWZ6JV2SGoPZn1DqBu3q7qy6rN7iNR9i21FGnomyL/pFiAsmXx MFHykT8zf6UPLEKEUgBCm6EYSYm+cx1eudYQ2Q== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 01/26] colibri_imx6: get rid of obsolete nospl configurations 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 Now with SPL long since being in place even for recovery using SDP finally get rid of those nospl configurations. Signed-off-by: Marcel Ziswiler --- .../toradex/colibri_imx6/800mhz_2x64mx16.cfg | 58 ----------- .../toradex/colibri_imx6/800mhz_4x64mx16.cfg | 58 ----------- board/toradex/colibri_imx6/MAINTAINERS | 1 - board/toradex/colibri_imx6/clocks.cfg | 41 -------- board/toradex/colibri_imx6/colibri_imx6.cfg | 37 ------- board/toradex/colibri_imx6/ddr-setup.cfg | 97 ------------------- configs/colibri_imx6_nospl_defconfig | 63 ------------ 7 files changed, 355 deletions(-) delete mode 100644 board/toradex/colibri_imx6/800mhz_2x64mx16.cfg delete mode 100644 board/toradex/colibri_imx6/800mhz_4x64mx16.cfg delete mode 100644 board/toradex/colibri_imx6/clocks.cfg delete mode 100644 board/toradex/colibri_imx6/colibri_imx6.cfg delete mode 100644 board/toradex/colibri_imx6/ddr-setup.cfg delete mode 100644 configs/colibri_imx6_nospl_defconfig diff --git a/board/toradex/colibri_imx6/800mhz_2x64mx16.cfg b/board/toradex/colibri_imx6/800mhz_2x64mx16.cfg deleted file mode 100644 index c9407143d2..0000000000 --- a/board/toradex/colibri_imx6/800mhz_2x64mx16.cfg +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Boundary Devices - * Copyright (C) 2014-2016, Toradex AG - */ - -DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D -DATA 4, MX6_MMDC_P0_MDCFG0, 0x2C305503 -DATA 4, MX6_MMDC_P0_MDCFG1, 0xB66D8D63 -DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB -DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2 -DATA 4, MX6_MMDC_P0_MDOR, 0x00301023 -DATA 4, MX6_MMDC_P0_MDOTC, 0x00333030 -DATA 4, MX6_MMDC_P0_MDPDC, 0x0002556D -/* CS0 End: 7MSB of ((0x10000000 + 512M) -1) >> 25 */ -DATA 4, MX6_MMDC_P0_MDASP, 0x00000017 -/* DDR3 DATA BUS SIZE: 64BIT */ -/* DATA 4, MX6_MMDC_P0_MDCTL, 0x821A0000 */ -/* DDR3 DATA BUS SIZE: 32BIT */ -DATA 4, MX6_MMDC_P0_MDCTL, 0x82190000 - -/* Write commands to DDR */ -/* Load Mode Registers */ -/* TODO Use Auto Self-Refresh mode (Extended Temperature)*/ -/* DATA 4, MX6_MMDC_P0_MDSCR, 0x04408032 */ -DATA 4, MX6_MMDC_P0_MDSCR, 0x04008032 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031 -DATA 4, MX6_MMDC_P0_MDSCR, 0x13208030 -/* ZQ calibration */ -DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040 - -DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003 -DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xA1390003 -DATA 4, MX6_MMDC_P0_MDREF, 0x00005800 - -DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00000000 -DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00000000 - -DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x42360232 -DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x021F022A -DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x421E0224 -DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x02110218 - -DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x41434344 -DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x4345423E -DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x39383339 -DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x3E363930 - -DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x00340039 -DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x002C002D -DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x00120019 -DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x0012002D - -DATA 4, MX6_MMDC_P0_MPMUR0, 0x00000800 -DATA 4, MX6_MMDC_P1_MPMUR0, 0x00000800 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000 -DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006 diff --git a/board/toradex/colibri_imx6/800mhz_4x64mx16.cfg b/board/toradex/colibri_imx6/800mhz_4x64mx16.cfg deleted file mode 100644 index c319d2a729..0000000000 --- a/board/toradex/colibri_imx6/800mhz_4x64mx16.cfg +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Boundary Devices - * Copyright (C) 2014-2016, Toradex AG - */ - -DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D -DATA 4, MX6_MMDC_P0_MDCFG0, 0x2C305503 -DATA 4, MX6_MMDC_P0_MDCFG1, 0xB66D8D63 -DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB -DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2 -DATA 4, MX6_MMDC_P0_MDOR, 0x00301023 -DATA 4, MX6_MMDC_P0_MDOTC, 0x00333030 -DATA 4, MX6_MMDC_P0_MDPDC, 0x0002556D -/* CS0 End: 7MSB of ((0x10000000 + 512M) -1) >> 25 */ -DATA 4, MX6_MMDC_P0_MDASP, 0x00000017 -/* DDR3 DATA BUS SIZE: 64BIT */ -DATA 4, MX6_MMDC_P0_MDCTL, 0x821A0000 -/* DDR3 DATA BUS SIZE: 32BIT */ -/* DATA 4, MX6_MMDC_P0_MDCTL, 0x82190000 */ - -/* Write commands to DDR */ -/* Load Mode Registers */ -/* TODO Use Auto Self-Refresh mode (Extended Temperature)*/ -/* DATA 4, MX6_MMDC_P0_MDSCR, 0x04408032 */ -DATA 4, MX6_MMDC_P0_MDSCR, 0x04008032 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031 -DATA 4, MX6_MMDC_P0_MDSCR, 0x13208030 -/* ZQ calibration */ -DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040 - -DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003 -DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xA1390003 -DATA 4, MX6_MMDC_P0_MDREF, 0x00005800 - -DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00000000 -DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00000000 - -DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x42360232 -DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x021F022A -DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x421E0224 -DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x02110218 - -DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x41434344 -DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x4345423E -DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x39383339 -DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x3E363930 - -DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x00340039 -DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x002C002D -DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x00120019 -DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x0012002D - -DATA 4, MX6_MMDC_P0_MPMUR0, 0x00000800 -DATA 4, MX6_MMDC_P1_MPMUR0, 0x00000800 -DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000 -DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006 diff --git a/board/toradex/colibri_imx6/MAINTAINERS b/board/toradex/colibri_imx6/MAINTAINERS index 1cc7ef2e71..49999d8cf5 100644 --- a/board/toradex/colibri_imx6/MAINTAINERS +++ b/board/toradex/colibri_imx6/MAINTAINERS @@ -5,4 +5,3 @@ S: Maintained F: board/toradex/colibri_imx6/ F: include/configs/colibri_imx6.h F: configs/colibri_imx6_defconfig -F: configs/colibri_imx6_nospl_defconfig diff --git a/board/toradex/colibri_imx6/clocks.cfg b/board/toradex/colibri_imx6/clocks.cfg deleted file mode 100644 index 1bcbc4fa38..0000000000 --- a/board/toradex/colibri_imx6/clocks.cfg +++ /dev/null @@ -1,41 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Boundary Devices - * Copyright (C) 2014-2016, Toradex AG - * - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -/* set the default clock gate to save power */ -DATA 4, CCM_CCGR0, 0x00C03F3F -DATA 4, CCM_CCGR1, 0x0030FC03 -DATA 4, CCM_CCGR2, 0x0FFFC000 -DATA 4, CCM_CCGR3, 0x3FF00000 -DATA 4, CCM_CCGR4, 0x00FFF300 -DATA 4, CCM_CCGR5, 0x0F0000C3 -DATA 4, CCM_CCGR6, 0x000003FF - -/* enable AXI cache for VDOA/VPU/IPU */ -DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ -DATA 4, MX6_IOMUXC_GPR6, 0x007F007F -DATA 4, MX6_IOMUXC_GPR7, 0x007F007F - -/* - * Setup CCM_CCOSR register as follows: - * - * cko1_en = 1 --> CKO1 enabled - * cko1_div = 111 --> divide by 8 - * cko1_sel = 1011 --> ahb_clk_root - * - * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz - */ -DATA 4, CCM_CCOSR, 0x000000fb diff --git a/board/toradex/colibri_imx6/colibri_imx6.cfg b/board/toradex/colibri_imx6/colibri_imx6.cfg deleted file mode 100644 index 517c5eb107..0000000000 --- a/board/toradex/colibri_imx6/colibri_imx6.cfg +++ /dev/null @@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Boundary Devices - * Copyright (C) 2014 Toradex AG - * - * Refer doc/README.imximage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -#define __ASSEMBLY__ -#include -#include "asm/arch/mx6-ddr.h" -#include "asm/arch/iomux.h" -#include "asm/arch/crm_regs.h" - -#include "ddr-setup.cfg" - -#if CONFIG_DDR_MB == 256 -#include "800mhz_2x64mx16.cfg" -#elif CONFIG_DDR_MB == 512 -#include "800mhz_4x64mx16.cfg" -#else -#error "unknown DDR size" -#endif - -#include "clocks.cfg" diff --git a/board/toradex/colibri_imx6/ddr-setup.cfg b/board/toradex/colibri_imx6/ddr-setup.cfg deleted file mode 100644 index a943fd228c..0000000000 --- a/board/toradex/colibri_imx6/ddr-setup.cfg +++ /dev/null @@ -1,97 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Boundary Devices - * Copyright (C) 2014-2016, Toradex AG - * - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -/* - * DDR3 settings - * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), - * memory bus width: 64 bits x16/x32/x64 - * MX6DL ddr is limited to 800 MHz(400 MHz clock) - * memory bus width: 64 bits x16/x32/x64 - * MX6SOLO ddr is limited to 800 MHz(400 MHz clock) - * memory bus width: 32 bits x16/x32 - */ -DATA 4, MX6_IOM_DRAM_SDQS0, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS1, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS2, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS3, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS4, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS5, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS6, 0x00000030 -DATA 4, MX6_IOM_DRAM_SDQS7, 0x00000030 - -DATA 4, MX6_IOM_GRP_B0DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B1DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B2DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B3DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B4DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B5DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B6DS, 0x00000030 -DATA 4, MX6_IOM_GRP_B7DS, 0x00000030 -DATA 4, MX6_IOM_GRP_ADDDS, 0x00000030 -/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */ -DATA 4, MX6_IOM_GRP_CTLDS, 0x00000030 - -DATA 4, MX6_IOM_DRAM_DQM0, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM1, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM2, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM3, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM4, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM5, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM6, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM7, 0x00020030 - -DATA 4, MX6_IOM_DRAM_CAS, 0x00020030 -DATA 4, MX6_IOM_DRAM_RAS, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCLK_0, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00020030 - -DATA 4, MX6_IOM_DRAM_RESET, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCKE0, 0x00003000 -DATA 4, MX6_IOM_DRAM_SDCKE1, 0x00003000 - -DATA 4, MX6_IOM_DRAM_SDODT0, 0x00003030 -DATA 4, MX6_IOM_DRAM_SDODT1, 0x00003030 - -/* (differential input) */ -DATA 4, MX6_IOM_DDRMODE_CTL, 0x00020000 -/* (differential input) */ -DATA 4, MX6_IOM_GRP_DDRMODE, 0x00020000 -/* disable ddr pullups */ -DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000 -DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000 -/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */ -DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000 - -/* Read data DQ Byte0-3 delay */ -DATA 4, MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333 -DATA 4, MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333 -DATA 4, MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333 -DATA 4, MX6_MMDC_P0_MPRDDQBY3DL, 0x33333333 -DATA 4, MX6_MMDC_P1_MPRDDQBY0DL, 0x33333333 -DATA 4, MX6_MMDC_P1_MPRDDQBY1DL, 0x33333333 -DATA 4, MX6_MMDC_P1_MPRDDQBY2DL, 0x33333333 -DATA 4, MX6_MMDC_P1_MPRDDQBY3DL, 0x33333333 - -/* - * MDMISC mirroring interleaved (row/bank/col) - */ -/* TODO: check what the RALAT field does */ -DATA 4, MX6_MMDC_P0_MDMISC, 0x00081740 - -/* - * MDSCR con_req - */ -DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000 diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig deleted file mode 100644 index 5e9490bc42..0000000000 --- a/configs/colibri_imx6_nospl_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_THUMB_BUILD=y -CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 -CONFIG_TARGET_COLIBRI_IMX6=y -CONFIG_CMD_HDMIDETECT=y -CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,MX6DL,DDR_MB=256" -CONFIG_BOOTDELAY=1 -# CONFIG_CONSOLE_MUX is not set -CONFIG_SUPPORT_RAW_INITRD=y -CONFIG_MISC_INIT_R=y -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_HUSH_PARSER=y -CONFIG_SYS_PROMPT="Colibri iMX6 # " -CONFIG_CMD_BOOTZ=y -# 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_SYS_ALT_MEMTEST=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_USB=y -CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_DFU_MMC=y -CONFIG_FSL_ESDHC=y -CONFIG_PHYLIB=y -CONFIG_PHY_MICREL=y -CONFIG_MII=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Toradex" -CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 -CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 -CONFIG_CI_UDC=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_HOST_ETHER=y -CONFIG_VIDEO=y -CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y -# CONFIG_EFI_LOADER is not set From patchwork Fri Feb 8 17:42:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038836 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 43x2Zs0z1yz9sMr for ; Sat, 9 Feb 2019 04:42:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0EDEEC2206E; Fri, 8 Feb 2019 17:42:50 +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 688F2C22018; Fri, 8 Feb 2019 17:42:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E9FA5C2201B; Fri, 8 Feb 2019 17:42:46 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 759AEC22016 for ; Fri, 8 Feb 2019 17:42:45 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lebto-1hSo2w2oGc-00qPfL; Fri, 08 Feb 2019 18:42:41 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:05 +0100 Message-Id: <20190208174229.23562-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:z9fRu7ahp78CILFjcq0ZmVT3PdN9xYvRDgYQxQEePzJr3uJ46bO dUXtxYyKloz1Fxn7+xIQvXaicrHYyjUDwjlNHZgwNpqKauRZ91Se3NbCPxSe3NG1EWLT44W IVHjlV3XRLZ07GVdexqSovw27ciquKjv+FkVKDc0v6nv9j95NV8qK/n+ZpCAxhuQwb1JgMJ XRI8nEEVM7dHqDYd5xVKA== X-UI-Out-Filterresults: notjunk:1; V03:K0:4lkvEAg9RDQ=:ti5bZDX4ZvWycMExZdmeTc tZQJwOgCBYpCvd86n3ZaFtwEzvwVtSXjtwz7JrWiGiiAdwyzAFsFrJ4mIY8pq0qnyK+Uu8w1c Zg0F1XXz1H/y5six7JsIdacYmbbI1XTyaS/JaB9MERYMwEi7QbcshqxFAdSSeunR1iedwZdAu h5pEXEJX675hINR38LTMu/qd3BYwE80XjNmlSYnMtfgiK5XOaCP8V8QND0DYlRaqI1xZWSwvo i+N9PSM+j193f6B08kWpq6gh7qPvTJK+M3xySPmbMwDmuv8++sU03jx+/ajigbyYuCSPvNDPW n6D03UR5ioI9fjQzQDGYlTz6rvOTcBKMkbdgSnsgJle6NTfw1ybjeHy6nc2e37ExHqXUoZcjo KonDR27efLQhQE/hQltU46Y37W1hbydNqxpynMZvUpdaUalhl7C2ZSbTVkfIa7b3YIkCA+eqk 63zAg2g3xkli4f2bqhHpFRD59fMTMZNxNdqduyWoA8V6Ivgm0kwvMnghlXcogByBRE0nxV+VW Jh+ZTmOKsa5NCvLwhOY75p8aXqRDEYHGs9YRGr0rKpwZjyzUgHakAiVhNlxc2NdU2PLoXsVts TS01L+300V91JGgD1Uu4Ct7nWunkn33Pp6kzYEppfiS2813sOQzavvF7SmJxEahh4oDzSDm/R FM0XsMvKKBSDRMUFmoUQjkxG7drgHw616yKFy3vMV/L0x9JXgFvZzknknKKvv0bo4apELkQbv WV7bI4fPBeyf91s9hdnpquwECLm6oaIjpNKO3Q== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 02/26] colibri_imx6: use distro defaults 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 Use distro defaults and minimise default configuration again using savedefconfig. Signed-off-by: Marcel Ziswiler --- configs/colibri_imx6_defconfig | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 2072281354..699eb70088 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -9,12 +9,11 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_CMD_HDMIDETECT=y -CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set -CONFIG_SUPPORT_RAW_INITRD=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set @@ -26,9 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri iMX6 # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_ELF is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set @@ -43,14 +40,8 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y @@ -59,7 +50,6 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_MII=y CONFIG_USB=y -CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" From patchwork Fri Feb 8 17:42:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038837 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 43x2bW1JSpz9sDr for ; Sat, 9 Feb 2019 04:43:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C44BDC2206F; Fri, 8 Feb 2019 17:43:04 +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 E3776C2202D; Fri, 8 Feb 2019 17:42:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 419D2C22016; Fri, 8 Feb 2019 17:42:47 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 98F72C22018 for ; Fri, 8 Feb 2019 17:42:46 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MEV9L-1gu1iy2my1-00FhfU; Fri, 08 Feb 2019 18:42:42 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:06 +0100 Message-Id: <20190208174229.23562-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Qot2R/F+0Ip279psToN8owB8aBsJdDkAsw9QDOAaPUQTQhhj0HO PgCy0bjI7EvwEP0xtpadf1G38wOhqfBsCtfR1NWFEHGS0BKQwcC+PJ/IelY6tsktXfS9B3Z cg9UwG8PL//SVsjj4EdjkDmy+SRNmbdSP06kcF4Hio5jBgfNeJ3LklrJpRqrKetOk/K1TQX 2/bpRHu4QOAmcVLJvd9Zw== X-UI-Out-Filterresults: notjunk:1; V03:K0:8uuOFfywkgA=:JsEG+xUv0aQZh8Zav2QNYy quVKyvb5WfR+wdLSN7PmVqlzUkv1w/hEeqVkYKNRVD1QOGswFMkS5ITqTYavZvfNPUCFXsNno 9x4kvBv118savQtcWur/l6BOU6e69XlcvPnaXH3eU569FLcFfe9i8LrH6FFSqBjdHDjxTi052 E0tr47lhJhpg/y71JrAV9SdjB3IcYoyCMWEwGXGfnn1erT5NV7VHYqkHvubx8yJmTM8pPrg3v rTlpgnLrk6blra+gZqhNw9ZIU13wRFTy2YJoBfdw+FjhZhmBUSaIxxXZqy6zeKrsRJv46MNC3 mps+duoxnM2TMj/RJlvRh9lipolVAKqA1CrYHHEintv84XQsRTczn05Gg27oLojmsnpOn1v37 U6a1yEaE2GuX+R0QSGkzP4Ip4k/bHH+5AU/1H539uCQQAPyZOKzLCqN1hG2Zd4hevLAszFP89 /nTXaA+V69IcM02hzlJFHnk30UTUc47RsV8pFNsrNPI5SI9lE5vTqKwc8jj5qgrfXuWpls3ut L46oep39nUdhc6amvy3/3pwqPg5NVpeE4oJQDplzIh0Kiz5wmy23f7neCvILLTfHrwNb2CV1T uB+QUHhUjA/v15qBMkp+NyQ/mifYT29c9xrQENVXhf+iGloIMqJWPy2F9W9ZEscTj5ULcNmM1 bSsIJ0vrcnSzkwuAtXEqp60Wobi7Mr0q+bJi9BPYzaQU3TWdr6D8Ob3IMMA//Nw3/qzGS2XWA YFWjq6QBvXCUnBDXkc6Xqg1tuYaPJV+z3MCe5w== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 03/26] colibri_imx6: move console in env from header file to defconfig 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 Move console in env from header file to defconfig. While at it also update copyright year. Signed-off-by: Marcel Ziswiler --- configs/colibri_imx6_defconfig | 1 + include/configs/colibri_imx6.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 699eb70088..0b31a46cc9 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -14,6 +14,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2d40ceb24e..9e45d63245 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2013-2015 Toradex, Inc. + * Copyright 2013-2019 Toradex, Inc. * * Configuration settings for the Toradex Colibri iMX6 */ @@ -74,7 +74,6 @@ /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN From patchwork Fri Feb 8 17:42: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: 1038841 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 43x2gB4Yyrz9sDr for ; Sat, 9 Feb 2019 04:46:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4E314C22067; Fri, 8 Feb 2019 17:44:09 +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 7768DC22056; Fri, 8 Feb 2019 17:43:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 46BF9C22045; Fri, 8 Feb 2019 17:42:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id E6E83C22060 for ; Fri, 8 Feb 2019 17:42:51 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MY5Qs-1geyuY2kiW-00Ut8j; Fri, 08 Feb 2019 18:42:43 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:07 +0100 Message-Id: <20190208174229.23562-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:m5RbkN8XJMV6HT4BfGqQvBGeegiwvrgoEaacs4qUWV+N3kCE/6y AvDJTdFYB7vjqvKXE5b3zAgTdZ00hNYGbTwG26ZiR421dF2QS4qrSJ14AeECeTbNFiGYN6z bCclnnEusiybiW04ofcMaIQtewnxCi4h8L0d9MQUJs6+siRT3uPw8uyGuacru3/rxftO9Fs LI2DaZHOXMd2u4EAQIwlQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:L8UsO2rJ7J8=:TuVgfSswDv4CFaq8jB641U yRdAEzoVUnSMIkV4wCEyYRwIUud6MC3frfLkmTQfQXcBDpq5k7/4y4Sz+4jCMBgBA1/MPeGCu +SGzsTPa6c8uCkO/D2R4KswKfbrxqoHqkhg+5z1JIGdHdb2+1OkK2JUnaSELeQBE7lLnr0uqg 88P7UKu2YjEOBLXSgQwTCE3NYQF4KdIdSi4/bt6qUyD0YwnHKGzzP7maZoibbOGy/1sDYpgm+ dI+/z0X8/EPDZVfp/wMtNPRLJNxrZ66YmccGSsUuh8rB/VxlM0TW2al+Lz9TMHBBO2E8qSIq8 oBSfTxjtgPBPv3ApxRewwRO49zfyczvO7fXhWU19piJp2LnA48ILmefXyzKy6WKkBOzbru3hH QhAGmFqCHG6+UgLSgO+6ES0nHtwxpwPoJ5nv+wcsaBiagwklMIHvq+Y9jKGimP6U0qNZW97ZK o4AsxMvcm2XwzEw8lLc6k9hLFri5A2gsNGXroXOIkjFSswfLr7Z52IFeqm72jOwPVrU/Yxz33 B5YwdtE5Vn6bgFKocL+bRCDox9EZA02nyDs81+49Qqo6H5YJZTqdqQ+L3y1SPsYnPbIfUzUCg GlAaWIT+12RQ1kAyxrNrL1hXZUdn9164LMPAXwSk8mQ13QvkkMHIWikbZcxNiYjSSEABa2MG0 +8kT0X9nSNLQCm+U2m7xlUS8zt0hRKO8KiwGPz4O0w9SJMroy3GcAGJyfV+wnaWeRaP2KXRLG sIi1EUtacn7KY5ddBlInzp5LukMvHhwcpy0r3Q== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 04/26] colibri_imx6: enable fit image, gpt, imx thermal, efi loader support 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 Enbale FIT image, GPT command, i.MX thermal and EFI loader support. Signed-off-by: Marcel Ziswiler --- configs/colibri_imx6_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 0b31a46cc9..84fa427c8c 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL=y CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set @@ -36,6 +37,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y @@ -50,6 +52,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_MII=y +CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y @@ -63,4 +66,3 @@ CONFIG_VIDEO=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y -# CONFIG_EFI_LOADER is not set From patchwork Fri Feb 8 17:42: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: 1038838 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 43x2cN3PKNz9sDr for ; Sat, 9 Feb 2019 04:44:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 20092C2209E; Fri, 8 Feb 2019 17:43:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.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 61553C22061; Fri, 8 Feb 2019 17:42:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EC2C1C22016; Fri, 8 Feb 2019 17:42:47 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 4BA04C22018 for ; Fri, 8 Feb 2019 17:42:47 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M0BJq-1h6Ndn2jwS-00uLXZ; Fri, 08 Feb 2019 18:42:44 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:08 +0100 Message-Id: <20190208174229.23562-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3CWMQqutfw0Hv168rAv/XrZNR3OqRPSQT2c19fp8eh/wYBaEjna gkwfnV95hFAVLcQLc1ldLnujbTHFNmgsOnzzTEnTuqH1vjE/HzYsd8vmTU116Fr01ycQ3Jh it1Rzputf7d3Mlq0flpotUdh4sSk/3boyUG1NThxSYTL2xeqYBDe50fWr3gyPdxQmKMsGA4 LF/pJNAR4xglgOmYWLTeQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:9nBagQAnvWU=:eCmTKk/pyqL7olL/d74Z7n YWPFFitPuEwfVYraNpJ3j/KYNLPJ+J61qsrDb40Om/+xaO4lqzfaGpTjOvNzlemmt/LzVfdqg 3mWo4iIAJ9vpFKraWJ1MQmFpZizLCtFyjBj1Fbex+6g7aaQvmkCSMFV087ll8NumtIHL4yHb9 z7qHV5mCQpIr8M1B0TxLfHryy3gKqUKVvyw8OMd30OCm0IpIZu0KjbuDn2dm1ORpoAE5IQyph JUAc1mOkfVFG7h7/1xcKeQIkzGUtn+XMUiyLAncSq9dJZC5wxshI7mkSlDjFMPC67bhUpwW2H p12dhlysG0a1x6mJt4HZ+X/NzBW8aXQPTUKr63uk1o4fKLf/xfnacsBJIf6WkzdouIvInvFWB dgyaxYliXFrjSymJog3vWoc+3ec2CFUdcEbIlFlah5OiT29EW6RIRnDoBvwJLp8RMqZnlErpl iIbZmnVEYJ3+BMA3g7qdVpkZEoyPkw8A55aAf/UKg5lkx1Sipom6rVAgyTOgpL8OkDU7rLVgG 5Brp6gP7y8vtyeP0icEHTxOb6uKww7zY5+/egLDyLt79Ev9OOtQRTVIgoFT/7LK8RXHRIpro2 6rul7xPMf2x+ZXvCBc6TFeZhYgOhl/xvVHm2V1+yhe1xafk/+yHq8YavYYkmXsjk/a0h+kPl+ srL1U688xr5zU3OmoQ5C/iNCTO/ZMpfzRmHtLEIGR7gwZgM82F+ibe2+OGPe5BdZ+Oj4brBSh LRJuaHjBOfvUD6aCj5tX89C4tD+KMUh7itJcsg== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 05/26] colibri_imx6: remove obsolete USB_GADGET_MASS_STORAGE configuration 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 obsolete USB_GADGET_MASS_STORAGE configuration. Signed-off-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9e45d63245..f029a885d2 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -70,8 +70,6 @@ /* Client */ #define CONFIG_USBD_HS -#define CONFIG_USB_GADGET_MASS_STORAGE - /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE From patchwork Fri Feb 8 17:42: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: 1038843 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 43x2hZ212nz9sMp for ; Sat, 9 Feb 2019 04:47:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DF9F4C22064; Fri, 8 Feb 2019 17:45:25 +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 38B48C2202B; Fri, 8 Feb 2019 17:43:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1B4A5C2206F; Fri, 8 Feb 2019 17:42:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 34C47C22055 for ; Fri, 8 Feb 2019 17:42:51 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MRELZ-1ggMEF3IHX-00UbMU; Fri, 08 Feb 2019 18:42:45 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:09 +0100 Message-Id: <20190208174229.23562-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:pecIkoHCR/FpfhFdfwe77tiv+s7EXcJJYCj7jXSq08WgVHOKMqU MiRK3oMJ3MAe1itTctWp55w/C3TsG4AhNzbck7xcqo2ppnVokC9C2yuqkuA1QyyF0cj3G7W zYstPTeCoe4P1jH1uCa3W6jO35UwJM9ew/1uBvNkZARZ0lAvq+Qc/rYwKmRXe86Q/JCFxC7 5k30tpXEuMqt5UjPHQ3bw== X-UI-Out-Filterresults: notjunk:1; V03:K0:SSDkYcdONC4=:044iFznVEgAcsv4JEj17/a i/ahsVrCA+f3wFyoap/6zIWG0uaDpdbMhESO92ZOtysxtbvT/wskZEBOy1unpAZpd9asCMDky jyLRhikDqmAZb69jWsNvFReZAA5yP0e9N5JuTTNICEWQpwOEoWibUVjkypn4vA92VorC56RxP NUYeK+bL/720fshOip3KjIzxR9CZVfptL2UcsL9sR0N9+GYdgOQnV90DJ22b0D+ro/QXKVYCe w6UAax/AbDt5ntwwZaeaBGSc5X+m+9UoiHrlMaTRwLRB2NgY6Ub0+89jVItnR4duO7kRWD9nr fTcW5lV9tgyKZokh8bqWoOr27WbsQkQA3jxc8p5ApRl8bXEpYQxkDpwlZlS1kf4jk8ON4CpOY aCxMOWDjqwdf28Bhn60aWxJrjG6ONVvBZUseBQl422wwhc4oSHKjDXyQxzMfA+bYM6ntsetfd uQWgeISvRxNjuJWrBzuQ+6FzRrT3lJITWkKi6boY2CmzwKBdtkKt/qOtpxtCyx22OcrmH62BH LHx9ymZp2QLa5EDgOTPGzxuu+uz/SrldENy/DUQQu00ssUAhdfEzWcmSQG6duh+gLs8bpOvx+ x1jJtZecnBT0ibVjjklP7QdxkbqFfDaKdolbarG9NjTGnLQBKpmMfL+Ojc9fmvE+Hj8fgIkds KFQAuw2QFLzCe/ONZawoEa7y0dejVNrgszgXMklE1BwasRiIONrJELdfugtOqVh0kV1bdsWfM eMQ8/ozKJlzro3GbpNpvd2TqoR3fQUw4K1Htfg== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 06/26] colibri_imx6: migrate to using 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 Migrate to using device tree required for further driver model integration. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx6-colibri.dts | 411 +++++++++++++++++++++++++ board/toradex/colibri_imx6/MAINTAINERS | 2 + configs/colibri_imx6_defconfig | 3 +- 3 files changed, 415 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6-colibri.dts diff --git a/arch/arm/dts/imx6-colibri.dts b/arch/arm/dts/imx6-colibri.dts new file mode 100644 index 0000000000..5c9f1f0d2b --- /dev/null +++ b/arch/arm/dts/imx6-colibri.dts @@ -0,0 +1,411 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 +/* + * Copyright 2019 Toradex AG + */ + +/dts-v1/; +#include +#include "imx6dl.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S"; + compatible = "toradex,colibri_imx6dl", "fsl,imx6dl"; + + /* Will be filled by the bootloader */ + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0>; + }; + + aliases { + mmc0 = &usdhc3; + mmc1 = &usdhc1; + usb0 = &usbotg; /* required for ums */ + }; + + chosen { + stdout-path = &uart1; + }; + + reg_module_3v3: regulator-module-3v3 { + compatible = "regulator-fixed"; + regulator-name = "+V3.3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_usb_host_vbus: regulator-usb-host-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>; + regulator-name = "usb_host_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio3 31 GPIO_ACTIVE_LOW>; /* USBH_PEN */ + }; +}; + +/* + * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and + * touch screen controller + */ +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + pmic: pfuze100@8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + regulator-boot-on; + regulator-always-on; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + /* vgen1: unused */ + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + regulator-boot-on; + regulator-always-on; + }; + + /* vgen3: unused */ + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + }; + }; +}; + +/* + * I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) + */ +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c3>; + pinctrl-1 = <&pinctrl_i2c3_recovery>; + scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + status = "okay"; +}; + +/* Colibri UART_A */ +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>; + fsl,dte-mode; + uart-has-rtscts; + status = "okay"; +}; + +/* Colibri UART_B */ +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_dte>; + fsl,dte-mode; + uart-has-rtscts; + status = "okay"; +}; + +/* Colibri UART_C */ +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3_dte>; + fsl,dte-mode; + status = "okay"; +}; + +/* Colibri USBH */ +&usbh1 { + dr_mode = "host"; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; +}; + +/* Colibri USBC */ +&usbotg { + dr_mode = "host"; + status = "okay"; +}; + +/* Colibri MMC */ +&usdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>; + cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */ + disable-wp; + vqmmc-supply = <®_module_3v3>; + bus-width = <4>; + no-1-8-v; + status = "okay"; +}; + +/* eMMC */ +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + vqmmc-supply = <®_module_3v3>; + bus-width = <8>; + no-1-8-v; + non-removable; + status = "okay"; +}; + +&iomuxc { + pinctrl_ecspi4: ecspi4grp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1 + MX6QDL_PAD_EIM_D28__ECSPI4_MOSI 0x100b1 + MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1 + /* SPI CS */ + MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x000b1 + >; + }; + + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK ((1<<30) | 0x1b0b0) + >; + }; + + pinctrl_gpio_bl_on: gpioblon { + fsl,pins = < + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x1b0b0 + >; + }; + + pinctrl_hdmi_ddc: hdmiddcgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3_recovery: i2c3recoverygrp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1 + MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1 + >; + }; + + pinctrl_ipu1_lcdif: ipu1lcdifgrp { + fsl,pins = < + MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0xa1 + MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0xa1 + MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0xa1 + MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0xa1 + MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0xa1 + MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0xa1 + MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0xa1 + MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0xa1 + MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0xa1 + MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0xa1 + MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0xa1 + MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0xa1 + MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0xa1 + MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0xa1 + MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0xa1 + MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0xa1 + MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0xa1 + MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0xa1 + MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0xa1 + MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0xa1 + MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0xa1 + MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0xa1 + >; + }; + + pinctrl_mmc_cd: gpiommccd { + fsl,pins = < + MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x1b0b1 + >; + }; + + pinctrl_pwm1: pwm1grp { + fsl,pins = < + MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1 + >; + }; + + pinctrl_pwm2: pwm2grp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__PWM2_OUT 0x1b0b1 + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x00040 + >; + }; + + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x00040 + >; + }; + + pinctrl_pwm4: pwm4grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 + >; + }; + + pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp { + fsl,pins = < + /* SODIMM 129 USBH_PEN */ + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x0f058 + >; + }; + + pinctrl_uart1_dce: uart1dcegrp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 + >; + }; + + /* DTE mode */ + pinctrl_uart1_dte: uart1dtegrp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1 + >; + }; + + /* Additional DTR, DSR, DCD */ + pinctrl_uart1_ctrl: uart1ctrlgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0 + MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0 + MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0 + >; + }; + + pinctrl_uart2_dte: uart2dtegrp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B 0x1b0b1 + >; + }; + + pinctrl_uart3_dte: uart3dtegrp { + fsl,pins = < + MX6QDL_PAD_SD4_CLK__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_CMD__UART3_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + /* eMMC reset */ + MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059 + >; + }; +}; diff --git a/board/toradex/colibri_imx6/MAINTAINERS b/board/toradex/colibri_imx6/MAINTAINERS index 49999d8cf5..e25c07306c 100644 --- a/board/toradex/colibri_imx6/MAINTAINERS +++ b/board/toradex/colibri_imx6/MAINTAINERS @@ -1,7 +1,9 @@ Colibri iMX6 M: Max Krummenacher W: http://developer.toradex.com/software/linux/linux-software +W: https://www.toradex.com/community S: Maintained F: board/toradex/colibri_imx6/ F: include/configs/colibri_imx6.h F: configs/colibri_imx6_defconfig +F: arch/arm/dts/imx6-colibri.dts diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 84fa427c8c..47e05b0b26 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -45,6 +45,8 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y @@ -64,5 +66,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_VIDEO=y CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y From patchwork Fri Feb 8 17:42: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: 1038839 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 43x2d76JHZz9sDr for ; Sat, 9 Feb 2019 04:44:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 66C4BC2209F; Fri, 8 Feb 2019 17:43:35 +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 E0FF1C22063; Fri, 8 Feb 2019 17:43:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA885C22040; Fri, 8 Feb 2019 17:42:53 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 71850C22040 for ; Fri, 8 Feb 2019 17:42:49 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LlWiH-1hQOGI3JQ7-00bISM; Fri, 08 Feb 2019 18:42:46 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:10 +0100 Message-Id: <20190208174229.23562-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:B6JQqTd+H6+pINVHfv9HP6Rc2/eZKipFd2iWjEOK3bJl3ASavkJ 1U/dC1JWHPsFVA89Cb2mPinL+A/UJMkTJbudXiyaf3sJXamrwOEZZt4+PRqu5TlRpmLzw6P 6vS7D5VofdHnzcmjS4yb7MXeIsaIeHGZ5N+EjVyn3rUr2oiay2hsKXr3oRzuDRFtEj25U/a N9HyMsrUHvQRq02Q5PMzQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:omBMxZBKe7o=:cRYuAL/HcPkBWomGC0t6s3 uPU+y7YcKY/UNJrme+suvMV2EsAKQQTbMgDPX8wTkE9dFiMmemfVE8U+3+SljEh5sB4sXu2DZ Hi0DIS/W926mu/07UnaYsihVPTj2CCPnWmf5/MpCl9C9OxeU0Fpl+leQB+NaMoAQbOrHnEXwb 4lT6wEYeUYWKKEihvMrIv0sR2wNfwuFeL7sVnVwcvSkDJ7TmiNpUfqFhcy6BGP9iO8RaaejM0 hHdoPdnnAzpeQE8KMw/nk+NkPWscYAT7/U0XznfiJs8BskdYwYNtiK16tARaTcRR0j+X5gfv6 GGLP6Uyb6iSsNia/CoDCYtw4isCb2R840kder/rIX5hynhFFY9I+CUKcdXUah+fbVrC9nbJTF Gs8DNYL5xWD6cQxocaBIgaQ8lXiOjm2KbKw1E+hbu+HoHY4kUg9W8LyJnlQeiBXoBQessV/QP 4cqzqvYZQ3oI9ZsegmyYoP7P8OQeV/wJTxhTT5mNhbdW3evydqKB/Wvt5yF+faFwh6bMCzf+K fnqs/HqfLciiZICvwTGkDjxxTe4tkkzxZejs/Z073WX808Qp+r0DbxdwUNyNMyeTXQ6g+S1KS Hn4zSq0v8ivrRv7299gkNl8ihgD4PUk7OZw6VL8H5NF4/oQ1hOyky2yApRi8B3n3aAuLx8A7g XEJaQu+ntgoHsmv6uipnRXVC5dcyV1tIS34XJ7Ld4sL+q6EUbFYgR9vCUklCs2D3ErT+cHBsv fLFqviKOPJEhnkyFUfdGbBPQ+T5RCx2iItZgZg== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 07/26] colibri_imx6: clean-up and migrate gpios 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 GPIOs to using driver model, properly request backlight, MMC/SD card detect and USB power enable GPIOs and also enable SION bit in pin muxing for auxiliary, backlight and USB power enable GPIOs. While at it also update copyright year, clean-up/re-order includes, add some comments clarifying ifdef scope and do some white-space clean-up. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 209 ++++++++++++++-------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 135 insertions(+), 75 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 68c0c02a8a..1f5de2f5f6 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -2,39 +2,34 @@ /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices - * Copyright (C) 2014-2016, Toradex AG + * Copyright (C) 2014-2019, Toradex AG * copied from nitrogen6x */ #include #include + #include #include #include -#include -#include #include +#include #include #include #include #include +#include #include #include #include -#include #include -#include #include -#include +#include #include #include -#include #include -#include -#include #include #include -#include #include #include "../common/tdx-cfg-block.h" @@ -173,68 +168,123 @@ static void setup_iomux_enet(void) /* mux auxiliary pins to GPIO, so they can be used from the U-Boot cmdline */ iomux_v3_cfg_t const gpio_pads[] = { /* ADDRESS[17:18] [25] used as GPIO */ - MX6_PAD_KEY_ROW2__GPIO4_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_KEY_COL2__GPIO4_IO10 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_D1__GPIO2_IO01 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_KEY_ROW2__GPIO4_IO11 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_KEY_COL2__GPIO4_IO10 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_D1__GPIO2_IO01 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* ADDRESS[19:24] used as GPIO */ - MX6_PAD_DISP0_DAT23__GPIO5_IO17 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DISP0_DAT22__GPIO5_IO16 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DISP0_DAT21__GPIO5_IO15 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DISP0_DAT20__GPIO5_IO14 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DISP0_DAT19__GPIO5_IO13 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DISP0_DAT18__GPIO5_IO12 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_DISP0_DAT23__GPIO5_IO17 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DISP0_DAT22__GPIO5_IO16 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DISP0_DAT21__GPIO5_IO15 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DISP0_DAT20__GPIO5_IO14 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DISP0_DAT19__GPIO5_IO13 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DISP0_DAT18__GPIO5_IO12 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* DATA[16:29] [31] used as GPIO */ - MX6_PAD_EIM_LBA__GPIO2_IO27 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_BCLK__GPIO6_IO31 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_CS3__GPIO6_IO16 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_CS1__GPIO6_IO14 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_RB0__GPIO6_IO10 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_ALE__GPIO6_IO08 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_WP_B__GPIO6_IO09 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_CS0__GPIO6_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_CLE__GPIO6_IO07 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_CSI0_MCLK__GPIO5_IO19 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_CSI0_PIXCLK__GPIO5_IO18 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_4__GPIO1_IO04 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_5__GPIO1_IO05 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_EIM_LBA__GPIO2_IO27 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_BCLK__GPIO6_IO31 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_CS3__GPIO6_IO16 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_CS1__GPIO6_IO14 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_RB0__GPIO6_IO10 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_ALE__GPIO6_IO08 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_WP_B__GPIO6_IO09 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_CS0__GPIO6_IO11 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_CLE__GPIO6_IO07 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_CSI0_MCLK__GPIO5_IO19 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_CSI0_PIXCLK__GPIO5_IO18 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_4__GPIO1_IO04 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_5__GPIO1_IO05 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* DQM[0:3] used as GPIO */ - MX6_PAD_EIM_EB0__GPIO2_IO28 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_EB1__GPIO2_IO29 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_SD2_DAT2__GPIO1_IO13 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_D0__GPIO2_IO00 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_EIM_EB0__GPIO2_IO28 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_EB1__GPIO2_IO29 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_SD2_DAT2__GPIO1_IO13 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_D0__GPIO2_IO00 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* RDY used as GPIO */ - MX6_PAD_EIM_WAIT__GPIO5_IO00 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_EIM_WAIT__GPIO5_IO00 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* ADDRESS[16] DATA[30] used as GPIO */ - MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(WEAK_PULLDOWN), - MX6_PAD_KEY_COL4__GPIO4_IO14 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(WEAK_PULLDOWN) | + MUX_MODE_SION, + MX6_PAD_KEY_COL4__GPIO4_IO14 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* CSI pins used as GPIO */ - MX6_PAD_EIM_A24__GPIO5_IO04 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_SD2_CMD__GPIO1_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_CS2__GPIO6_IO15 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(WEAK_PULLDOWN), - MX6_PAD_EIM_A23__GPIO6_IO06 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_A17__GPIO2_IO21 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_A18__GPIO2_IO20 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_EB3__GPIO2_IO31 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_D17__GPIO3_IO17 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_SD2_DAT0__GPIO1_IO15 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_EIM_A24__GPIO5_IO04 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_SD2_CMD__GPIO1_IO11 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_CS2__GPIO6_IO15 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(WEAK_PULLDOWN) | + MUX_MODE_SION, + MX6_PAD_EIM_A23__GPIO6_IO06 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_A17__GPIO2_IO21 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_A18__GPIO2_IO20 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_EB3__GPIO2_IO31 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_D17__GPIO3_IO17 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_SD2_DAT0__GPIO1_IO15 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* GPIO */ - MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_D6__GPIO2_IO06 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_D3__GPIO2_IO03 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_ENET_REF_CLK__GPIO1_IO23 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_DI0_PIN4__GPIO4_IO20 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_NANDF_D4__GPIO2_IO04 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_SD4_DAT0__GPIO2_IO08 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_7__GPIO1_IO07 | MUX_PAD_CTRL(WEAK_PULLUP), - MX6_PAD_GPIO_8__GPIO1_IO08 | MUX_PAD_CTRL(WEAK_PULLUP), + MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_D6__GPIO2_IO06 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_D3__GPIO2_IO03 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_ENET_REF_CLK__GPIO1_IO23 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_DI0_PIN4__GPIO4_IO20 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_NANDF_D4__GPIO2_IO04 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_SD4_DAT0__GPIO2_IO08 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_7__GPIO1_IO07 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, + MX6_PAD_GPIO_8__GPIO1_IO08 | MUX_PAD_CTRL(WEAK_PULLUP) | + MUX_MODE_SION, /* USBH_OC */ MX6_PAD_EIM_D30__GPIO3_IO30 | MUX_PAD_CTRL(WEAK_PULLUP), /* USBC_ID */ @@ -249,8 +299,8 @@ static void setup_iomux_gpio(void) } iomux_v3_cfg_t const usb_pads[] = { - /* USB_PE */ - MX6_PAD_EIM_D31__GPIO3_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL), + /* USBH_PEN */ + MX6_PAD_EIM_D31__GPIO3_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL) | MUX_MODE_SION, # define GPIO_USBH_EN IMX_GPIO_NR(3, 31) }; @@ -292,6 +342,7 @@ int board_ehci_power(int port, int on) case 1: /* Control MXM USBH */ /* Set MXM USBH power enable, '0' means on */ + gpio_request(GPIO_USBH_EN, "USBH_EN"); gpio_direction_output(GPIO_USBH_EN, !on); mdelay(100); break; @@ -300,7 +351,7 @@ int board_ehci_power(int port, int on) } return 0; } -#endif +#endif /* CONFIG_USB_EHCI_MX6 */ #ifdef CONFIG_FSL_ESDHC /* use the following sequence: eMMC, MMC */ @@ -316,6 +367,7 @@ int board_mmc_getcd(struct mmc *mmc) switch (cfg->esdhc_base) { case USDHC1_BASE_ADDR: + gpio_request(GPIO_MMC_CD, "MMC_CD"); gpio_direction_input(GPIO_MMC_CD); ret = !gpio_get_value(GPIO_MMC_CD); break; @@ -356,7 +408,7 @@ int board_mmc_init(bd_t *bis) } return status; -#else +#else /* !CONFIG_SPL_BUILD */ struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned reg = readl(&psrc->sbmr1) >> 11; /* @@ -388,9 +440,9 @@ int board_mmc_init(bd_t *bis) } return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -#endif +#endif /* !CONFIG_SPL_BUILD */ } -#endif +#endif /* CONFIG_FSL_ESDHC */ int board_phy_config(struct phy_device *phydev) { @@ -412,6 +464,7 @@ int board_eth_init(bd_t *bis) ret = enable_fec_anatop_clock(0, ENET_50MHZ); if (ret) return ret; + /* set gpr1[ENET_CLK_SEL] */ setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_ENET_CLK_SEL_MASK); @@ -421,6 +474,7 @@ int board_eth_init(bd_t *bis) bus = fec_get_miibus(base, -1); if (!bus) return 0; + /* scan PHY 1..7 */ phydev = phy_find_by_mask(bus, 0xff, PHY_INTERFACE_MODE_RMII); if (!phydev) { @@ -428,6 +482,7 @@ int board_eth_init(bd_t *bis) puts("no PHY found\n"); return 0; } + phy_reset(phydev); printf("using PHY at %d\n", phydev->addr); ret = fec_probe(bis, -1, base, bus, phydev); @@ -436,7 +491,8 @@ int board_eth_init(bd_t *bis) free(phydev); free(bus); } -#endif +#endif /* CONFIG_FEC_MXC */ + return 0; } @@ -452,11 +508,12 @@ static iomux_v3_cfg_t const pwr_intb_pads[] = { static iomux_v3_cfg_t const backlight_pads[] = { /* Backlight On */ - MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(NO_PAD_CTRL), + MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(NO_PAD_CTRL) | MUX_MODE_SION, #define RGB_BACKLIGHT_GP IMX_GPIO_NR(3, 26) /* Backlight PWM, used as GPIO in U-Boot */ MX6_PAD_EIM_A22__GPIO2_IO16 | MUX_PAD_CTRL(NO_PULLUP), - MX6_PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), + MX6_PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL) | + MUX_MODE_SION, #define RGB_BACKLIGHTPWM_GP IMX_GPIO_NR(2, 9) }; @@ -619,6 +676,8 @@ static void setup_display(void) imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); /* use 0 for EDT 7", use 1 for LG fullHD panel */ + gpio_request(RGB_BACKLIGHTPWM_GP, "PWM"); + gpio_request(RGB_BACKLIGHT_GP, "BL_ON"); gpio_direction_output(RGB_BACKLIGHTPWM_GP, 0); gpio_direction_output(RGB_BACKLIGHT_GP, 1); } @@ -1108,7 +1167,7 @@ void reset_cpu(ulong addr) { } -#endif +#endif /* CONFIG_SPL_BUILD */ static struct mxc_serial_platdata mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 47e05b0b26..27b85c61dc 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -50,6 +50,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_DM_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y From patchwork Fri Feb 8 17:42: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: 1038845 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 43x2jQ3M94z9sMp for ; Sat, 9 Feb 2019 04:48:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 27743C2204C; Fri, 8 Feb 2019 17:46:31 +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 33BB6C2207E; Fri, 8 Feb 2019 17:43:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 778E6C2203E; Fri, 8 Feb 2019 17:42:54 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 79719C2203E for ; Fri, 8 Feb 2019 17:42:50 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M9qSE-1gyih43Ivg-00B0qH; Fri, 08 Feb 2019 18:42:47 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:11 +0100 Message-Id: <20190208174229.23562-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7ZSIJe/Q/oNYhkVom2Wh5qpSk5qOAhKjegi5RvRRUgvakoieK48 rIp8o+fgNYylkhzu9TArV+c5kzz9qpwz3wYyl2Rh//8iPguGhcNIZDQYz0WGy5Cp4h5Rmce TjVSVr1oYIDSGjYxH7Ve4aA+UMH+WHE90SVsqAK+DulyUEUjF0O/1qAxR+aDypB1Czqk6nQ bqeetxX99iqKpgcgcU5Jg== X-UI-Out-Filterresults: notjunk:1; V03:K0:uO1gEuWj9ys=:zUJyOjRC8eGu6P02AzPAN3 N9bVfuzvhNN99pk5nhgGCfD9JBAvT1RC1EU7abvCUvXyr+aaFP2+9LhZ8g0bFjV1Hju4SzGqR R8TFrkhjqK1TnvsJHb8zOAQ8mKKNUFUumKbInd+nqJMckm1XIjE245KNE5tTOB4lIy9ANFAKY TqZsi+atHbIWd4R+XC58xt9LEkhT7mewb30AdZ5NKFvPASWZWgrYp/kLtwipqHT7OcPANZeK4 QlBpZPXTaXuJ0NJJ21Z1sqpWc7dVtYbCzNxP0IYYRZBTYWa2qaTZwFFzYLtzHHaWIYmi5J5Xm sWJIUvN95X+1DFo7DJQCUbuTjjEANmL4QkTPNdgkv0gl8YTO3KVHOzNARY12283OUuKN7Bbvk BqSUpeQHfb6CcAdHwnvWmR7JMJxdU3cp/2oXLQlcwvF0XbYPG6eyR+ZJN8DHQr5Mg5hsLpt4Y nZgAZf6xQzcxA8fg7IsmOqzUh3iti0RpKzZgHP0jAODbcrmGDq6v0GknSA3u88UQRdF8lZHys dG2dyPfD3yfQrkZhQb8JHVaBRTUfLBS5gVF3vHNLxJyafqWxDCW+8pQtwt5C0Ffx6+nHncQtw /13n6Td7skgoB1/At4wGH0VXp65LSqJKBytRbNbnoOBx8PQVs/Nteow/UzEGhBph7K90H8286 iIvB4j1hsYA9tPP8lcX4vPofuvChYIuzmPe5OL9sb2cLmarEPBwLDaRhG3LmA1a0XXdGlOWK2 Rn22p+6aUkS9GnghfEUg6Y2K45+8rKP8ceSpFA== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 08/26] colibri_imx6: enable pin control driver 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 Enable pin control driver as required for further driver model migration. Signed-off-by: Marcel Ziswiler --- configs/colibri_imx6_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 27b85c61dc..481d65329f 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -55,6 +55,8 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_MII=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y From patchwork Fri Feb 8 17:42: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: 1038870 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 43x2m35qF7z9sMp for ; Sat, 9 Feb 2019 04:50:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 476D2C2206A; Fri, 8 Feb 2019 17:45: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.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 C5786C2203C; Fri, 8 Feb 2019 17:43:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B457C22024; Fri, 8 Feb 2019 17:42:54 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 41364C22059 for ; Fri, 8 Feb 2019 17:42:51 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lu5S4-1hHty53HJW-011SH9; Fri, 08 Feb 2019 18:42:48 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:12 +0100 Message-Id: <20190208174229.23562-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VqugsEUpP4psTdQymgX0q7TwHWmXeXi7ZMMfl5Rn1ibgA6QbaS6 Rn42v4hYoGaFAjdVtscJUiWtLVRPxV//6kjznF0HRiE1FVDsvqwovXm4Kj/1nCfu8H3KneJ BpcH6iaWr31qXnBbLrQkxSzi9qnZsQqimlQIH2bCaihFC/n+t/7Q4gu6bf0OccWE3O5gf8H 3E3mK6FsZxT6/EcyZd6Cg== X-UI-Out-Filterresults: notjunk:1; V03:K0:tej0/oSTXWE=:Vmzlmo5aVUuWM8at6B7UWr OBqf2PhgwwCifOPjruXt2ffW0pus3BQG6mIpAP8h/VTZSqbgzaFpQemrCC2LAvq39x3Z7XRgV snks2Ap8b2KyMXbjKSClwtWZw0k6pqFEnAoOjeu3N7vuopD8ju34dqnpwOx//sQ2SOUOVYRB8 6Z8PxOz+Z6+GmEyOKeoKyknkbQXZm94IttrY7gCvC8s55tP++/rQ3wxUxdTxTVpDXJfaX+6tz bvkt6QeN2t8xcj6u4AqaBIkbbstaYaykkFXoCORZufAMk0PK913b2iZjVT1ODWPaAVU6hbpty 1yvf3bGbev9EBD0t3kFZ9qF8ompH9i4FNZeM7c02fQmzyVMZkbemooBTxBVI3igW7OJkUL0J6 WoxLgYdUJzEpAlPk9L2BrAWbTEUpPrT0lX0Kfw3sKsn0Vz3ib+EDpO8MjWd2v29Uyy16I/GC8 YL2IUKpxQP+P3Z9OY9uQrStb3SRUthvfBdn/R23FqmUzV/JlTakdly0itEeG41zGIJOZxMt5a EfnyHz3QjuyLKk7Yy596rI2puuKUTlj2Rtm9O0f7o0RhGxTQZpiACB/AleBxbhi1KTUowKvPJ I6UNhAwWF6PtDKKMhZ39j6H8abgUzZyHj6zg6g9LEfUJS79ah/ZLSSquaPcjsIpSk2pcduehz Gk4OKbAsvlj3Zd2EzrL3ZnN9QnYLDqXSjODEg9a/fhxt46B/o7G2b5u2CsWBs7IsWWSFt1twj wLHJxPfdXdijRgE/xahQ/d1gzyRw52vvDvFjRA== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 09/26] colibri_imx6: migrate i2c 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 I2C to using driver model. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 50 +-------------------- board/toradex/colibri_imx6/pf0100.c | 54 ++++++++++++----------- configs/colibri_imx6_defconfig | 1 + include/configs/colibri_imx6.h | 8 ++-- 4 files changed, 36 insertions(+), 77 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 1f5de2f5f6..f5cfeb30bc 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -20,13 +20,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -50,16 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; #define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -#define BUTTON_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE | PAD_CTL_SRE_FAST) - #define WEAK_PULLUP (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ PAD_CTL_SRE_SLOW) @@ -72,8 +60,6 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ PAD_CTL_HYS | PAD_CTL_SRE_SLOW) -#define OUTPUT_40OHM (PAD_CTL_SPEED_MED|PAD_CTL_DSE_40ohm) - #define OUTPUT_RGB (PAD_CTL_SPEED_MED|PAD_CTL_DSE_60ohm|PAD_CTL_SRE_FAST) int dram_init(void) @@ -91,36 +77,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) -/* Colibri I2C */ -struct i2c_pads_info i2c_pad_info1 = { - .scl = { - .i2c_mode = MX6_PAD_GPIO_3__I2C3_SCL | PC, - .gpio_mode = MX6_PAD_GPIO_3__GPIO1_IO03 | PC, - .gp = IMX_GPIO_NR(1, 3) - }, - .sda = { - .i2c_mode = MX6_PAD_GPIO_6__I2C3_SDA | PC, - .gpio_mode = MX6_PAD_GPIO_6__GPIO1_IO06 | PC, - .gp = IMX_GPIO_NR(1, 6) - } -}; - -/* Colibri local, PMIC, SGTL5000, STMPE811 */ -struct i2c_pads_info i2c_pad_info_loc = { - .scl = { - .i2c_mode = MX6_PAD_EIM_EB2__I2C2_SCL | PC, - .gpio_mode = MX6_PAD_EIM_EB2__GPIO2_IO30 | PC, - .gp = IMX_GPIO_NR(2, 30) - }, - .sda = { - .i2c_mode = MX6_PAD_EIM_D16__I2C2_SDA | PC, - .gpio_mode = MX6_PAD_EIM_D16__GPIO3_IO16 | PC, - .gp = IMX_GPIO_NR(3, 16) - } -}; - -/* Apalis MMC */ +/* Colibri MMC */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -706,9 +663,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info_loc); - #if defined(CONFIG_VIDEO_IPUV3) setup_display(); #endif @@ -1141,7 +1095,7 @@ void board_init_f(ulong dummy) ccgr_init(); gpr_init(); - /* iomux and setup of i2c */ + /* iomux */ board_early_init_f(); /* setup GP timer */ diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index fa63865670..5e411f1743 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2014-2016, Toradex AG + * Copyright (C) 2014-2019, Toradex AG */ /* @@ -29,22 +29,25 @@ static __maybe_unused iomux_v3_cfg_t const pmic_prog_pads[] = { unsigned pmic_init(void) { + int rc; + struct udevice *dev = NULL; unsigned programmed = 0; uchar bus = 1; uchar devid, revid, val; puts("PMIC: "); - if (!((0 == i2c_set_bus_num(bus)) && - (0 == i2c_probe(PFUZE100_I2C_ADDR)))) { - puts("i2c bus failed\n"); + rc = i2c_get_chip_for_busnum(bus, PFUZE100_I2C_ADDR, 1, &dev); + if (rc) { + printf("failed to get device for PMIC at address 0x%x\n", + PFUZE100_I2C_ADDR); return 0; } /* get device ident */ - if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_DEVICEID, 1, &devid, 1) < 0) { + if (dm_i2c_read(dev, PFUZE100_DEVICEID, &devid, 1) < 0) { puts("i2c pmic devid read failed\n"); return 0; } - if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_REVID, 1, &revid, 1) < 0) { + if (dm_i2c_read(dev, PFUZE100_REVID, &revid, 1) < 0) { puts("i2c pmic revid read failed\n"); return 0; } @@ -52,14 +55,14 @@ unsigned pmic_init(void) #ifdef DEBUG { - unsigned i, j; + unsigned int i, j; for (i = 0; i < 16; i++) printf("\t%x", i); for (j = 0; j < 0x80; ) { printf("\n%2x", j); for (i = 0; i < 16; i++) { - i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); + dm_i2c_read(dev, j + i, &val, 1); printf("\t%2x", val); } j += 0x10; @@ -67,8 +70,7 @@ unsigned pmic_init(void) printf("\nEXT Page 1"); val = PFUZE100_PAGE_REGISTER_PAGE1; - if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, - &val, 1)) { + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { puts("i2c write failed\n"); return 0; } @@ -76,7 +78,7 @@ unsigned pmic_init(void) for (j = 0x80; j < 0x100; ) { printf("\n%2x", j); for (i = 0; i < 16; i++) { - i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); + dm_i2c_read(dev, j + i, &val, 1); printf("\t%2x", val); } j += 0x10; @@ -84,8 +86,7 @@ unsigned pmic_init(void) printf("\nEXT Page 2"); val = PFUZE100_PAGE_REGISTER_PAGE2; - if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, - &val, 1)) { + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { puts("i2c write failed\n"); return 0; } @@ -93,35 +94,36 @@ unsigned pmic_init(void) for (j = 0x80; j < 0x100; ) { printf("\n%2x", j); for (i = 0; i < 16; i++) { - i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); + dm_i2c_read(dev, j + i, &val, 1); printf("\t%2x", val); } j += 0x10; } printf("\n"); } -#endif +#endif /* DEBUG */ + /* get device programmed state */ val = PFUZE100_PAGE_REGISTER_PAGE1; - if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, &val, 1)) { + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { puts("i2c write failed\n"); return 0; } - if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR1, 1, &val, 1) < 0) { + if (dm_i2c_read(dev, PFUZE100_FUSE_POR1, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return 0; } if (val & PFUZE100_FUSE_POR_M) programmed++; - if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR2, 1, &val, 1) < 0) { + if (dm_i2c_read(dev, PFUZE100_FUSE_POR2, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return programmed; } if (val & PFUZE100_FUSE_POR_M) programmed++; - if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR3, 1, &val, 1) < 0) { + if (dm_i2c_read(dev, PFUZE100_FUSE_POR3, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return programmed; } @@ -146,6 +148,8 @@ unsigned pmic_init(void) #ifndef CONFIG_SPL_BUILD static int pf0100_prog(void) { + int rc; + struct udevice *dev = NULL; unsigned char bus = 1; unsigned char val; unsigned int i; @@ -159,9 +163,10 @@ static int pf0100_prog(void) ARRAY_SIZE(pmic_prog_pads)); gpio_direction_output(PMIC_PROG_VOLTAGE, 0); - if (!((0 == i2c_set_bus_num(bus)) && - (0 == i2c_probe(PFUZE100_I2C_ADDR)))) { - puts("i2c bus failed\n"); + rc = i2c_get_chip_for_busnum(bus, PFUZE100_I2C_ADDR, 1, &dev); + if (rc) { + printf("failed to get device for PMIC at address 0x%x\n", + PFUZE100_I2C_ADDR); return CMD_RET_FAILURE; } @@ -169,8 +174,7 @@ static int pf0100_prog(void) switch (pmic_otp_prog[i].cmd) { case pmic_i2c: val = (unsigned char) (pmic_otp_prog[i].value & 0xff); - if (i2c_write(PFUZE100_I2C_ADDR, pmic_otp_prog[i].reg, - 1, &val, 1)) { + if (dm_i2c_write(dev, pmic_otp_prog[i].reg, &val, 1)) { printf("i2c write failed, reg 0x%2x, value 0x%2x\n", pmic_otp_prog[i].reg, val); return CMD_RET_FAILURE; @@ -209,4 +213,4 @@ U_BOOT_CMD( "Program the OTP fuses on the PMIC PF0100", "" ); -#endif +#endif /* CONFIG_SPL_BUILD */ diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 481d65329f..dea6ca6270 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -51,6 +51,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f029a885d2..e51ec8516f 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -32,12 +32,12 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* I2C Configs */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ -#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ +#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_MXC_I2C3_SPEED 400000 /* OCOTP Configs */ #ifdef CONFIG_CMD_FUSE From patchwork Fri Feb 8 17:42: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: 1038840 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 43x2fq4dghz9sDr for ; Sat, 9 Feb 2019 04:46:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1DDADC22074; Fri, 8 Feb 2019 17:45:10 +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 854F3C22052; Fri, 8 Feb 2019 17:43:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 57FDFC22067; Fri, 8 Feb 2019 17:42:56 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 68A25C22066 for ; Fri, 8 Feb 2019 17:42:52 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MSsEt-1gi1Bl3FkT-00RqCy; Fri, 08 Feb 2019 18:42:49 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:13 +0100 Message-Id: <20190208174229.23562-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:tdw1SM1Lp7a/TaDnqibzTztrG2Px/2qUka3M/LasmRBYa/wI6gM mHkGiaO2T86jxiMELZN7H7YAkGruk5W6ixj6SH95rmzZF85msqUFZdIOcocSQlgL6zzRMCY P9GoEiblIJL2HfHl4TUDNxtMxYLzRzd4+WmtyeWJUM46tiRsW4vjvkZfrTvzJFfMZ6TcJ43 03RtVVDQcw92XjC3PjRpw== X-UI-Out-Filterresults: notjunk:1; V03:K0:xXnvKDTzJhU=:Te6eJFseYP/IDKjc4OwjTM pP9K4+kv7+eGC62EZhQrdJ+eiWYr5w40JNH6s8+1vLhqUfZu2iE6QyZUd10MVYDqzxu3qRzlF x6UZmzvnhnVxEjhA9l5m0E/m6jBX+7R42VGLlVrMSo/s8VgZ3yrGQMVKOpmXbPbliE9E8OzYr T62pFFNa22V1kGI0TsaR9C0bZMPopKlZ2VTUDwqveu5l1Fzzw37i7jVX/sY+bJLyTqikrh7bJ gzvK5DMPTIPKll5vZC/lnp0uTeke5FqtDY5hKQxfHM2ufBswzgm255547JHPJoz/n/mJeN9dq 3m1JAhAsXJzcomX1vD1ldLJG6v8kd+9MHTmDF2iNFABOnJcINk9TubO0jgBKg9Af60aiE83rs Bm7Q13TbzRyMIftsCAqTakwsj/rrCz1NWiTcGlElbG+8OYYLav9Xhq5mCwz3/BwzuX/rplO5y sEFRysKpU1yS7QYCYXw4FmSM5I83ejjH/ZKB4zCSYU2ZPwVnVdRHtf63f/JmzSEsy3sEm4thw R6cjyeTZe2hqU0EoMlvgJ/8yIxQA2F+M5duMkIqY82lOTu6KF16ViA6a0JoPh6ZcYC77/pR0y jygFhBcCLxCNRx53ErmtRoAemC2y3ojJpIDA9M75wbLG+m3N57HdskHdB6Uxa0BMqnNjTYxPt K6h2ur0lz6e4+AhCClhoMKyNlfeuo6IPXIND8XT4UQ13snsKqK2v+438EOUiXccGOxSz8cC2K Bgo0EVGD5g4OsOOe+UyM5SmpPIZxsBQu+KinmA== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 10/26] colibri_imx6: migrate pmic and regulator 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 PMIC and regulator to using driver model. Signed-off-by: Marcel Ziswiler --- configs/colibri_imx6_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index dea6ca6270..6fd050a99f 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -45,6 +45,8 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" CONFIG_ENV_IS_IN_MMC=y @@ -58,6 +60,11 @@ CONFIG_PHY_MICREL=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y From patchwork Fri Feb 8 17:42: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: 1038844 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 43x2hm1vJYz9sMp for ; Sat, 9 Feb 2019 04:48:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D411BC2206A; Fri, 8 Feb 2019 17:46:04 +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 4F114C22031; Fri, 8 Feb 2019 17:43:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EC319C2205F; Fri, 8 Feb 2019 17:42:57 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 3A951C2203F for ; Fri, 8 Feb 2019 17:42:53 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Le3w2-1hSG4z3Ghg-00prQz; Fri, 08 Feb 2019 18:42:50 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:14 +0100 Message-Id: <20190208174229.23562-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3Sv37vE08udQ569jSb3Yz00meyJJicazbSKgRBhGKbhgrMPx7dY 7b8mjxNeGMOHDiN5dARYPCibG+dwMQinKcjrDviwHXFpj3WUT+SNX7xwJMqSAIeEqK9lOeM hRQkR0KCuqqBGv7/dkwFhlktbjSNZFEC83sb+MnHzbnUI44xJp7e/dSQZ8T0OfkAfUkyG+J zP6LTwMRMzKThtu5qRdIg== X-UI-Out-Filterresults: notjunk:1; V03:K0:6ClnMUdbN/8=:ZMPGmAmTWDjBOvVhQfG8FM JlbI0dIIUTNbTiZK9mgSJ6EPZ0FDAQKb2GTlnEdWqANEjRGCRbLFb8SFX8nAnP3V9C9vb2fQ7 0atKwW1ZIVAMCmDc8WMRUMi7/l8CIOcVKLRwRRpTnjIKqRorQ6JXPEUenfvuEQ8uBhRXkIvW4 ljexAZhneKN5SAKCntxAQdxeOgEi2Lk1xjoiSlQA3zVJX1zvN3VDIFXi3YfUvCpxhGvHmU8Zc 2SfJ6vXKygrh2l1Uh3D3cr4GrfHepifa4Fv7C5LdPYt2mEMg3cL+NA2h34o36KHvMFEM/w4H2 zBCdRLfxvd25N/53VlCVHEWo1mLWRAODSXYd2TuBOLyK725Lsyq+0Ix46UVtqKKLsrlBRr+Ji HFWFuwnKJE+tqLM7FJmBr/Q3PB/sQ33YccEFQLk18/dtbeIfCFHhfH9yvbpTok+zn0+EtrGxe /qjiaGSkzHRJRYcxM65zCDI8c3ONGMqLckkwhT1FPY8OkUCmddqxyqvT3ViP7UoQgN956h0DX X1bg/Eemw5gp8t3dUllEZ/+tgtEPI/JooTEJnMDwI2rTAVAK1U2zCuwvb41YfJPPcqwAm1ktH RKWQuK4UDYrWazZJbpOekmtmqiQySOpCqiYFdIOCtyF4fCOuIn4em3fuF+9gjsoZpTuFKn+ZF MJjtC/HgcZo+5KrZN3EL94GMm+7DEvfha6mHFVnIqO3wLwSYoqTiTcvY+grDhDs2akADgUKBK 19xxrEYcX8DSV0TfZM77ha9hCfu1p8lmHX/8Iw== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 11/26] colibri_imx6: 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. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 38 +++-------------------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index f5cfeb30bc..ef4dd0c87c 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -77,6 +77,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; +#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) /* Colibri MMC */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -103,6 +104,7 @@ iomux_v3_cfg_t const usdhc3_pads[] = { MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD3_RST__SD3_RESET | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; +#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ iomux_v3_cfg_t const enet_pads[] = { MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), @@ -310,7 +312,7 @@ int board_ehci_power(int port, int on) } #endif /* CONFIG_USB_EHCI_MX6 */ -#ifdef CONFIG_FSL_ESDHC +#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) /* use the following sequence: eMMC, MMC */ struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC3_BASE_ADDR}, @@ -335,37 +337,6 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { -#ifndef CONFIG_SPL_BUILD - s32 status = 0; - u32 index = 0; - - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - - usdhc_cfg[0].max_bus_width = 8; - usdhc_cfg[1].max_bus_width = 4; - - for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { - switch (index) { - case 0: - imx_iomux_v3_setup_multiple_pads( - usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - break; - case 1: - imx_iomux_v3_setup_multiple_pads( - usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); - break; - default: - printf("Warning: you configured more USDHC controllers (%d) then supported by the board (%d)\n", - index + 1, CONFIG_SYS_FSL_USDHC_NUM); - return status; - } - - status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]); - } - - return status; -#else /* !CONFIG_SPL_BUILD */ struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned reg = readl(&psrc->sbmr1) >> 11; /* @@ -397,9 +368,8 @@ int board_mmc_init(bd_t *bis) } return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -#endif /* !CONFIG_SPL_BUILD */ } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ int board_phy_config(struct phy_device *phydev) { diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 6fd050a99f..2ab7db44a8 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -54,6 +54,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y From patchwork Fri Feb 8 17:42: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: 1038842 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 43x2gP508Pz9sDr for ; Sat, 9 Feb 2019 04:46:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4F209C22067; Fri, 8 Feb 2019 17:44:54 +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 F3FFAC2202D; Fri, 8 Feb 2019 17:43:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 62EFBC22051; Fri, 8 Feb 2019 17:42:58 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 7C723C22064 for ; Fri, 8 Feb 2019 17:42:54 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0ML8yt-1grt3j3Lqj-000JTc; Fri, 08 Feb 2019 18:42:51 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:15 +0100 Message-Id: <20190208174229.23562-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6sInNF40wWvMk5DxbmkriNpIbtJNS06yhAzt43mGpazC/+Ne5rv mLnOQPGRZW1v4ilLZzHTsi2N2zsSM+Kgzatp9Gd22+zzTvl/noZ3vbcRLJLb+J99bshgOcA 2qZeGu4631lBc8Sx0qRKLpkn5KZymT1nrNzJwPmLKbBezJJjGZ+SQYx99+bGG/0ylPcpMUF TEXVFaWp79Oy50bWp+rYw== X-UI-Out-Filterresults: notjunk:1; V03:K0:BNuY1iI9HQc=:Kr/Op/GkFugl0OJ0vEo09I DCiLWfQR8JrZGN39SFMqjT4MhDCNpw2Fbux2BJFRtUWS5j4v9o5A5GYcxSOli1oAOAAIWQpeH Fnd2ObE9syG0Zka9EmH6tTnm/HIbQk8tiOAci50Lnyo1+lj0FlJrOpZdpOwIRndzUJUwpysAl /hCwmHwyGIHhABEnl1goFNr/wySST7rhWemoG9iSgcr6XGTjoa1nXGXOfTn50WXWftI9pePLG wvQfcVqpwGFXpkAULLkzlCHSUZQtMQlfl0SSj20ZETt5mz1N+3H2dFDDnCfAUVPlzJuRVM6er 4G98JTqEvKnwcf6tyj8pLTH4278OpUv/8gfy6CmX8KYx39c9XHdA2/nevTfbpWy9yQmvZx2/u oBe+R2aCOL0lxpEILw4n3aP76SZ7QFLFMbTg36QFNWYLtzuZStjszLryxpeSRWGvOTOWfPPl4 Pfl4u74w9FmWZlu7kcJenNKjLfb60zE84oFClfpW8sXlE1bGIGuI7pzuAYQ7RNstYkO7XuUIt 4B3VxpHB+mSz8HFWLYc1RHv7jYZf0KY06mb/S5XHHgqLeCn+CGWxzzGG+08k019mSpv8LXQxa 2lMCh6PwQYJeaxMIpFw7hTOgc78/0D64nNhfeCa1FH54CySdetxHazsu4uftpsFanAPku2MdL 5b9AN5EQr53DKLBVxRIqI/h4IviBRrtBHr1UVh2TdA1+7Gh429Vx6rqkP8WLbxCOTZ3f1LDxH 5zg3tkcLHTPA9ZkIfdPQ9efZe1Cab996Ldhx9Q== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 12/26] colibri_imx6: 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. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 23 +---------------------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index ef4dd0c87c..adb5a3df4c 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -289,28 +289,7 @@ int board_ehci_hcd_init(int port) imx_iomux_v3_setup_multiple_pads(usb_pads, ARRAY_SIZE(usb_pads)); return 0; } - -int board_ehci_power(int port, int on) -{ - switch (port) { - case 0: - /* control OTG power */ - /* No special PE for USBC, always on when ID pin signals - host mode */ - break; - case 1: - /* Control MXM USBH */ - /* Set MXM USBH power enable, '0' means on */ - gpio_request(GPIO_USBH_EN, "USBH_EN"); - gpio_direction_output(GPIO_USBH_EN, !on); - mdelay(100); - break; - default: - break; - } - return 0; -} -#endif /* CONFIG_USB_EHCI_MX6 */ +#endif #if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) /* use the following sequence: eMMC, MMC */ diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 2ab7db44a8..df5a7be39f 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -68,6 +68,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" From patchwork Fri Feb 8 17:42: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: 1038881 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 43x2vH6M12z9sMr for ; Sat, 9 Feb 2019 04:57:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9AE86C220A0; Fri, 8 Feb 2019 17:52: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 D98DAC220A5; Fri, 8 Feb 2019 17:44:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5BD8C22099; Fri, 8 Feb 2019 17:42:59 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 74677C22016 for ; Fri, 8 Feb 2019 17:42:55 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LmdAz-1hRUj23N9H-00aCWg; Fri, 08 Feb 2019 18:42:52 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:16 +0100 Message-Id: <20190208174229.23562-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:k4vpdTWq8XGbLg/iqc4IaodpN7XC6OLl9NrcDgrOOQWViyvhh/T xaW4007j//z3eJDgZM6fjQ9ZtZkrDJAYmM4GqKJfqVGHPKmRxyD9UQRYpRAkZ8mf3TL0L5u NGIOkq1UnYU7L7z29bpMBya4YG8HIAOUe5jopxF4RRq57o+eQ6QcihmZBydu2I0fzheR5Hb zXU8iyj2H7yMFea19JUxw== X-UI-Out-Filterresults: notjunk:1; V03:K0:KMrIGWVgXKc=:ZDe/8EMVTlY5vAMbnZdZ99 V4unI98jVj/56rjFgJVrvUcXhuXUfyJlt1vCcPs6ZcoEbVXhEW8DK79J5vkiR4J/HWVUgPJ+k hp8LpvFg6uUd0jkDPfQAdB7XLuVoBqpFA4qkRD/MTTt5TM5ig55GGRS09ZDDYjF7DBdCuZ4US 5jHZRirnrxYO2yplwbhsaPob9onq/bHXre2ook3UPuWeeB87sf6gh0IuDCaUCxevE31GU1zp3 FB0cW5FzU3xMNUL+Gl806qY5B+rb9OLUvoIfWpM7p6KaDVJFDesdBzISSsM9epykoyY/JG+dW KXYe6fBZkH8oPXPmrSSQQZelPGfQxqCn+jNmMyNmFjsuL6cLbAtigJzcVmh5i2ktfSTa4Jxoy F5tX7r+89AkoCHuZ0FEhvV7ouZXHwNaa052m+rmbD9eufakM5gjoPHYhlNIRYojS6UXZ/DAbe 8xZ1itkYcOZsXSHtayVgk5B2lezMCZc5sVP30lp0NaNNpyg+9V6kJdygLu3+CPmHACWo8Skw9 wKrN8BoEBm/CRr/wTDG6Fv2tBAWYXQKdXi6vXSx4M9oSB+sPYhpRv5vjdRrdy0CEMaiJBvg2b 5pksVaR+BD8ZCc9e/P9Kw8IuNoPVAAncJhn00EFBnsxtiQ9xSJbYy4OypDKgLEgN93YCnClvT 7TFPkfNxGzQkIPYKnOkcfAyeXqbqpebKFK242G8ZQ/iU/0fON9YTk8XG84LBGteEUL5keLLVy 2fhrTIJSjUOILV27TF6PGKqm50xv4tkDWaBlWA== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 13/26] colibri_imx6: drop CONFIG_OF_SYSTEM_SETUP 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: Max Krummenacher This doesn't do anything anymore, probably never did. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 7 ------- include/configs/colibri_imx6.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index adb5a3df4c..83ecd20b3d 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -646,13 +646,6 @@ int board_late_init(void) } #endif /* CONFIG_BOARD_LATE_INIT */ -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_SYSTEM_SETUP) -int ft_system_setup(void *blob, bd_t *bd) -{ - return 0; -} -#endif - int checkboard(void) { char it[] = " IT"; diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index e51ec8516f..c782b2924c 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -237,8 +237,6 @@ #define CONFIG_SYS_MMC_ENV_PART 1 #endif -#define CONFIG_OF_SYSTEM_SETUP - #define CONFIG_CMD_TIME #endif /* __CONFIG_H */ From patchwork Fri Feb 8 17:42: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: 1038882 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 43x2vj6Hkwz9sMp for ; Sat, 9 Feb 2019 04:57:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4F604C2202B; Fri, 8 Feb 2019 17:52:39 +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 33D24C220A1; Fri, 8 Feb 2019 17:43:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B02BCC2209C; Fri, 8 Feb 2019 17:43:00 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 66974C22063 for ; Fri, 8 Feb 2019 17:42:56 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MFrWa-1gvxGc3MWs-00ErvT; Fri, 08 Feb 2019 18:42:53 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:17 +0100 Message-Id: <20190208174229.23562-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xy2/jaFiLOCTbmdtOjeq+aRym2ALoh7wYz5J2AhEKhfLR6uxiJJ t+s3T67FiflMuIIDjrAGspOV8il+VZ0yBIlorakvwlcG3S5o+ABiR5KRNktDc2YG/OXHvBt QLbB4vjyD9bRHboNZymEkJaD01MbsYtGqKxhpmGcx/7uQ8pcF3t/fhpqdeL6XA1NSEOV5Cg FxX3udC/xoLIMnWGBziLw== X-UI-Out-Filterresults: notjunk:1; V03:K0:76WyUeAS00w=:neKU2EABsMUC4O8/+SJV2s rjI12WOZ7YaHeGeS7bbJkwsBhlBA2t+sTcSH9oDPIMiDsipEwtPL1V0MNdyLdCN0hwk2sJHun H2KtBgocAA5MkTk7j6DoDytJ/46L6oIRpfufeQ27iUSwgueJ+2SToJR58bBvJcDOkGBoxJJYZ P9kJec+2OJ633HCmJ3iqWwUdPdvkpdFJKFc6NVL9MMXKvo7dJac/a339Yk6yCBZPr1IHeLGhd 6a5l2+0yvb2/ZUd1R6jHut8myjmWn6nhb557TJu7HJtQpfeQzFrKFTtA0vPac/Zhd7/n1iYnV QzicgOUMxZB7YnDeiPdAL1BMbWLsqwzjIk2OBn7tdoT8GcMz1xC/K4UZGJHp1CG2nFY8uOF/2 B+pab6xd+MF5P47vZ0AYC0GC5VoC+DPbpUmaoDR0ch9gFxMhAzRpay6w/HFbrXBvGthSnBEjl 0ExbI2kuj+MxL0XbdJUt3voUQQXmt5KAscSxhlb5hKTDV71SBvfS1H8nECcTucxjBs2Y0hBZ3 157VJPtM8PGRNckKFs3gYIagH58gFyORS14xd9GaE/GjMp+k70/7T8Pux9QgU+2AQ40ssFn2A 4xiUXR7kpu05Jbx4mi2m+Doa54ZL4JtYrq8mk4weOlZJiO7FHaiP+kMcW8tvFtBuEj7PsdSmp lDRaWvi6MZQmGgl8M0PG5m27Z+6yHx0XFftVaw14gek4ToqdU8/vQvgc5N1i2SI7PXcUp2P/D 2QSqwCWiarfExBWpaiFcwn/XCFGHi0q2OdnIaw== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 14/26] colibri_imx6: print also 64-bit IT 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: Max Krummenacher Print also for Colibri iMX6 512MB IT with 64-bit RAM bus. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 83ecd20b3d..439d38bc29 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1019,6 +1019,7 @@ static void spl_dram_init(void) case TEMP_AUTOMOTIVE: default: if (is_cpu_type(MXC_CPU_MX6DL)) { + puts("Industrial temperature grade DDR3 timings, 64bit bus width.\n"); ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table)); } else { puts("Industrial temperature grade DDR3 timings, 32bit bus width.\n"); From patchwork Fri Feb 8 17:42: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: 1038883 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 43x2wB2tfxz9s3l for ; Sat, 9 Feb 2019 04:58:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 06A53C2207E; Fri, 8 Feb 2019 17:52:23 +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 384EEC22094; Fri, 8 Feb 2019 17:43:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2C0AC22095; Fri, 8 Feb 2019 17:43:01 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 85DA5C22039 for ; Fri, 8 Feb 2019 17:42:57 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LpuQT-1hLyPa3uv1-00fiIg; Fri, 08 Feb 2019 18:42:54 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:18 +0100 Message-Id: <20190208174229.23562-16-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+IUtEkJ74j2WLlUGrC4MaRC4Bj0gTq3DFKDwP8kwgakL19RbVoM CIrYUhfpIi6+mMHiK6chZJJMihj5afJcS3/nUxPvRyX3PBDOnPM5Icx/WrOgAN/ZwvfGWrv dGZesVbbS7isAvKanZIKo8AiRa/eSGYbQhVXHrbWnu938wGINiebMD9t7Yx6hRUL67hD12i ZIFkTErgkrHpUza5563sQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:sR1/9K30n5w=:caTDeJ+OVwE6ixfCV1GO/5 Ss7Ia1WQzsL1E/3hu7kPXs+ET/P2/slj6gh9hf57d3eS/IrZjA8Hli9hcnkkBgXXFuydkBci3 FdyvB8i8mIOXmIYmn6dClzvT/SM+KvT4XmfyfTqCW3utsqCMyLODpYUSGmNr0H7fKr3TiuO3W KTgwpwgeZsCqomq7dwUwQx2+Tpd8oWygoSVdLXqFihKAoAGhQxzZpLHyYujBzC1ll/6Eh9wnm ZHWbXzdlydrStgBIXHiwpxIjRhjuLY6yuCe6QI3gd2o5lD2Ejs9NCH2X3/MTBMq15d6GU8w+3 eRqDpIqNU2r3V+WdKXfXp71BdgzfP0RqT+C6Ofwe+XesH8RVS8N1evTC042MzQs6XZUyThzNA jqh3vi3lFkfCVjTfekk3BacbtIP5ruyLGR5x8wOia9QLyOTpQ1QBR/k16yzcXvmC61814TgHH /kTt4u3S2mRElwVha2GwUcQwmqvBn+UaILp08rGfAq41OWE72OPJZkR04Mcxf1fRQbAM2KOZB wauz9MzAlo1QM0xmJ6pNKayDEEdBAZPb1NmRoJ54daJmG1S4yDxzecqHXNiWSPQWpxC0comsa Tk563IbkdwivkRbQ8O6HdSRmcXGkRv7zCFL5BMwZfieAhwdgcUAjvx4/ivfM0NSN3RXNbkT49 iP3HBv6ly+THTr7nUFARGqCeqTPg3Wnq1cJvuXuskIRKwLXcYFKReNX03XhI+IIKKCU7cvXsh UNdLrGG/ox/7k4fHF1aA4VRDeemOsfFxP6RFEA== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v1 15/26] colibri_imx6: add distroboot support 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 Add support for distro boot. This is especially helpful for external devices. There is a global boot command which scans a predefined list of boot targets: run distro_bootcmd As well as direct boot commands such as: run bootcmd_mmc1 run bootcmd_usb run bootcmd_dhcp ... Refer to doc/README.distro fo details. While at it, remove the CONFIG_DRIVE_TYPES define which has not been used and was meant to be used for multi device boot support which is now provided by distroboot. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c782b2924c..77f884f341 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -100,14 +100,18 @@ #define CONFIG_LOADADDR 0x12000000 -#ifdef CONFIG_CMD_MMC -#define CONFIG_DRIVE_MMC "mmc " +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) +#include +#undef BOOTENV_RUN_NET_USB_START +#define BOOTENV_RUN_NET_USB_START "" #else -#define CONFIG_DRIVE_MMC +#define BOOTENV #endif -#define CONFIG_DRIVE_TYPES CONFIG_DRIVE_MMC - #define DFU_ALT_EMMC_INFO \ "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ "boot part 0 1;" \ @@ -134,7 +138,9 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ - "ramdisk_addr_r=0x12100000\0" + "pxefile_addr_r=0x17100000\0" \ + "ramdisk_addr_r=0x12100000\0" \ + "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ @@ -171,9 +177,10 @@ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ + "run distro_bootcmd ; " \ + "usb start ; " \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ "boot_file=uImage\0" \ "console=ttymxc0\0" \ From patchwork Fri Feb 8 17:42: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: 1038875 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 43x2rg6Lmkz9sMp for ; Sat, 9 Feb 2019 04:54:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 884FDC22024; Fri, 8 Feb 2019 17:48:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=SPF_HELO_PASS, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2CC63C22039; Fri, 8 Feb 2019 17:43:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ED83AC2208C; Fri, 8 Feb 2019 17:43:02 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 660DDC22056 for ; Fri, 8 Feb 2019 17:42:58 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MXnur-1ge9If3uFD-00WoHe; Fri, 08 Feb 2019 18:42:55 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:19 +0100 Message-Id: <20190208174229.23562-17-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xvWDnsYIDW6k6BIkWpcrrPUd3Z2HLGdhHTF6bNwojeC2w79rZ6o 03uUOcidjDtHChBWVNRjYg3cMSTsQoaQy8TJaN73obw2QfuyHFy7Cp+Wgj1R/Do8ikScNVT Ik8LW7GLkdDK7tavDCgdS0ACOK/XByBbqX0sqR8vKVVRmXF1KBxrAUCbHy7fpdrsN5zABpR lHnb197xBOlnl3tlYQWew== X-UI-Out-Filterresults: notjunk:1; V03:K0:DiJEQ4yt1oE=:wMlD4kG881VwauIpW8Tn4f b28mUq7Oxb8jg/5Ws2FV7yjrBZqmXRbw2nA2I7lHgKQURyR5WhpPly4JyFKYK7oZdOzSF59yH smkfZzqZ7q2e4igmv6Ro2sKFswAwLsLS6hrF9EYHoHQGXI84EcqgLQl/8N11Ay5yLoBJD6l6w 72U14c13NM+LMDspVJkWSk5NNyzvHSvYJ6FbhSgdgd+bUXqQkEAK4EG+sEWEoIFHEZMPrUCXm KZ9y5wlCU2KXWlxurHSacv+p+843f0HxzNbvyVdF50cEIHcw5i3Dq9GFzs+dlXPGeGJVGMeN+ r+fYI7na7KKec/oxnBAZkOyyb0wIVtU1L8R9XIGeJTU7AgyIcIDCpa1FBaiBVImDaHY7UhLv9 BvV8eL3f+rBulO0yP12oGAI9jjM/RDzwFywkCPalhmqyz0r+OVLGcxcG30ZOpZWh8n9omKN07 TULC7j9LT5lM2YwuVoZEnw9VeHx7HJUYHkWi3eLqxyikarcbDJulhKqSQBDX+juOzbUi+4uhA 9Tcbo7BJla9W/ZA6KmLFcpmIuc/9o/4PgnZO1W5m4zKguK9B48FiTv2N+OZcw7fd5wU2A5e8G 25HVSuy7JleEjLcsb2+wg3HQvstBHzSLQjzDa6Tx+LT3YlG9Do/DHxljiMmYUtEkAH+mqZSND tujBcQe+hnVSx0jeP9oMdoKrXvKclx/IjQkeR89sfj5XG3BSoPk19UBTWcZU0FGZUpMXwMHAP G/7+X04EeMknD1qg7YtN4iUzcsQ+UcHKRex0Tg== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 16/26] colibri_imx6: unify sd/mmc drive strenght with linux kernel settings 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: Max Krummenacher In the linux device tree we use 40Ohm drive strenght. So use the same value in U-Boot. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 439d38bc29..3d72a315b4 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -42,6 +42,10 @@ DECLARE_GLOBAL_DATA_PTR; 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 USDHC_EMMC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) @@ -92,16 +96,16 @@ iomux_v3_cfg_t const usdhc1_pads[] = { /* eMMC */ iomux_v3_cfg_t const usdhc3_pads[] = { - MX6_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX6_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), + MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), MX6_PAD_SD3_RST__SD3_RESET | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; #endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ From patchwork Fri Feb 8 17:42: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: 1038878 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 43x2sc6BwLz9sN1 for ; Sat, 9 Feb 2019 04:55:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 58F5EC22097; Fri, 8 Feb 2019 17:47:52 +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 AC448C22086; Fri, 8 Feb 2019 17:43:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3AF3BC22064; Fri, 8 Feb 2019 17:43:04 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 4D219C22019 for ; Fri, 8 Feb 2019 17:43:00 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LfRNf-1hT5QU3snR-00p2UC; Fri, 08 Feb 2019 18:42:56 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:20 +0100 Message-Id: <20190208174229.23562-18-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Li8X1xVjhplOtqPGuhYMZAlpvIudNv8H/h0Xi7fZrMN2lqiICcl D5K4PpOyiCgnzpe+6T0Qy9SPII4skXOkGH461kpF7Wdf4xe4EFFoiVQteC3QMiUqOiXozPM gOjbN0BDjQncX+uUc9Dx/ZuCC7AVZe0RIhWTexRnsKaBbr3vF+hXJn9irxjfFa31yDzcYVq Bjv/owtZEPqX7uKDM6Icw== X-UI-Out-Filterresults: notjunk:1; V03:K0:vaJb+v7AsWw=:gslner6LJZxPFhyJM53KDn YKZkPIK0MDIpwL1FOqvaj4CP0oR90DKtlVgwb6rsYNsAw08F7TBSb9P6/hpq9Mtdc4zjgWTqP 8b9ixm9191odft9oqAU093svMpOKNway6q4pXUyKQpvGvLuPesHKMPb609mZbscXlMjTN2aEZ FH1ZEqoNHYlvvPhqY1BpeEBLsWcvO4Ej6sQLqc6GM7U6/TiQD7tPaXKwWAL0Ed9XekHXbx6hf m98+NcLe9ZyJlce8WXjOXfkdXFqYRr32SRjoSObgO4K1iQfgAIxT7JKoYM9WOqcxc69H3xnWV Hfnqd2E6X2UHfygtutlwQSAhskNjGzM+YnWVrvVHOsWoKN0Ot60ZFhTh9TjgN6C9l3V2cOMsI /EERIzhxZX1xt0UQjmhkfY3FCEWqyoKuavLuZcw7FXb0qhEliLSyBkZb5oHle9xy3aJCCug3w 7VhnqVSypHswQMF5BEsCbQ4wwBy7gT76pETqsAUj67YZhZWB75E9CDFNU0GZNHjXbM7/XUHiA eZgX2Ncrb3kuUMHutDe1nMqAuYGe3aQ0oNTFkTPHSdRQh0BrYDNOv1lDS3jOz85/8jwxzK+PK sHPProeZafvPPP4umb85S7IG17hl+CXDJOT52eVCopNBSzBfs+nBU13z/TZmNy8YF4TmWSFo9 QtLHM2uOJrZWMiJq719dXkK4RePAk2khNJNkiebrxKqqjclL4PFlOwyzo2YCRPcRkSkw28LAQ lyjFqaOAcpImCzGieqbHeCsOWcL9Sm5ECbNOeQ== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 17/26] colibri imx6: pf0100: reorder and cleanup message printing 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: Max Krummenacher Keep debug code at the end of the function. Use a one line informational message for the PMIC only. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/pf0100.c | 82 ++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index 5e411f1743..09c3cc950a 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -35,7 +35,7 @@ unsigned pmic_init(void) uchar bus = 1; uchar devid, revid, val; - puts("PMIC: "); + puts("PMIC: "); rc = i2c_get_chip_for_busnum(bus, PFUZE100_I2C_ADDR, 1, &dev); if (rc) { printf("failed to get device for PMIC at address 0x%x\n", @@ -51,7 +51,46 @@ unsigned pmic_init(void) puts("i2c pmic revid read failed\n"); return 0; } - printf("device id: 0x%.2x, revision id: 0x%.2x\n", devid, revid); + printf("device id: 0x%.2x, revision id: 0x%.2x, ", devid, revid); + + /* get device programmed state */ + val = PFUZE100_PAGE_REGISTER_PAGE1; + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { + puts("i2c write failed\n"); + return 0; + } + if (dm_i2c_read(dev, PFUZE100_FUSE_POR1, &val, 1) < 0) { + puts("i2c fuse_por read failed\n"); + return 0; + } + if (val & PFUZE100_FUSE_POR_M) + programmed++; + + if (dm_i2c_read(dev, PFUZE100_FUSE_POR2, &val, 1) < 0) { + puts("i2c fuse_por read failed\n"); + return programmed; + } + if (val & PFUZE100_FUSE_POR_M) + programmed++; + + if (dm_i2c_read(dev, PFUZE100_FUSE_POR3, &val, 1) < 0) { + puts("i2c fuse_por read failed\n"); + return programmed; + } + if (val & PFUZE100_FUSE_POR_M) + programmed++; + + switch (programmed) { + case 0: + puts("not programmed\n"); + break; + case 3: + puts("programmed\n"); + break; + default: + puts("undefined programming state\n"); + break; + } #ifdef DEBUG { @@ -103,45 +142,6 @@ unsigned pmic_init(void) } #endif /* DEBUG */ - /* get device programmed state */ - val = PFUZE100_PAGE_REGISTER_PAGE1; - if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { - puts("i2c write failed\n"); - return 0; - } - if (dm_i2c_read(dev, PFUZE100_FUSE_POR1, &val, 1) < 0) { - puts("i2c fuse_por read failed\n"); - return 0; - } - if (val & PFUZE100_FUSE_POR_M) - programmed++; - - if (dm_i2c_read(dev, PFUZE100_FUSE_POR2, &val, 1) < 0) { - puts("i2c fuse_por read failed\n"); - return programmed; - } - if (val & PFUZE100_FUSE_POR_M) - programmed++; - - if (dm_i2c_read(dev, PFUZE100_FUSE_POR3, &val, 1) < 0) { - puts("i2c fuse_por read failed\n"); - return programmed; - } - if (val & PFUZE100_FUSE_POR_M) - programmed++; - - switch (programmed) { - case 0: - printf("PMIC: not programmed\n"); - break; - case 3: - printf("PMIC: programmed\n"); - break; - default: - printf("PMIC: undefined programming state\n"); - break; - } - return programmed; } From patchwork Fri Feb 8 17:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038851 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 43x2kl4wk4z9sMp for ; Sat, 9 Feb 2019 04:49:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3A2A0C22031; Fri, 8 Feb 2019 17:48: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.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 6A7E1C22036; Fri, 8 Feb 2019 17:43:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5AA8C2202F; Fri, 8 Feb 2019 17:43:04 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 8FC96C22066 for ; Fri, 8 Feb 2019 17:43:00 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MN3r4-1glXPU3rI0-006fGD; Fri, 08 Feb 2019 18:42:57 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:21 +0100 Message-Id: <20190208174229.23562-19-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:K82GEzUgQqX0zk45FesuSy4C5SIYET2ltce7dn1GYe97NEo0h+c 4eQR4imhs5oyAhauJ9TziTgKl3yAI/h4cG1Zz9WBc8IHbXHX+uVkpjsONNRrBb0eKrE0ptv c+W4DEjeopFX1HV5JNY6Fki0RE2lR2M6wJ7T0E1MrgNGZOehfUn6K+wtOCX3JfYQv3FpqPB MAJkm5mgr0OBFvS8cItug== X-UI-Out-Filterresults: notjunk:1; V03:K0:+YHozVRTY/E=:88+YvWZ6yeR9L0SwfoySU9 EG7TVYR4iq24sV5D2zEcYFIu4zIArxsfBVSEtY3lnY63QQ8ntwcChlxe2E6X2Se1NT3e46anB bjdtibqOvIGZdGGwoTsRKPM6Tas0hjyquF4fN/GIg5FMRXFil3KsQ1jkb3zM/qmlBsXwKVEqh Om40XOtxkJc3knOaStRI9PALkdKS2V9pbf0ot5MpBcSbePrSXLYCKv8mE4nJNZLYCLdQ7OC7W McCxdAVeWHyvZnSF/rSY9U92qzw5zlVeZmufRIiO6MOxkuSistCbt9qp97LxxtAxcbjEct8iw nR2ZFFFd53E794GkLGcJLzEK4OLyXZPbteLVmaQevtwD1LEzvuHDemGQsCmbh79BvhTL9x27X Zwe6HoVOGipvR2vT/VtJDFa/orRjs7B9hkwICgh1gZyKYhfMc8CJqokW3X3bmNVTqQHqDdcyc KakFmMP2tUApHoDnXu667T+Gr/XhkLGaHQp7CWs0Ws5h3MGRjSy9o61m/BV4L7G54zYvAvLeT lGLmDiP8yMJEuRYjubqdhslT/BP1uN7zTh3+RLfBEBECof9s7wTdPhD0jiM+9/vCTL79VfcLe 0dGYktQI+R7+uBoXadhqVT+fslL+REfG4C1sE4VawTi+wOtGJVFU4tQiUjrD0RNuH7cCDHviB +4SazSG/l06UrhBVCWIyHJlWWNk11WiqgHjJCZUv8UJfjSkOJjqCBT7DPr9wLemXe7WN2LdR3 t+zPNMHl2cgCz4BXw+k7ZoejHzQiSym5kn7LHA== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 18/26] colibri imx6: disable ri and dcd irq in uarts 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: Max Krummenacher If the UART is used in DTE mode the RI and DCD bits in UCR3 become irq enable bits. Both are set to enabled after reset and both likely are pending. Disable the bits also on UARTs not used in the boot loader to prevent an interrupt storm when Linux enables the UART interrupts. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 3d72a315b4..76b776e17e 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -271,14 +271,21 @@ iomux_v3_cfg_t const usb_pads[] = { * UARTs are used in DTE mode, switch the mode on all UARTs before * any pinmuxing connects a (DCE) output to a transceiver output. */ +#define UCR3 0x88 /* FIFO Control Register */ +#define UCR3_RI BIT(8) /* RIDELT DTE mode */ +#define UCR3_DCD BIT(9) /* DCDDELT DTE mode */ #define UFCR 0x90 /* FIFO Control Register */ -#define UFCR_DCEDTE (1<<6) /* DCE=0 */ +#define UFCR_DCEDTE BIT(6) /* DCE=0 */ static void setup_dtemode_uart(void) { setbits_le32((u32 *)(UART1_BASE + UFCR), UFCR_DCEDTE); setbits_le32((u32 *)(UART2_BASE + UFCR), UFCR_DCEDTE); setbits_le32((u32 *)(UART3_BASE + UFCR), UFCR_DCEDTE); + + clrbits_le32((u32 *)(UART1_BASE + UCR3), UCR3_DCD | UCR3_RI); + clrbits_le32((u32 *)(UART2_BASE + UCR3), UCR3_DCD | UCR3_RI); + clrbits_le32((u32 *)(UART3_BASE + UCR3), UCR3_DCD | UCR3_RI); } static void setup_iomux_uart(void) From patchwork Fri Feb 8 17:42:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038872 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 43x2nY06Mdz9sMp for ; Sat, 9 Feb 2019 04:52:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 940FDC22081; Fri, 8 Feb 2019 17:47:39 +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 09C40C22057; Fri, 8 Feb 2019 17:43:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 74F7FC22024; Fri, 8 Feb 2019 17:43:06 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id A6758C22045 for ; Fri, 8 Feb 2019 17:43:01 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MA7R9-1gyRZ50Cvh-00BHpA; Fri, 08 Feb 2019 18:42:58 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:22 +0100 Message-Id: <20190208174229.23562-20-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:OJo+f6qGEr7JzWoYuqyhV/PNNB8Je66fhWlBrbEVKeiqVnDvhlp UQGCL+Nl8Zad3w7l6B7RVmKdyIAsq9oNM1M4wk4mCmzoPQOPuXNrWnV96Jvjbg4MtuZPsN/ Q0F0qXYD2zxUy1fmuLGa8/DGkclH5w/xpw8teKO+GgvfKrmn2TDZmVB6qqUetz8wQnN92/9 LXeOQAP2L7Gr1cC0djrAQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:qPE3zdvsSAA=:cFvEFk5YXqzgQikAFr32uX pKKiZaK+D0UjtN9bDSWJOHl3991XOkQsH4ka74eXAQwiiFpLiRJs/Fj7zsvD2Ux/nQEuH1C1x 6z5u/GHaHUGcSQ61b8QAgKka+HcHN62ai7bL88WIk14Msv4bonnXDCDitCDbIEWrs9qgypLQr IDjNkSsl7pF4WiLuaaR4iIrhuPJm0sAlavqm69qmU9eGwC+HuQUshNb/0Yk+63el+M54zOLFw 2gofhuDpcW+vjLNhFxnrmKcnXUhW+KRWUasIU1IaUOgOUI7FWoTeuikQ8khmK9IUH0u+/SPxm LyU8BP5ikQh/1DX6t8pP8TtWnyMVdjDQG2Rqgiauftr5zW27W27L53s2vWI2kA/iN712FigAA DwCamOaj9wm2yYUO82ufHN9J4Xco4KtiEGMi9mOWpvlqTaxOQRNZwFMIiYO6qcgkF+b7h+LZ8 J9Bgte0LMdpnXPQVqObhPo/GQndEvG5BDqtWHYbQ1TnvrpTm3f4hJimhoECFAsV1VSGOqOIYI Nc59qKLLVaA32YkQ9p1o1rndEgsx7IGe8RM86SWdiUVO3RBFLbl+5KTGnfulXRIBdwHPm/X2P DDMXp2KF9h9bH4Di3qEIPt8RAbo+XPZ3fLkcWOYdqsjB3XVeBrO66HKX9usmkkkHxjkHERSRK HrL25pDeC/AOt+LVUh6e5EbzR6TpSCHcOuW1hhInfZ0mdnmFTs2RmnpWu70risRLR6eShbelb HU9eScTQ2Xu3b+zSnhsGaKvY1xRK8tpBZ8CYUg== Cc: Marcel Ziswiler , Stefan Agner , Max Krummenacher Subject: [U-Boot] [PATCH v1 19/26] colibri_imx6: change pmic fusing according to hw 1.1 requirements 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: Max Krummenacher Colibri iMX6 V1.1 HW can use the PMIC GEN3 to power the NVCC_SD1. Change the settings fused into the PMIC's OTP to powerup with GEN3 set to output 3.3V. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/pf0100_otp.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/board/toradex/colibri_imx6/pf0100_otp.inc b/board/toradex/colibri_imx6/pf0100_otp.inc index ce29b95ae2..c3b1f67f81 100644 --- a/board/toradex/colibri_imx6/pf0100_otp.inc +++ b/board/toradex/colibri_imx6/pf0100_otp.inc @@ -5,16 +5,17 @@ // Register Output for PF0100 programmer // Customer: Toradex AG -// Program: Colibri iMX6 +// Program: Colibri iMX6 V1.1 // Sample marking: -// Date: 24.07.2015 -// Time: 10:52:58 +// Date: 01.05.2017 +// Time: 16:22:32 // Generated from Spreadsheet Revision: P1.8 -/* sed commands to get from programmer script to struct */ +/* sed commands to get from programmer script to struct content */ /* sed -e 's/^WRITE_I2C:\(..\):\(..\)/\{pmic_i2c, 0x\1, 0x\2\},/g' -e 's/^DELAY:\([0-9]*\)/\{pmic_delay, 0, \1\},/g' pf0100_otp_Colibri_iMX6.txt > pf0100_otp.inc sed -i -e 's/^VPGM:ON/\{pmic_vpgm, 0, 1},/g' -e 's/^VPGM:OFF/\{pmic_vpgm, 0, 0},/g' pf0100_otp.inc - sed -i -e 's/^PWRON: HIGH/\{pmic_pwr, 0, 1},/g' -e 's/^PWRON:LOW/\{pmic_pwr, 0, 0},/g' pf0100_otp.inc */ + sed -i -e 's/^PWRON: HIGH/\{pmic_pwr, 0, 1},/g' -e 's/^PWRON:LOW/\{pmic_pwr, 0, 0},/g' pf0100_otp.inc +*/ enum { pmic_i2c, pmic_delay, pmic_vpgm, pmic_pwr }; struct pmic_otp_prog_t{ @@ -47,7 +48,8 @@ struct pmic_otp_prog_t pmic_otp_prog[] = { {pmic_i2c, 0xC8, 0x0E}, // Auto gen from Row134 {pmic_i2c, 0xCC, 0x0E}, // Auto gen from Row138 {pmic_i2c, 0xCD, 0x05}, // Auto gen from Row139 -{pmic_i2c, 0xD0, 0x0C}, // Auto gen from Row142 +{pmic_i2c, 0xD0, 0x0F}, // Auto gen from Row142 +{pmic_i2c, 0xD1, 0x05}, // Auto gen from Row143 {pmic_i2c, 0xD5, 0x07}, // Auto gen from Row147 {pmic_i2c, 0xD8, 0x07}, // Auto gen from Row150 {pmic_i2c, 0xD9, 0x06}, // Auto gen from Row151 @@ -185,4 +187,4 @@ struct pmic_otp_prog_t pmic_otp_prog[] = { {pmic_delay, 0, 500}, {pmic_pwr, 0, 1}, #endif -}; \ No newline at end of file +}; From patchwork Fri Feb 8 17:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038873 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 43x2pR2VmBz9sMp for ; Sat, 9 Feb 2019 04:53:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 04C07C2201B; Fri, 8 Feb 2019 17:48:06 +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 86998C22043; Fri, 8 Feb 2019 17:43:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7064DC22064; Fri, 8 Feb 2019 17:43:07 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id EC3D2C22051 for ; Fri, 8 Feb 2019 17:43:02 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Ludx0-1hISSB0mH2-00zo77; Fri, 08 Feb 2019 18:42:59 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:23 +0100 Message-Id: <20190208174229.23562-21-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:OSntcBXGdORBSxPnzFzMEyHmx+DmkEVBnSZrOsBqewgIBS1y9Wh 2wyBRk2cUegFmiJYC0w0xQ+VV0OQpqbnd/c8GqQGk+7q9RSJauIyPL9o33aTZ55EH85fwXC 1Uz8CJX2m0/2wvULxQYpEYFrRIuEdmox/C1mEBTIFMaMR4UfmmAnA09ZFYws9HRKIHKnoxO Iu/DqNDp3c13/D1BMkEAw== X-UI-Out-Filterresults: notjunk:1; V03:K0:sOwFyQaz3B0=:krWBYAsFUUO+g/lbFC+2NT xtxJrDxHnJ9rk7h3T9Fb17KkVnj7dQSUA6fyICm/KEVuOX842MCDSKJP1IIVwQ526JtXbxBiQ pqg7HrQmsQgooKuXhEX2PYd6R3oaVU1Il4aLjb4iJ+Eymdjqu3Wli/gFO1D5lWoT3o8fodP5k VZNWy8YJQ0V8F7kNRnNHKQsTuiWNHki1xDvXenaVB9EdZEL64IEHyeVLu9EMwTZLs0pEnzxy/ ZMZx5bfe0CSR6kwYyTTFj8lnJ1jhqWH7ngLIhQuhehQsBjl2uvSTFijFwfXNprmmgam3XQxCA PYxuHwEex5Gm225dvs50Opu/+5wxQEULq5kBaHhDX5gbXzFYqWTs/wfOqsWbCF1z/j1Zym725 z4pUhJGyJvD7kvBa0Tu02f1PKYFjyWKFiTRVUjuhU8wByQ7vn24dLJpDL5IWtx2/gs1xo1vKg 0Z8YbtfiT/ZmFosDsykXK7wSCRHmaFQhRM96qRup8gtMHdp6m62glcEVXjTsEDTyfpmnAULoE uP2wzDc1inkIY2foh9C2V8EisosBvJElcJHrZTOOH5m5G/kuko0G1EnYGUo9XRo4QSjlDpUvT HdftROMFKbnHPRUPXoTHoXOxCzXwZ4yEYhznRv/84Uh+fMyn1gZvAdFoBCzb75YqbfHF/y7sn VOUoy9CF+dKFbat3ZQsEeR3jaSqAm+48pdYDKScwkJrVZjzt4emvBFufwOnvgyqvx1uO7o1og ntYW9h1kFRLWndYyxUycUUYWsDTeCfTM3sVCGQ== Cc: Marcel Ziswiler , Stefan Agner , Max Krummenacher Subject: [U-Boot] [PATCH v1 20/26] colibri_imx6: revert fuse value set in mfgr_fuse 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: Max Krummenacher We have two commands to change the bootmode fuses: mfgr_fuse which set fuse 0/5 and 0/6 and updt_fuse which burns bit 4 of 0/5. Before Image 2.6 we fused in mfgr_fuse 0x5062, which boots from the user partition of the eMMC. To workaround certain hangs we moved to fastboot mode and using the first bootpartition of the eMMC requiring a fuse value of 0x5072 which could be achived by the then added updt_fuse command. At the same time the mfgr_fuse command was changed to also fuse 0x5072, revert that second change so that one can fuse both values, one with just mfgr_fuse and the later with mfgr_fuse;updt_fuse. Note that the mfgr_fuse command is only needed at module production time, a customer might need to use updt_fuse when upgrading an older module to be compatible with a newer image. The command is integrated into the image update scripts. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/do_fuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/toradex/colibri_imx6/do_fuse.c b/board/toradex/colibri_imx6/do_fuse.c index e6793e366a..22d191f52a 100644 --- a/board/toradex/colibri_imx6/do_fuse.c +++ b/board/toradex/colibri_imx6/do_fuse.c @@ -29,7 +29,7 @@ static int mfgr_fuse(void) return CMD_RET_FAILURE; } /* boot cfg */ - fuse_prog(0, 5, 0x00005072); + fuse_prog(0, 5, 0x00005062); /* BT_FUSE_SEL */ fuse_prog(0, 6, 0x00000010); return CMD_RET_SUCCESS; From patchwork Fri Feb 8 17:42:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038871 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 43x2ms0bKTz9sMp for ; Sat, 9 Feb 2019 04:51:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CA788C22089; Fri, 8 Feb 2019 17:46:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3C80CC22075; Fri, 8 Feb 2019 17:43:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C6430C2206F; Fri, 8 Feb 2019 17:43:07 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 00BD5C2206A for ; Fri, 8 Feb 2019 17:43:03 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LqBwU-1hMo2G1LY8-00dn9l; Fri, 08 Feb 2019 18:43:00 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:24 +0100 Message-Id: <20190208174229.23562-22-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Txutv5biiBd4AzbDOvkbT6Z6gDYNmw4HFGmrUitB3GyDvXp1mO5 7syIKUTWCJMMH4RYarKk6igQ5rtoEdGfLu90E32sew28fbUSdIbOO3ZbpgUL8XpObJrp04S FMaWcz2F8u089aLtRfjN47660hlJ3ynVRqWY5kLgHdkRoM+TWCYoS6QczJ2jdxThgGrbNsR 8J+XwS2T1PQBRjYgKCKFw== X-UI-Out-Filterresults: notjunk:1; V03:K0:x7tdjeWRV7I=:J0EoO2XAOZAgbDSVKswPgl N8vhptFUge5Vb/U8WfySACmNwRZoKSGpSLBEBExr9dHFU9sXh790Un1dzjcGuPpHkITdUWAhO pLdG2A+w/oCRLYFsKpsYbByBLOVPnlp3iHzUYlpKVVS3A9XOwmpzTm7zgwmTehcdvbFCle/ZO vk6O66NEKIaYTtI2DLMelnYQhYb/PJHJZc/oo4oyuK9RrdRASYMuAl8ZAKhgY1+wHfzMrTmoX gd9TyJ5k0MaFOF6LvEExrweELcLE+y7lhhoWS9ruPpGRjCpz4trruSNsR4Kfu8KtQromktRn9 zuNCzitB2PCcwA4S3n5lV0bTnUPy6Ptb8rWEHz1j706YjaPljRs8atslriqH+vqohTVigB4oE WO76Z7tflHa0QtUfa87e7TqmoqwgkTkryFyQH/YqNXbEf9CCd0rDIJ1qqkKPW6MZ/Ks0QIqTM LyLBOiJKnT/tciGhaX9Umf3CVPgyd05/gdB3EY//skV+pKg0zPoA+daaJf89fUYvFaE5htBXe PwsFVYzqtA4PWXfyVVWWFYPfKnjgRUnvhwi/zE14Rphuq7X9gsXwjw+zBMoe+V6wFZZ9DGpUg gzmGs36hFcnEtxQ0vDuDqCExOkRMKAPL1NJ3ckbg4Y2QbiAdcnvYczpJQB2QConkM0RtuE09e VlvbkEOU0TSaero8LE/fEhSV7PRmBOTXeZy3h3XrlxF/C4q5k9Q7JdzPHgnV2R13sropqyEfp rRzQlOvXOEzWWO61L4v58o8od/Vtpy+4JU0LIg== Cc: Marcel Ziswiler , Bhuvanchandra DV , Max Krummenacher Subject: [U-Boot] [PATCH v1 21/26] toradex: colibri_imx6: overwrite CMA memory set in 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: Bhuvanchandra DV Make sure CMA memory is not greater than 50% of available physical memory. Allow user to change the CMA memory via 'cma-size' U-Boot environment variable. Signed-off-by: Bhuvanchandra DV Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 76b776e17e..fd988bd2b0 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -679,7 +680,18 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, bd_t *bd) { - return ft_common_board_setup(blob, bd); + u32 cma_size; + + ft_common_board_setup(blob, bd); + + cma_size = getenv_ulong("cma-size", 10, 320 * 1024 * 1024); + cma_size = min((u32)(gd->ram_size >> 1), cma_size); + + fdt_setprop_u32(blob, + fdt_path_offset(blob, "/reserved-memory/linux,cma"), + "size", + cma_size); + return 0; } #endif From patchwork Fri Feb 8 17:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038853 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 43x2ks2qQ7z9sMp for ; Sat, 9 Feb 2019 04:49:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1D981C22052; Fri, 8 Feb 2019 17:48:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.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 C399DC2208B; Fri, 8 Feb 2019 17:43:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D1760C2206F; Fri, 8 Feb 2019 17:43:09 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id F3B4DC2205F for ; Fri, 8 Feb 2019 17:43:05 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MRmqV-1gguiK1uR7-00SxCS; Fri, 08 Feb 2019 18:43:01 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:25 +0100 Message-Id: <20190208174229.23562-23-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:lk7xaDJaCUPRvL3ji8UYBaQmbhNjRC57sgXflTnVU64kqSwUcj+ T02qo75a/9xOxUlcQdjz1L9rC5uqAzksn0f1M2OgDjYl+w90a3F9HHnD8SvV/+iJDPsJabv J+0D0dQlyAolZ//CEjC4XyW8uCP/Qdz60dPaUOznp866bBptWbZw/oDoL5N59IneGwRiUh8 KkrxHxiWkEq0WZNS4d3VQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:OHNMsC5kgsU=:8BjqEAWRrLlj1B4/LBBVnb Q7F1pAdlCMsciHEH1eBvhLINzDz6Lng0aH4RXAh5UdzkVwnmglXWlY3IRRDNa8ObI+r3lg/OP hg/LepNgFqceSdKnDxZ34mMnRfP6zdDI/T+wIOhPXcxof6DYgJ5i5gwuc5mxagUMWs8QcbibM BT5NoS4pVlj6Nl6Y0J7Ux/KfVaZwm5KnrNpLjEvzvNK5zLrGUlD9XxM2lA6vl+KW+HaoJm7hV qB2JVxayjP8HVAXsfq/s5mYXoEm5p3uzYlD+QYciJ5CmgOG7bOo8qcKxJAyGCqfpGWMhslt8C q9bimCxsBxUiyQP7owDKP0zhG3pqoGqHWQVUPE7uKYYYmyVhY/FBLTZ9NBpi2SF97xAneR0Ys h6XyJYqUADg5LKq3j4atxxWGmq6bXEfBk913c2JCnDMBGfScsdEz53ZEA77xFCo4ba8nppg8f JRH4BgdHHXu63KRpsUbEaV1+aOAu12cSGeKaE9/H9TKVLrC2uEIIIZspVy6Vtva3imfleFnFg +0ALa8h0lLOL9JHlv6itRi+qSmwwInRhhdPbdOHFbLi6xE5Ydlt5LJtMWKEUnBRAmTVEkubhl ObHeQl7H+Akqbraw6reT+WDD9W+p6mwUAE68f4WtoAluc6L0Fu/kvAf3z39b8jZXU2VdlaZMW gEsYPn9UsHUcgN1Gf0zMz85Xa4w8KIPAVmtE+h7Y+MH83vTSfpA5ThvUm/Lvt2XNAxznKyTiY DHypoR0PBOE1rdjMMf1fM9SeuMLQE53/Tj7fvA== Cc: Marcel Ziswiler , Sanchayan Maity , Max Krummenacher Subject: [U-Boot] [PATCH v1 22/26] configs: colibri_imx6: Use ext4 file system by default 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: Sanchayan Maity Use ext4 file system by default. Signed-off-by: Sanchayan Maity Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 77f884f341..6e056aab31 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -121,7 +121,7 @@ "imx6q-colibri-cam-eval-v3.dtb fat 0 1" #define EMMC_BOOTCMD \ - "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext3 " \ + "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \ "rootwait\0" \ "emmcboot=run setup; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ @@ -153,7 +153,7 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ + "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \ "rootwait\0" \ "sdboot=run setup; " \ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ @@ -165,7 +165,7 @@ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define USB_BOOTCMD \ - "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext3 " \ + "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext4 " \ "rootwait\0" \ "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ From patchwork Fri Feb 8 17:42:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038876 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 43x2s75BqNz9sMp for ; Sat, 9 Feb 2019 04:55:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 48C1EC22075; Fri, 8 Feb 2019 17:47:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 35A98C22078; Fri, 8 Feb 2019 17:43:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA525C22084; Fri, 8 Feb 2019 17:43:09 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 338D6C22067 for ; Fri, 8 Feb 2019 17:43:06 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LtoTD-1hH4sN2RQz-011B1g; Fri, 08 Feb 2019 18:43:03 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:26 +0100 Message-Id: <20190208174229.23562-24-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oxrD2uRnIH5f8iDr5ipuBroq29dvJW2XmExNqY33F4zs8cEroJH EqYO/R0vfSAKndqXbzlgQJIalpjZOC+QXYNNWcxZH9ugTwRCltgnvrMM0y4xx8Al56A84p3 moG8pqwcfebebCrnIgYuyz3wRboZnRljESrO3hPuo/fZg6YZGxGac7kSO5ap3/4aRLiIIe/ 4Eu0trlC46sLtxFo/u0tg== X-UI-Out-Filterresults: notjunk:1; V03:K0:H2yBtozbPtA=:0q4RMQleAtZ6K5XuLrWB+k IVs3nLladQSi+u6e0G1mi2ve1JDGthFdeNdeQhdLr/oqG8QgEaHCOmdKNcU27rVdoya9BxeEa hBoBSdAEljXoMerAO/ZD1PwqF9BTAvALIAK6rSD7IFBPPeqy6ntST95O/HWOrLF+PZiuNianc 6tg8H2YXFU/e2W3FkDi5a2Vis1a96LAd6cAJ7GS4zefaaStV76XXpoySte8I0ZkyUK1yRvfCW x/V2G/PyEne9iOCPx4rqZVfB6GYI09rhCUwBpJ/valk5+qwGhNj7PorD5lQcCTW45WrxQbUa2 7+nIWLROJHORz+SeNinku3gGa/D2txijsHI1tx8J/eYOS+PengU44qmiTLe7WV6g5qeEufuzp k+ULqrFC7L02eWUiZ2tXnbpM0zOIHdBz7bZfP8gyg16E5ICd7EMGAVPiE/ZSvrnLEdp49AIT2 yNPu5dRZ5ZmqRbXTKq0cEwdIzYvi20rpjumvB/vWJfKZVLKxGbM2JpWIlytc7anGgGVSdQsFU iX0HTDCPSvfO2XM4Q0Ir/Yw2JBz00P240LwSaViq79xy/61VKXVu80qttx6A9yEcwbm+8+wWe lMJVPVWPV/47ds+1+H2jKvk1FIxOHYcYZpte8xhnZmS01RUFlxjtUxyGkxQYDxNmhgSHV9n3r v9LBgXFKAsK7gsqXUgfIWINIAgcjLm5IUY7jrQO5kCwu8lrB2/SCGHhDhzQkxXupxUqLeh1TI Xj9cbbnbmRQRFal+JbZe4Hyae3s4RxJiogfx6Q== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v1 23/26] colibri_imx6: use SDP if USB serial downloader has been used 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 In case USB serial downloader has been used to load U-Boot start the serial download protocol (SDP) emulation. This allows to download complete images such as Toradex Easy Installer over USB SDP as well. This code uses the boot ROM provided boot information to reliably detect USB serial downloader. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index fd988bd2b0..4d9032419a 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -654,6 +654,14 @@ int board_late_init(void) env_set("board_rev", env_str); #endif +#ifdef CONFIG_CMD_USB_SDP + if (is_boot_from_usb()) { + printf("Serial Downloader recovery mode, using sdp command\n"); + env_set("bootdelay", "0"); + env_set("bootcmd", "sdp 0"); + } +#endif /* CONFIG_CMD_USB_SDP */ + return 0; } #endif /* CONFIG_BOARD_LATE_INIT */ @@ -684,7 +692,7 @@ int ft_board_setup(void *blob, bd_t *bd) ft_common_board_setup(blob, bd); - cma_size = getenv_ulong("cma-size", 10, 320 * 1024 * 1024); + cma_size = env_get_ulong("cma-size", 10, 320 * 1024 * 1024); cma_size = min((u32)(gd->ram_size >> 1), cma_size); fdt_setprop_u32(blob, From patchwork Fri Feb 8 17:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038850 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 43x2kf1GZnz9sMp for ; Sat, 9 Feb 2019 04:49:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DF30DC2203D; Fri, 8 Feb 2019 17:46: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 A689BC22060; Fri, 8 Feb 2019 17:43:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0B2EEC22039; Fri, 8 Feb 2019 17:43:11 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 4BBF3C22072 for ; Fri, 8 Feb 2019 17:43:07 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M1YlT-1h7CzW2zrF-00tWam; Fri, 08 Feb 2019 18:43:04 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:27 +0100 Message-Id: <20190208174229.23562-25-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:m4wcHkCQcNfrzDLQPkhwZSg+o545f+h7ezrOQSn+ogjUYwyznNd juUU15ee8i87R7AV1TdRfT0DsMoanTowbupC/QXkiSdtCZapePxBZ5DnBD4p7WGfxBBcNbv HdRO4H3bhhGaKKD5KaZP/EY+QCa+6nNiWP5fYhT8hrp6z2RwKkfuxFupIKVDHkHg2gBtv0j YAIG2Vd7i2TadsQ4ahL5g== X-UI-Out-Filterresults: notjunk:1; V03:K0:1tpVmLCKKBM=:IqzHudzkIDLbG/q8kyXqAU 0SSBJjuG1e32PUOqy4ebSKZ5frPGd6JYj/nJ/q5RhKaSIIAPTTd7ds1hrRtay4gU3p2VRfeZF vJJ/ahQX5QQXFk7026rJjMlSq3zsjOr67e7bPgbTYrIQ84OLHLvuHNF1Ot8LW4zj0QR95KT6r YNbbnhHCYXaWzTnXj8ElGfiPdbpKhY0kJAGtQ0hz+0R+HUKjQrUcOMuvxpRx5ym3DFydlgB7l CYycKye/NDASiXp4gB/gL7TeKO3Jv8nz+59XYjGFYWwmqftZZYhcmpM2d541TIXg7+VCXKq0f GHez0kZ+wiedmwzIOOyO0qStgIUQThRMoUwkWP0VbinAcefOXACchJgFqjzVvRfakhxnxC5eG y2BYZ2rgy23kMnu0AyeWkpbgwLWe5vi2ElE181HrsC6/LBPPgWjuJYFHMAJik0rAHY8jb2HWD LJ8CUlC8hkDtn+zmX+/mQz3S/elnxWXs1RFhliU6/RbRIXD9+B2d03cWYrX6msc/0pgiUOqtY 4xmXEIuML6r+v6iQOvcOGFAn0vVjWsK/Mg0p320hcxX94hKJkIbAwgqo0hK2XbM1mxEvtRQ9K B1+C7L16XQWBzkfosMyWWvY/juEgOX7zPD22cMpbD3P8NQvJmXk6BCBqzrdyO9yO6azJz74cu ZDzjLbi+6ao2tzkCR+ilC4bcBGACtdeHpPqKj8nd6VQH9MvQzfVPviTQ8h8zOpN8QA15T+rtB uFI7CpeFxL2now6xa+JHPExqkKn5jBwzyH7Y6w== Cc: Marcel Ziswiler , Bhuvanchandra DV , Max Krummenacher Subject: [U-Boot] [PATCH v1 24/26] colibri_imx6: switch to zimage 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: Bhuvanchandra DV Switch to the generic compressed Kernel image type (zImage) instead of the U-Boot specific uImage format. While at it also fix device tree naming for MMC DFU. Signed-off-by: Bhuvanchandra DV Acked-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 6e056aab31..a6a823ee1f 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -108,17 +108,17 @@ #include #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START "" -#else +#else /* CONFIG_SPL_BUILD */ #define BOOTENV -#endif +#endif /* CONFIG_SPL_BUILD */ #define DFU_ALT_EMMC_INFO \ "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ "boot part 0 1;" \ "rootfs part 0 2;" \ - "uImage fat 0 1;" \ - "imx6q-colibri-eval-v3.dtb fat 0 1;" \ - "imx6q-colibri-cam-eval-v3.dtb fat 0 1" + "zImage fat 0 1;" \ + "imx6dl-colibri-eval-v3.dtb fat 0 1;" \ + "imx6dl-colibri-cam-eval-v3.dtb fat 0 1" #define EMMC_BOOTCMD \ "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \ @@ -128,7 +128,7 @@ "${vidargs}; echo Booting from internal eMMC chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ - "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "bootz ${kernel_addr_r} ${dtbparam}\0" \ "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -148,11 +148,11 @@ "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \ "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ "run nfsdtbload; dhcp ${kernel_addr_r} " \ - "&& run fdt_fixup && bootm ${kernel_addr_r} ${dtbparam}\0" \ + "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -#define SD_BOOTCMD \ +#define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \ "rootwait\0" \ "sdboot=run setup; " \ @@ -160,7 +160,7 @@ "${vidargs}; echo Booting from SD card; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ - "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "bootz ${kernel_addr_r} ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -171,7 +171,7 @@ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ - "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "bootz ${kernel_addr_r} ${dtbparam}\0" \ "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -182,7 +182,7 @@ "run distro_bootcmd ; " \ "usb start ; " \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ - "boot_file=uImage\0" \ + "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ From patchwork Fri Feb 8 17:42:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038861 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 43x2lc0mMdz9sN9 for ; Sat, 9 Feb 2019 04:50:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id ADBACC2208E; Fri, 8 Feb 2019 17:47:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9A7B4C22082; Fri, 8 Feb 2019 17:43:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C110AC22057; Fri, 8 Feb 2019 17:43:12 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 64021C22039 for ; Fri, 8 Feb 2019 17:43:08 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0McoOF-1gaMDB3Zuz-00Hyqu; Fri, 08 Feb 2019 18:43:05 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:28 +0100 Message-Id: <20190208174229.23562-26-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:sZYrZ4ZztaBlL7cjC1E/gmlVkjnoQbw1SUDix0HsYnucjufxBlK zWAHs63L8IfwqouFf4GeRw8kJ8mlkZPRJ6qMCoam+2qiZCJYgP5XgS/1uZn4JufhacvFaLj H2CDIIP517tMYdBdC3SRvsMvGO28UjLx0lk6wVQfZASyfPi1qfeQHVoONkZwFdHACUj/e6S /YTQl73SXXgLse8+49ibQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:hi5xBBt8cUA=:9C9Kr7pz64cPXBbdZljkkY 0sxCZpHUDEFrqmh5Q2xvT8o2Ed6WAnbUJ1olDqGwtDxVhGp/bEpr1iMimPxycVkNHQsFWKMsg LEtCc8Yp4jMeVBYtrHMP8NcNhv19IGw47rGjJ2dqWAcAPRRc+s2YN0O/NcHeakZsXCn+s0XLI Jk43RveCJG0+m3iqJZD23g4vyzmaOHOn1z2Wxdm0IvoHZIhR4nSZx/qwLPHs+i4DK/pkxZHKe Zk/e6PZTEc6G47ccYbOreR1Ep9R6X7O19hd+aSzSiA9uEVQRkvoIwo9WrEfEkca2TANb+U1gH mynEcFXE2+XIzmPPevQv0Jl9dqVSVQP+fCmo3ryALMDbt7mu5Q+j0Z2/tjkKXONqLYY3h2pe9 9N52RCk79GyNa/mZciMurmDGo/qpv8GakNHChUqtSYUjg7fGeOBfPC+Uk1Qwj0GssOU65vYYi O89hqHLqT+b27YM3Z//zDOoRFK/hXfk1JpAk6Ss7vUIWfzq3l3cLbCHXJZBb2cJv4FgD98guB nuA4SR1g85s0Tv/oXQSU/fmJxHvbfo37tbaJIRhN2C9rkge+kEeF6n6a9E0Q2FjwxywNBDqux WrsA2Hw7tGYfnascNxAXuDZODz9OpK76T82PtO8Pv4JTMtUdP677NtzPAnwUE94FCcsVD+wMG yHTUvtKTECB2xoYVfgEqC8KY+L28Yxw8+RDUXU0eI9mv6ZufRm5wNemDhFbg7mtBY74ATcw5G OBmFn2fxpAWaY8J0PNALoACeSMMwizzlVddKVQ== Cc: Marcel Ziswiler , Gerard Salvatella , Max Krummenacher Subject: [U-Boot] [PATCH v1 25/26] colibri_imx6: added nreset gpio on reboot 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 RGMII_RD1 pin (active high, GPIO6_IO27) is triggered on reboot during the SPL phase. This asserts (active low) nReset_Out from the PMIC. Only V1.1 and later Colibri iMX6 modules implement this in hw. Previous versions do not use this pin, so it is safe to leave it enabled at all times. Signed-off-by: Gerard Salvatella Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 4d9032419a..98ad87af19 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "../common/tdx-cfg-block.h" #ifdef CONFIG_TDX_CMD_IMX_MFGR @@ -1061,6 +1062,26 @@ static void spl_dram_init(void) udelay(100); } +static iomux_v3_cfg_t const gpio_reset_pad[] = { + MX6_PAD_RGMII_RD1__GPIO6_IO27 | MUX_PAD_CTRL(NO_PAD_CTRL) | + MUX_MODE_SION +#define GPIO_NRESET IMX_GPIO_NR(6, 27) +}; + +#define IMX_RESET_CAUSE_POR 0x00011 +static void nreset_out(void) +{ + int reset_cause = get_imx_reset_cause(); + + if (reset_cause != IMX_RESET_CAUSE_POR) { + imx_iomux_v3_setup_multiple_pads(gpio_reset_pad, + ARRAY_SIZE(gpio_reset_pad)); + gpio_direction_output(GPIO_NRESET, 1); + udelay(100); + gpio_direction_output(GPIO_NRESET, 0); + } +} + void board_init_f(ulong dummy) { /* setup AIPS and disable watchdog */ @@ -1087,6 +1108,9 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); + /* Assert nReset_Out */ + nreset_out(); + /* load/boot image from boot device */ board_init_r(NULL, 0); } From patchwork Fri Feb 8 17:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038880 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 43x2vG5kjQz9sMp for ; Sat, 9 Feb 2019 04:57:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C1FDDC2208C; Fri, 8 Feb 2019 17:53:08 +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 72995C22062; Fri, 8 Feb 2019 17:44:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 212B1C22062; Fri, 8 Feb 2019 17:43:13 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 82CA5C22074 for ; Fri, 8 Feb 2019 17:43:09 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LoH4J-1hKJzk4B2H-00gH3o; Fri, 08 Feb 2019 18:43:06 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:29 +0100 Message-Id: <20190208174229.23562-27-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:XhOM8xxxZHDi3l7IICG+ec1nl8Asmj/1z3ARA8QzZMKx/9eQCor U/4Id6U6mkDubePgN2QYPjJM4AmqVOMbzGewXs3IuAiSfMNOYRmTj3kBr0mGOsmdg+YVZSR kX2tO1jpNvslhM+4O0hEJOeF/PyX5kJybX2iYbi5Y8BgxAnT1dh9Wl05N7YmtJCsPnVBf6I NDj/bMiX49/tcxEAhheHA== X-UI-Out-Filterresults: notjunk:1; V03:K0:uE4yVZttmYY=:pL8Z1cKLvatFj32uD2mlGh kx3NywBJtRVJAW+SGAarRXwLrHg2+4ZofhJ06ahLAldOPpmVNGTt/0oulKHrloeSrNSR+nFZi MGj8AFAH3VGNSV1qXyUNYCFApnM4WjkXvx2kUicbIV2eOnN2haYNvzC5tyEmXyNFnwFH5w2dC Be1nmMkEzP91DmKT05VoouqA2gr4FB/27WupGV1kppyg9tUWdBs4ZiG8lzDpWKbCE9QQ10F0H do8YE2ZJCCDH6A0oxOYJ2JaRozsXRdhDLZ7xpbVCKCejTXfBEzlcOXkNEiQ0l94qRCL3BzBAp zae9lfFu5AOnteuQcxuxAuyAS4fqta5zIrBPF5/HJ05he7zGepoKVF+mSSSnyNLAq6CJqZafA z1jNJHoUV1KwwSoVutuNW2/4QYlDSrZQjyNff+4La+pihPCWUdCFp5DgQaPTR60j2E/TZDprC G1+1W6xHxlR6PDuXHjqW+D4TQ4SMqEqxNg3w1Sz4hG2/pXMRsUkLI+DsGcsgUJnT9KqgkcZLk nNQqCjFNkAI8gAnHirvC47bcP1fzOMS0r2+N2sNw+RE8jQBrGZJECpgTR37RVs0NfmdKBdaGk l+pH4IJtYfXSuLXlWbWeQqe1Ar5eA2raVZxAqRsBJphJAz9w+dA27mG/hxfEUprP6HL/FpYK7 uUKhv6Yn94fDRpKQgfpNjyuG+BULQVhxEe4PcmzimdVuuSt4B2G0GkzWKMiWEXrS6kZonfb7u p9mFJ/EDWDCg8lx8JuKYYt3jlHSVGZmqp+oZPw== Cc: Marcel Ziswiler , Gerard Salvatella , Max Krummenacher Subject: [U-Boot] [PATCH v1 26/26] board: colibri_imx6: check for and report ecc errors in fuses 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 The PMIC on the Colibri iMX6 may have ECC errors in fuses that will prevent correct settings. Up to one bit error per fuse bank can be reported and corrected by the ECC logic. Two bit errors can only be reported. Signed-off-by: Gerard Salvatella Acked-by: Marcel Ziswiler --- board/toradex/colibri_imx6/pf0100.c | 51 +++++++++++++++++++++++++ board/toradex/colibri_imx6/pf0100.h | 59 ++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index 09c3cc950a..e744243297 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -21,6 +21,8 @@ /* define for PMIC register dump */ /*#define DEBUG */ +#define WARNBAR "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" + /* use GPIO: EXT_IO1 to switch on VPGM, ON: 1 */ static __maybe_unused iomux_v3_cfg_t const pmic_prog_pads[] = { MX6_PAD_NANDF_D3__GPIO2_IO03 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -42,6 +44,55 @@ unsigned pmic_init(void) PFUZE100_I2C_ADDR); return 0; } + + /* check for errors in PMIC fuses */ + if (dm_i2c_read(dev, PFUZE100_INTSTAT3, &val, 1) < 0) { + puts("i2c pmic INTSTAT3 register read failed\n"); + return 0; + } + if (val & PFUZE100_BIT_OTP_ECCI) { + puts("\n" WARNBAR); + puts("WARNING: ecc errors found in pmic fuse banks\n"); + puts(WARNBAR); + } + if (dm_i2c_read(dev, PFUZE100_OTP_ECC_SE1, &val, 1) < 0) { + puts("i2c pmic ECC_SE1 register read failed\n"); + return 0; + } + if (val & PFUZE100_BITS_ECC_SE1) { + puts(WARNBAR); + puts("WARNING: ecc has made bit corrections in banks 1 to 5\n"); + puts(WARNBAR); + } + if (dm_i2c_read(dev, PFUZE100_OTP_ECC_SE2, &val, 1) < 0) { + puts("i2c pmic ECC_SE2 register read failed\n"); + return 0; + } + if (val & PFUZE100_BITS_ECC_SE2) { + puts(WARNBAR); + puts("WARNING: ecc has made bit corrections in banks 6 to 10\n" + ); + puts(WARNBAR); + } + if (dm_i2c_read(dev, PFUZE100_OTP_ECC_DE1, &val, 1) < 0) { + puts("i2c pmic ECC_DE register read failed\n"); + return 0; + } + if (val & PFUZE100_BITS_ECC_DE1) { + puts(WARNBAR); + puts("ERROR: banks 1 to 5 have uncorrectable bits\n"); + puts(WARNBAR); + } + if (dm_i2c_read(dev, PFUZE100_OTP_ECC_DE2, &val, 1) < 0) { + puts("i2c pmic ECC_DE register read failed\n"); + return 0; + } + if (val & PFUZE100_BITS_ECC_DE2) { + puts(WARNBAR); + puts("ERROR: banks 6 to 10 have uncorrectable bits\n"); + puts(WARNBAR); + } + /* get device ident */ if (dm_i2c_read(dev, PFUZE100_DEVICEID, &devid, 1) < 0) { puts("i2c pmic devid read failed\n"); diff --git a/board/toradex/colibri_imx6/pf0100.h b/board/toradex/colibri_imx6/pf0100.h index c0efb79bbc..9257620511 100644 --- a/board/toradex/colibri_imx6/pf0100.h +++ b/board/toradex/colibri_imx6/pf0100.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2014-2016, Toradex AG + * Copyright (C) 2014-2019, Toradex AG */ /* @@ -10,11 +10,23 @@ #ifndef PF0100_H_ #define PF0100_H_ +/* bit definitions */ +#define PFUZE100_BIT_0 (0x01 << 0) +#define PFUZE100_BIT_1 (0x01 << 1) +#define PFUZE100_BIT_2 (0x01 << 2) +#define PFUZE100_BIT_3 (0x01 << 3) +#define PFUZE100_BIT_4 (0x01 << 4) +#define PFUZE100_BIT_5 (0x01 << 5) +#define PFUZE100_BIT_6 (0x01 << 6) +#define PFUZE100_BIT_7 (0x01 << 7) + /* 7-bit I2C bus slave address */ #define PFUZE100_I2C_ADDR (0x08) /* Register Addresses */ #define PFUZE100_DEVICEID (0x0) #define PFUZE100_REVID (0x3) +#define PFUZE100_INTSTAT3 (0xe) +#define PFUZE100_BIT_OTP_ECCI PFUZE100_BIT_7 #define PFUZE100_SW1AMODE (0x23) #define PFUZE100_SW1ACON 36 #define PFUZE100_SW1ACON_SPEED_VAL (0x1<<6) /*default */ @@ -39,12 +51,55 @@ #define PFUZE100_PAGE_REGISTER_PAGE2 (0x02 & PFUZE100_PAGE_REGISTER_PAGE_M) /* extended page 1 */ +#define PFUZE100_OTP_ECC_SE1 0x8a +#define PFUZE100_BIT_ECC1_SE PFUZE100_BIT_0 +#define PFUZE100_BIT_ECC2_SE PFUZE100_BIT_1 +#define PFUZE100_BIT_ECC3_SE PFUZE100_BIT_2 +#define PFUZE100_BIT_ECC4_SE PFUZE100_BIT_3 +#define PFUZE100_BIT_ECC5_SE PFUZE100_BIT_4 +#define PFUZE100_BITS_ECC_SE1 ((PFUZE100_BIT_ECC1_SE) | \ + (PFUZE100_BIT_ECC2_SE) | \ + (PFUZE100_BIT_ECC3_SE) | \ + (PFUZE100_BIT_ECC4_SE) | \ + (PFUZE100_BIT_ECC5_SE)) +#define PFUZE100_OTP_ECC_SE2 0x8b +#define PFUZE100_BIT_ECC6_SE PFUZE100_BIT_0 +#define PFUZE100_BIT_ECC7_SE PFUZE100_BIT_1 +#define PFUZE100_BIT_ECC8_SE PFUZE100_BIT_2 +#define PFUZE100_BIT_ECC9_SE PFUZE100_BIT_3 +#define PFUZE100_BIT_ECC10_SE PFUZE100_BIT_4 +#define PFUZE100_BITS_ECC_SE2 ((PFUZE100_BIT_ECC6_SE) | \ + (PFUZE100_BIT_ECC7_SE) | \ + (PFUZE100_BIT_ECC8_SE) | \ + (PFUZE100_BIT_ECC9_SE) | \ + (PFUZE100_BIT_ECC10_SE)) +#define PFUZE100_OTP_ECC_DE1 0x8c +#define PFUZE100_BIT_ECC1_DE PFUZE100_BIT_0 +#define PFUZE100_BIT_ECC2_DE PFUZE100_BIT_1 +#define PFUZE100_BIT_ECC3_DE PFUZE100_BIT_2 +#define PFUZE100_BIT_ECC4_DE PFUZE100_BIT_3 +#define PFUZE100_BIT_ECC5_DE PFUZE100_BIT_4 +#define PFUZE100_BITS_ECC_DE1 ((PFUZE100_BIT_ECC1_DE) | \ + (PFUZE100_BIT_ECC2_DE) | \ + (PFUZE100_BIT_ECC3_DE) | \ + (PFUZE100_BIT_ECC4_DE) | \ + (PFUZE100_BIT_ECC5_DE)) +#define PFUZE100_OTP_ECC_DE2 0x8d +#define PFUZE100_BIT_ECC6_DE PFUZE100_BIT_0 +#define PFUZE100_BIT_ECC7_DE PFUZE100_BIT_1 +#define PFUZE100_BIT_ECC8_DE PFUZE100_BIT_2 +#define PFUZE100_BIT_ECC9_DE PFUZE100_BIT_3 +#define PFUZE100_BIT_ECC10_DE PFUZE100_BIT_4 +#define PFUZE100_BITS_ECC_DE2 ((PFUZE100_BIT_ECC6_DE) | \ + (PFUZE100_BIT_ECC7_DE) | \ + (PFUZE100_BIT_ECC8_DE) | \ + (PFUZE100_BIT_ECC9_DE) | \ + (PFUZE100_BIT_ECC10_DE)) #define PFUZE100_FUSE_POR1 0xe4 #define PFUZE100_FUSE_POR2 0xe5 #define PFUZE100_FUSE_POR3 0xe6 #define PFUZE100_FUSE_POR_M (0x1 << 1) - /* output some informational messages, return the number FUSE_POR=1 */ /* i.e. 0: unprogrammed, 3: programmed, other: undefined prog. state */ unsigned pmic_init(void);