colibri imx6 fixes, device tree enablement and driver model conversion
Subsystems (2)
cover colibri imx6 fixes, device tree enablement and driver model conversion
This series addresses some shortcomings, enables/introduces device tree support and converts all except video to using the driver model. This is fully tested both running our latest downstream BSP as well as the mainline Linux kernel.
Bhuvanchandra DV (2):
toradex: colibri_imx6: overwrite CMA memory set in device tree
colibri_imx6: switch to zimage
Gerard Salvatella (2):
colibri_imx6: added nreset gpio on reboot
board: colibri_imx6: check for and report ecc errors in fuses
Marcel Ziswiler (12):
colibri_imx6: get rid of obsolete nospl configurations
colibri_imx6: use distro defaults
colibri_imx6: move console in env from header file to defconfig
colibri_imx6: enable fit image, gpt, imx thermal, efi loader support
colibri_imx6: remove obsolete USB_GADGET_MASS_STORAGE configuration
colibri_imx6: migrate to using device tree
colibri_imx6: clean-up and migrate gpios to using driver model
colibri_imx6: enable pin control driver
colibri_imx6: migrate i2c to using driver model
colibri_imx6: migrate pmic and regulator to using driver model
colibri_imx6: migrate mmc to using driver model
colibri_imx6: migrate usb to using driver model
Max Krummenacher (7):
colibri_imx6: drop CONFIG_OF_SYSTEM_SETUP
colibri_imx6: print also 64-bit IT
colibri_imx6: unify sd/mmc drive strenght with linux kernel settings colibri imx6: pf0100: reorder and cleanup message printing colibri imx6: disable ri and dcd irq in uarts
colibri_imx6: change pmic fusing according to hw 1.1 requirements
colibri_imx6: revert fuse value set in mfgr_fuse
Sanchayan Maity (1):
configs: colibri_imx6: Use ext4 file system by default
Stefan Agner (2):
colibri_imx6: add distroboot support
colibri_imx6: use SDP if USB serial downloader has been used
arch/arm/dts/imx6-colibri.dts | 411 ++++++++++++++++++ .../toradex/colibri_imx6/800mhz_2x64mx16.cfg | 58 --- .../toradex/colibri_imx6/800mhz_4x64mx16.cfg | 58 --- board/toradex/colibri_imx6/MAINTAINERS | 3 +- board/toradex/colibri_imx6/clocks.cfg | 41 -- board/toradex/colibri_imx6/colibri_imx6.c | 395 +++++++++-------- board/toradex/colibri_imx6/colibri_imx6.cfg | 37 -- board/toradex/colibri_imx6/ddr-setup.cfg | 97 ----- board/toradex/colibri_imx6/do_fuse.c | 2 +- board/toradex/colibri_imx6/pf0100.c | 177 +++++--- board/toradex/colibri_imx6/pf0100.h | 59 ++- board/toradex/colibri_imx6/pf0100_otp.inc | 16 +- configs/colibri_imx6_defconfig | 33 +- configs/colibri_imx6_nospl_defconfig | 63 --- include/configs/colibri_imx6.h | 66 +-- 15 files changed, 853 insertions(+), 663 deletions(-) create mode 100644 arch/arm/dts/imx6-colibri.dts 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
Signature · 1 line
2.20.1
PATCH 1/26 colibri_imx6: get rid of obsolete nospl configurations
From: Marcel Ziswiler <[email protected]>
Now with SPL long since being in place even for recovery using SDP finally get rid of those nospl configurations.
---
.../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
board/toradex/colibri_imx6/800mhz_2x64mx16.cfg deleted +0 -58
@@ -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
board/toradex/colibri_imx6/800mhz_4x64mx16.cfg deleted +0 -58
58 lines not on this page · raw message
board/toradex/colibri_imx6/MAINTAINERS +0 -1
@@ -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
board/toradex/colibri_imx6/clocks.cfg deleted +0 -41
41 lines not on this page · raw message
board/toradex/colibri_imx6/colibri_imx6.cfg deleted +0 -37
@@ -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 <config.h> -#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"
board/toradex/colibri_imx6/ddr-setup.cfg deleted +0 -97
97 lines not on this page · raw message
configs/colibri_imx6_nospl_defconfig deleted +0 -63
63 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 1/26 colibri_imx6: get rid of obsolete nospl configurations
Quoted 4 lines
From: Marcel Ziswiler <[email protected]>
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 <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/26 colibri_imx6: use distro defaults
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Use distro defaults and minimise default configuration again using savedefconfig.
---
configs/colibri_imx6_defconfig | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
configs/colibri_imx6_defconfig +1 -11
@@ -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"
Signature · 1 line
2.20.1
PATCH 2/26 colibri_imx6: use distro defaults
Quoted 4 lines
From: Marcel Ziswiler <[email protected]>
Use distro defaults and minimise default configuration again using savedefconfig.Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/26 colibri_imx6: move console in env from header file to defconfig
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Move console in env from header file to defconfig.
While at it also update copyright year.
---
configs/colibri_imx6_defconfig | 1 + include/configs/colibri_imx6.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
configs/colibri_imx6_defconfig +1 -0
@@ -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
include/configs/colibri_imx6.h +1 -2
@@ -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
Signature · 1 line
2.20.1
PATCH 3/26 colibri_imx6: move console in env from header file to defconfig
Quoted 4 lines
From: Marcel Ziswiler <[email protected]> Move console in env from header file to defconfig. While at it also update copyright year.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/26 colibri_imx6: enable fit image, gpt, imx thermal, efi loader support
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Enbale FIT image, GPT command, i.MX thermal and EFI loader support.
---
configs/colibri_imx6_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
configs/colibri_imx6_defconfig +3 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 4/26 colibri_imx6: enable fit image, gpt, imx thermal, efi loader support
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Enbale FIT image, GPT command, i.MX thermal and EFI loader support.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 5/26 colibri_imx6: remove obsolete USB_GADGET_MASS_STORAGE configuration
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Remove obsolete USB_GADGET_MASS_STORAGE configuration.
---
include/configs/colibri_imx6.h | 2 -- 1 file changed, 2 deletions(-)
include/configs/colibri_imx6.h +0 -2
@@ -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
Signature · 1 line
2.20.1
PATCH 5/26 colibri_imx6: remove obsolete USB_GADGET_MASS_STORAGE configuration
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Remove obsolete
USB_GADGET_MASS_STORAGEconfiguration.Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 6/26 colibri_imx6: migrate to using device tree
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Migrate to using device tree required for further driver model integration.
---
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
arch/arm/dts/imx6-colibri.dts new file +411 -0
@@ -0,0 +1,411 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 +/* + * Copyright 2019 Toradex AG + */ + +/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include "imx6dl.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S"; + compatible = "toradex,colibri_imx6dl", "fsl,imx6dl"; + + /* Will be filled by the bootloader */ + memory at 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 at 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 + >; + }; +};
board/toradex/colibri_imx6/MAINTAINERS +2 -0
@@ -1,7 +1,9 @@ Colibri iMX6 M: Max Krummenacher <[email protected]> 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
configs/colibri_imx6_defconfig +2 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 6/26 colibri_imx6: migrate to using device tree
Quoted 4 lines
From: Marcel Ziswiler <[email protected]> Migrate to using device tree required for further driver model integration.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 7/26 colibri_imx6: clean-up and migrate gpios to using driver model
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
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.
---
board/toradex/colibri_imx6/colibri_imx6.c | 209 ++++++++++++++-------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 135 insertions(+), 75 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +134 -75
@@ -2,39 +2,34 @@/* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices <[email protected]> -* Copyright (C) 2014-2016, Toradex AG +* Copyright (C) 2014-2019, Toradex AG * copied from nitrogen6x */ #include <common.h> #include <dm.h> +#include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/iomux.h> -#include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-ddr.h> +#include <asm/arch/mx6-pins.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/sys_proto.h> #include <asm/bootm.h> #include <asm/gpio.h> +#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/sata.h> -#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> -#include <asm/io.h> #include <dm/platform_data/serial_mxc.h> -#include <dm/platdata.h> +#include <environment.h> #include <fsl_esdhc.h> #include <i2c.h> -#include <input.h> #include <imx_thermal.h> -#include <linux/errno.h> -#include <malloc.h> #include <micrel.h> #include <miiphy.h> -#include <mmc.h> #include <netdev.h> #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<A>" ); +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 ,
configs/colibri_imx6_defconfig +1 -0
@@ -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
Signature · 1 line
2.20.1
PATCH 7/26 colibri_imx6: clean-up and migrate gpios to using driver model
Quoted 7 lines
From: Marcel Ziswiler <[email protected]>
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 <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 8/26 colibri_imx6: enable pin control driver
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Enable pin control driver as required for further driver model migration.
---
configs/colibri_imx6_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/colibri_imx6_defconfig +2 -0
@@ -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
Signature · 1 line
2.20.1
PATCH 8/26 colibri_imx6: enable pin control driver
Quoted 4 lines
From: Marcel Ziswiler <[email protected]> Enable pin control driver as required for further driver model migration.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 9/26 colibri_imx6: migrate i2c to using driver model
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Migrate I2C to using driver model.
---
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(-)
board/toradex/colibri_imx6/colibri_imx6.c +2 -48
@@ -20,13 +20,11 @@#include <asm/gpio.h> #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> -#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> #include <dm/platform_data/serial_mxc.h> #include <environment.h> #include <fsl_esdhc.h> -#include <i2c.h> #include <imx_thermal.h> #include <micrel.h> #include <miiphy.h>
@@ -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 */
board/toradex/colibri_imx6/pf0100.c +29 -25
156 lines not on this page · raw message
configs/colibri_imx6_defconfig +1 -0
@@ -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
include/configs/colibri_imx6.h +4 -4
@@ -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
Signature · 1 line
2.20.1
PATCH 9/26 colibri_imx6: migrate i2c to using driver model
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Migrate I2C to using driver model.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 10/26 colibri_imx6: migrate pmic and regulator to using driver model
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Migrate PMIC and regulator to using driver model.
---
configs/colibri_imx6_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
configs/colibri_imx6_defconfig +7 -0
@@ -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
Signature · 1 line
2.20.1
PATCH 10/26 colibri_imx6: migrate pmic and regulator to using driver model
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Migrate PMIC and regulator to using driver model.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 11/26 colibri_imx6: migrate mmc to using driver model
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Migrate MMC to using driver model.
---
board/toradex/colibri_imx6/colibri_imx6.c | 38 +++-------------------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 5 insertions(+), 34 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +4 -34
@@ -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) {
configs/colibri_imx6_defconfig +1 -0
@@ -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
Signature · 1 line
2.20.1
PATCH 11/26 colibri_imx6: migrate mmc to using driver model
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Migrate MMC to using driver model.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 12/26 colibri_imx6: migrate usb to using driver model
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Migrate USB to using driver model.
---
board/toradex/colibri_imx6/colibri_imx6.c | 23 +---------------------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 2 insertions(+), 22 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +1 -22
@@ -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 */
configs/colibri_imx6_defconfig +1 -0
@@ -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"
Signature · 1 line
2.20.1
PATCH 12/26 colibri_imx6: migrate usb to using driver model
Quoted 3 lines
From: Marcel Ziswiler <[email protected]> Migrate USB to using driver model.
Signed-off-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 13/26 colibri_imx6: drop CONFIG_OF_SYSTEM_SETUP
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
This doesn't do anything anymore, probably never did.
---
board/toradex/colibri_imx6/colibri_imx6.c | 7 ------- include/configs/colibri_imx6.h | 2 -- 2 files changed, 9 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +0 -7
@@ -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" ;
include/configs/colibri_imx6.h +0 -2
@@ -237,8 +237,6 @@#define CONFIG_SYS_MMC_ENV_PART 1#endif -#define CONFIG_OF_SYSTEM_SETUP -#define CONFIG_CMD_TIME #endif /* __CONFIG_H */
Signature · 1 line
2.20.1
PATCH 13/26 colibri_imx6: drop CONFIG_OF_SYSTEM_SETUP
Quoted 4 lines
From: Max Krummenacher <[email protected]> This doesn't do anything anymore, probably never did.
Signed-off-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 14/26 colibri_imx6: print also 64-bit IT
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
Print also for Colibri iMX6 512MB IT with 64-bit RAM bus.
---
board/toradex/colibri_imx6/colibri_imx6.c | 1 + 1 file changed, 1 insertion(+)
board/toradex/colibri_imx6/colibri_imx6.c +1 -0
@@ -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" );
Signature · 1 line
2.20.1
PATCH 14/26 colibri_imx6: print also 64-bit IT
Quoted 4 lines
From: Max Krummenacher <[email protected]> Print also for Colibri iMX6 512MB IT with 64-bit RAM bus.
Signed-off-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 15/26 colibri_imx6: add distroboot support
In reply to Marcel ZiswilerFrom: Stefan Agner <[email protected]>
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.
---
include/configs/colibri_imx6.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
include/configs/colibri_imx6.h +15 -8
@@ -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 <config_distro_bootcmd.h> +#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" \
Signature · 1 line
2.20.1
PATCH 15/26 colibri_imx6: add distroboot support
Quoted 14 lines
From: Stefan Agner <[email protected]>
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:
rundistro_bootcmd
As well as direct boot commands such as:
runbootcmd_mmc1
runbootcmd_usb
runbootcmd_dhcp
...
Refer to doc/README.distro fo details.
While at it, remove theCONFIG_DRIVE_TYPESdefine which has not been used and was meant to be used for multi device boot support which is now provided by distroboot.
Quoted 3 lines
Signed-off-by Stefan Agner <[email protected]>Acked-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 16/26 colibri_imx6: unify sd/mmc drive strenght with linux kernel settings
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
In the linux device tree we use 40Ohm drive strenght. So use the same value in U-Boot.
---
board/toradex/colibri_imx6/colibri_imx6.c | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +14 -10
@@ -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 */
Signature · 1 line
2.20.1
PATCH 16/26 colibri_imx6: unify sd/mmc drive strenght with linux kernel settings
Quoted 5 lines
From: Max Krummenacher <[email protected]>
In the linux device tree we use 40Ohm drive strenght. So use the same value in U-Boot.Signed-off-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 17/26 colibri imx6: pf0100: reorder and cleanup message printing
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
Keep debug code at the end of the function. Use a one line informational message for the PMIC only.
---
board/toradex/colibri_imx6/pf0100.c | 82 ++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-)
board/toradex/colibri_imx6/pf0100.c +41 -41
@@ -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; }
Signature · 1 line
2.20.1
PATCH 17/26 colibri imx6: pf0100: reorder and cleanup message printing
Quoted 5 lines
From: Max Krummenacher <[email protected]> Keep debug code at the end of the function. Use a one line informational message for the PMIC only.
Signed-off-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 18/26 colibri imx6: disable ri and dcd irq in uarts
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
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.
---
board/toradex/colibri_imx6/colibri_imx6.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
board/toradex/colibri_imx6/colibri_imx6.c +8 -1
@@ -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 )
Signature · 1 line
2.20.1
PATCH 18/26 colibri imx6: disable ri and dcd irq in uarts
Quoted 8 lines
From: Max Krummenacher <[email protected]>
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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 19/26 colibri_imx6: change pmic fusing according to hw 1.1 requirements
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
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.
---
board/toradex/colibri_imx6/pf0100_otp.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
board/toradex/colibri_imx6/pf0100_otp.inc +9 -7
@@ -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 -}; +};
Signature · 1 line
2.20.1
PATCH 19/26 colibri_imx6: change pmic fusing according to hw 1.1 requirements
Quoted 7 lines
From: Max Krummenacher <[email protected]> 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 <[email protected]>Acked-by Stefan Agner <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 20/26 colibri_imx6: revert fuse value set in mfgr_fuse
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
We have two commands to change the bootmode fuses:mfgr_fuse which set fuse 0/5 and 0/6
andupdt_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.
---
board/toradex/colibri_imx6/do_fuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/toradex/colibri_imx6/do_fuse.c +1 -1
@@ -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 ;
Signature · 1 line
2.20.1
PATCH 20/26 colibri_imx6: revert fuse value set in mfgr_fuse
Quoted 19 lines
From: Max Krummenacher <[email protected]> We have two commands to change the bootmode fuses:
mfgr_fusewhich set fuse 0/5 and 0/6
andupdt_fusewhich burns bit 4 of 0/5.
Before Image 2.6 we fused inmfgr_fuse0x5062, 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 of0x5072which could be achived by the then addedupdt_fusecommand. At the same time themfgr_fusecommand was changed to also fuse0x5072, revert that second change so that one can fuse both values, one with justmfgr_fuseand the later with mfgr_fuse;updt_fuse.
Note that themfgr_fusecommand is only needed at module production time, a customer might need to useupdt_fusewhen upgrading an older module to be compatible with a newer image. The command is integrated into the image update scripts.
Quoted 3 lines
Signed-off-by Max Krummenacher <[email protected]>Acked-by Stefan Agner <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 21/26 toradex: colibri_imx6: overwrite CMA memory set in device tree
In reply to Marcel ZiswilerFrom: Bhuvanchandra DV <[email protected]>
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.
---
board/toradex/colibri_imx6/colibri_imx6.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
board/toradex/colibri_imx6/colibri_imx6.c +13 -1
@@ -22,6 +22,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> +#include <cpu.h> #include <dm/platform_data/serial_mxc.h> #include <environment.h> #include <fsl_esdhc.h>
@@ -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
Signature · 1 line
2.20.1
PATCH 21/26 toradex: colibri_imx6: overwrite CMA memory set in device tree
Quoted 7 lines
From: Bhuvanchandra DV <[email protected]>
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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 22/26 configs: colibri_imx6: Use ext4 file system by default
In reply to Marcel ZiswilerFrom: Sanchayan Maity <[email protected]>
Use ext4 file system by default.
---
include/configs/colibri_imx6.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/colibri_imx6.h +3 -3
@@ -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...; " \
Signature · 1 line
2.20.1
PATCH 22/26 configs: colibri_imx6: Use ext4 file system by default
Quoted 5 lines
From: Sanchayan Maity <[email protected]> Use ext4 file system by default.
Signed-off-by Sanchayan Maity <[email protected]>Acked-by Max Krummenacher <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 23/26 colibri_imx6: use SDP if USB serial downloader has been used
In reply to Marcel ZiswilerFrom: Stefan Agner <[email protected]>
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.
---
board/toradex/colibri_imx6/colibri_imx6.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
board/toradex/colibri_imx6/colibri_imx6.c +9 -1
@@ -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,
Signature · 1 line
2.20.1
PATCH 23/26 colibri_imx6: use SDP if USB serial downloader has been used
Quoted 8 lines
From: Stefan Agner <[email protected]>
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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 24/26 colibri_imx6: switch to zimage
In reply to Marcel ZiswilerFrom: Bhuvanchandra DV <[email protected]>
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.
---
include/configs/colibri_imx6.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/configs/colibri_imx6.h +11 -11
@@ -108,17 +108,17 @@#include <config_distro_bootcmd.h> #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" \
Signature · 1 line
2.20.1
PATCH 24/26 colibri_imx6: switch to zimage
Hi Marcel,
Quoted 5 lines
From: Bhuvanchandra DV <[email protected]>
Switch to the generic compressed Kernel image type (zImage) instead of the U-Boot specific uImage format.
I would recommend switching to use fitImage instead of zImage.
You can look on display5 board for a reference.
Quoted 88 lines
While at it also fix device tree naming for MMC DFU.
Signed-off-by Bhuvanchandra DV <[email protected]>Acked-by Marcel Ziswiler <[email protected]>---
include/configs/colibri_imx6.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)(quoted diff) +0
-0
b/include/configs/colibri_imx6.hindex6e056aab31..a6a823ee1f100644include/configs/colibri_imx6.h +5
-5@@ -108,17 +108,17 @@#include <config_distro_bootcmd.h> #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,noatimerootfstype=ext4 " \ @@ -128,7 +128,7 @@
"${vidargs}; echo Booting from internal eMMC
chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} "
\ "${boot_file} && runfdt_fixup&& " \include/configs/colibri_imx6.h +1
-1-"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"
include/configs/colibri_imx6.h +1
-1@@ -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"
include/configs/colibri_imx6.h +1
-1-#define SD_BOOTCMD \ +#define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatimerootfstype=ext4 " \ "rootwait\0" \
include/configs/colibri_imx6.h +1
-1"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"
include/configs/colibri_imx6.h +0
-0@@ -171,7 +171,7 @@ "${usbargs} ${vidargs}; echo Booting from USBstick...; " \ "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ "${boot_file} && run
fdt_fixup&& " \include/configs/colibri_imx6.h +1
-1-"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"
include/configs/colibri_imx6.h +1
-1@@ -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
Quoted 2 lines
galcore.contiguousSize=50331648\0" \ "dfu_alt_info="
DFU_ALT_EMMC_INFO"\0" \
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190208/41e58ba6/attachment.sig>
PATCH 24/26 colibri_imx6: switch to zimage
Hi Lukasz
Quoted 10 lines · Lukasz Majewski
Hi Marcel,
Quoted 6 lines
From: Bhuvanchandra DV <[email protected]>
Switch to the generic compressed Kernel image type (zImage) instead of
the U-Boot specific uImage format.I would recommend switching to use fitImage instead of zImage.
Thanks, we are, of course, aware of fitImage and we do use it e.g. for the Toradex Easy Installer. However, while our former BSPs still booted from uImage our current BSPs now boot from zImage. In the future, we plan to fully integrate distroboot which basically makes this choice here obsolete anyway.
Quoted 98 lines
You can look on display5 board for a reference.
Quoted 89 lines
While at it also fix device tree naming for MMC DFU.
Signed-off-by Bhuvanchandra DV <[email protected]>Acked-by Marcel Ziswiler <[email protected]>---
include/configs/colibri_imx6.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)(quoted diff) +0
-0
b/include/configs/colibri_imx6.hindex6e056aab31..a6a823ee1f100644include/configs/colibri_imx6.h +5
-5@@ -108,17 +108,17 @@#include <config_distro_bootcmd.h> #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,noatimerootfstype=ext4 " \ @@ -128,7 +128,7 @@
"${vidargs}; echo Booting from internal eMMC
chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} "
\ "${boot_file} && runfdt_fixup&& " \include/configs/colibri_imx6.h +1
-1-"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"
include/configs/colibri_imx6.h +1
-1@@ -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"
include/configs/colibri_imx6.h +1
-1-#define SD_BOOTCMD \ +#define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatimerootfstype=ext4 " \ "rootwait\0" \
include/configs/colibri_imx6.h +1
-1"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"
include/configs/colibri_imx6.h +0
-0@@ -171,7 +171,7 @@ "${usbargs} ${vidargs}; echo Booting from USBstick...; " \ "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ "${boot_file} && run
fdt_fixup&& " \include/configs/colibri_imx6.h +1
-1-"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"
include/configs/colibri_imx6.h +1
-1@@ -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=offQuoted 2 lines
galcore.contiguousSize=50331648\0" \ "dfu_alt_info="
DFU_ALT_EMMC_INFO"\0" \Best regards,
Quoted 8 lines
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email:
lukma at denx.de
Best regards - Mit freundlichen Grüssen - Meilleures salutations
Marcel Ziswiler
Platform Manager Embedded Linux
Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48 00 (main line) | Direct: +41 41 500 48 10
PATCH 24/26 colibri_imx6: switch to zimage
In reply to Marcel ZiswilerQuoted 6 lines
From: Bhuvanchandra DV <[email protected]> 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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 25/26 colibri_imx6: added nreset gpio on reboot
In reply to Marcel ZiswilerFrom: Gerard Salvatella <[email protected]>
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.
---
board/toradex/colibri_imx6/colibri_imx6.c | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+)
board/toradex/colibri_imx6/colibri_imx6.c +24 -0
@@ -30,6 +30,7 @@#include <micrel.h> #include <miiphy.h> #include <netdev.h> +#include <cpu.h> #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 ); }
Signature · 1 line
2.20.1
PATCH 25/26 colibri_imx6: added nreset gpio on reboot
Quoted 8 lines
From: Gerard Salvatella <[email protected]>
RGMII_RD1pin (active high,GPIO6_IO27) is triggered on reboot during the SPL phase. This asserts (active low)nReset_Outfrom 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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 26/26 board: colibri_imx6: check for and report ecc errors in fuses
In reply to Marcel ZiswilerFrom: Gerard Salvatella <[email protected]>
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.
---
board/toradex/colibri_imx6/pf0100.c | 51 +++++++++++++++++++++++++ board/toradex/colibri_imx6/pf0100.h | 59 ++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-)
board/toradex/colibri_imx6/pf0100.c +51 -0
@@ -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" );
board/toradex/colibri_imx6/pf0100.h +57 -2
86 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 26/26 board: colibri_imx6: check for and report ecc errors in fuses
Quoted 7 lines
From: Gerard Salvatella <[email protected]> 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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 26/26 board: colibri_imx6: check for and report ecc errors in fuses
Hi Stefano
Quoted 9 lines · sbabic at denx.de
Quoted 7 lines
From: Gerard Salvatella <[email protected]> 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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>Applied to u-boot-imx, -next, thanks !
Unfortunately, I can't find that one anywhere on u-boot-imx.git/next.
I will resend it as a separate patch for you to pick up, OK?
BTW: I will also send a V2 of the Colibri Vybrid stuff, plus the Colibri iMX6ULL overhaul and the initial add of the Colibri iMX8QXP.
Quoted 2 lines
Best regards,
Stefano Babic
Cheers
Marcel
PATCH 26/26 board: colibri_imx6: check for and report ecc errors in fuses
Quoted 11 lines · Marcel Ziswiler
Hi Stefano
Quoted 8 lines · sbabic at denx.de
Quoted 7 lines
From: Gerard Salvatella <[email protected]> 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 <[email protected]>Acked-by Marcel Ziswiler <[email protected]>
Quoted 5 lines
Quoted 1 line
Applied to u-boot-imx, -next, thanks !
Unfortunately, I can't find that one anywhere on u-boot-imx.git/next.
I will resend it as a separate patch for you to pick up, OK?
mmhhh...I have applied them, I see in my local -next, I am sure I pushed before. Let me see why they do not appear on git.denx.de, you do not need to repush, they are alreay applied.
Quoted 3 lines
BTW: I will also send a V2 of the Colibri Vybrid stuff, plus the Colibri iMX6ULL overhaul and the initial add of the Colibri iMX8QXP.
Ok, thanks for info. I set V1 as obsolete in patchwork.
Regards,
Stefano
Quoted 8 lines
Quoted 3 lines
Best regards,
Stefano BabicCheers
Marcel
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================