May 2014 - U-Boot

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 09 May '14

09 May '14

Hello Tom, The following changes since commit 173d294b94cfec10063a5be40934d6d8fb7981ce: Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze (2014-05-06 14:55:45 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19: Merge branch 'u-boot/master' (2014-05-09 11:50:14 +0200) Note that there was a trivial merge conflict between ARM and mainline trees on drivers/net/Makefile: <<<<<<< HEAD obj-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o ======= >>>>>>> u-boot/master This is solved in the ARM ToT commit d2a3e911. ---------------------------------------------------------------- Albert ARIBAUD (3): Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' Karicheri, Muralidharan (6): tools: mkimage: add support for gpimage format NAND: DaVinci: allow forced disable of subpage writes i2c, davinci: move i2c_defs.h to the drivers/i2c directory spi: davinci: add support for multiple bus and chip select k2hk-evm: add configuration for spi1 and spi2 support keystone2: net: add keystone ethernet driver Manish Badarkhe (1): arm, da850: staticize funtions Nishanth Menon (11): OMAP: common: consolidate fake USB ethernet MAC address creation omap3/sys_info: provide interface to read die id OMAP3: beagle-xm: generate fake USB ethernet MAC address from dieid omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARD OMAP3: zoom1: Configure GPMC for Ethernet OMAP3: zoom1: enable LAN9211 omap3: zoom1: enable common network commands omap3: zoom1: disable JFFS2 and enable FS_GENERIC omap3: zoom1: enable bootz omap3: zoom1: fix default console omap3: zoom1: switch to generic ti_omap3_common config header Poddar, Sourav (1): spi: ti_qspi: Add delay for successful bulk erase. Rob Herring (2): ARM: highbank: use config_distro_defaults.h ARM: highbank: use default prompt Stefan Agner (3): usb: tegra: fix USB2 powerdown for Tegra30 and later usb: tegra: fix PHY configuration usb: tegra: combine header file Stephen Warren (14): ARM: tegra: pinctrl: remove func_safe ARM: tegra: pinctrl: remove vddio ARM: tegra: pinctrl: make pmux_func values consistent on Tegra20 ARM: tegra: prototype pinmux_init() in board.h ARM: tegra: use apb_misc.h in more places ARM: tegra: pinctrl: remove duplication ARM: tegra: reduce public pinmux API ARM: tegra: pinmux naming consistency fixes ARM: tegra: Tegra20 pinmux cleanup ARM: tegra: Tegra30 pinmux cleanup ARM: tegra: Tegra114 pinmux cleanup ARM: tegra: Tegra124 pinmux cleanup ARM: tegra: add Jetson TK1 board ARM: tegra: pack pinmux data tables tighter Tom Rini (22): fw_env.c: Switch get_config to use '%ms' in sscanf env_mmc.c: Allow environment to be used within SPL env_mmc.c: Remove NULL check on tmp_env1/2 mtd: Add a CONFIG_SPL_MTD_SUPPORT for a more full NAND subsystem in SPL mtd: Build nand_util.o for CONFIG_ENV_IS_IN_NAND in SPL am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode README: Add CONFIG_SPL_OS_BOOT to README README.falcon: Document environment variables for falcon mode a3m071: Make spl_start_uboot test like getenv_yesno does spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string am335x_evm: Update the ramdisk args, we pass things in just fine via DT am43xx_evm: Update the ramdisk args, we pass things in just fine via DT TI:omap5: Move CONFIG_ENV_SIZE to board config files TI:armv7: Change Falcon Mode DT load address am335x_evm: Drop SPI SPL support from the default build SPL:SPI: Add Falcon Mode support dra7xx_evm: Add QSPI_4 support, qspiboot build target TI:armv7: Switch to CONFIG_SYS_BOARD_GENERIC TI:omap3: Convert omap3_beagle to ti_omap3_common.h am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOT am43xx_evm: Drop SPI SPL Vitaly Andrianov (5): fdt: call ft_board_setup_ex() at the end of image_setup_libfdt() arm: add support for arch timer i2c, davinci: convert driver to new mutlibus/mutliadapter framework k2hk: add support for k2hk SOC and EVM keystone2: add keystone multicore navigator driver Wolfgang Denk (3): ARM: OMAP: remove sr32() from OMAP board code ARM: OMAP: hide custom bit manipulation function sr32() ARM: OMAP: replace custom sr32() by standard I/O accessors Makefile | 10 ++ README | 13 ++ arch/arm/cpu/arm720t/tegra-common/spl.c | 6 +- arch/arm/cpu/arm720t/tegra114/cpu.c | 4 +- arch/arm/cpu/arm720t/tegra124/cpu.c | 4 +- arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 6 +- arch/arm/cpu/arm926ejs/davinci/dm355.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm365.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm644x.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm646x.c | 2 +- arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/am33xx/board.c | 4 +- arch/arm/cpu/armv7/am33xx/emif4.c | 2 +- arch/arm/cpu/armv7/arch_timer.c | 58 +++++++ arch/arm/cpu/armv7/keystone/Makefile | 17 ++ arch/arm/cpu/armv7/keystone/aemif.c | 71 ++++++++ arch/arm/cpu/armv7/keystone/clock.c | 318 +++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 124 ++++++++++++++ arch/arm/cpu/armv7/keystone/cmd_mon.c | 131 +++++++++++++++ arch/arm/cpu/armv7/keystone/ddr3.c | 69 ++++++++ arch/arm/cpu/armv7/keystone/init.c | 56 ++++++ arch/arm/cpu/armv7/keystone/keystone_nav.c | 376 +++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/keystone/msmc.c | 68 ++++++++ arch/arm/cpu/armv7/keystone/psc.c | 237 ++++++++++++++++++++++++++ arch/arm/cpu/armv7/keystone/spl.c | 45 +++++ arch/arm/cpu/armv7/omap-common/boot-common.c | 11 ++ arch/arm/cpu/armv7/omap-common/utils.c | 21 +++ arch/arm/cpu/armv7/omap3/board.c | 4 +- arch/arm/cpu/armv7/omap3/clock.c | 355 +++++++++++++++++++++----------------- arch/arm/cpu/armv7/omap3/sys_info.c | 19 ++- arch/arm/cpu/armv7/syslib.c | 13 -- arch/arm/cpu/tegra-common/Makefile | 6 +- arch/arm/cpu/tegra-common/pinmux-common.c | 508 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/tegra114-common/funcmux.c | 32 ++-- arch/arm/cpu/tegra114-common/pinmux.c | 895 ++++++++++++++++++++++++------------------------------------------------------------------------ arch/arm/cpu/tegra124-common/funcmux.c | 38 +++-- arch/arm/cpu/tegra124-common/pinmux.c | 898 ++++++++++++++++++++++++++----------------------------------------------------------------------- arch/arm/cpu/tegra20-common/emc.c | 2 +- arch/arm/cpu/tegra20-common/funcmux.c | 185 ++++++++++---------- arch/arm/cpu/tegra20-common/pinmux.c | 416 ++++++++++++++++----------------------------- arch/arm/cpu/tegra20-common/warmboot.c | 8 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 6 +- arch/arm/cpu/tegra30-common/funcmux.c | 20 ++- arch/arm/cpu/tegra30-common/pinmux.c | 948 +++++++++++++++++++++++++++++------------------------------------------------------------------------- arch/arm/dts/Makefile | 1 + arch/arm/dts/tegra124-jetson-tk1.dts | 84 +++++++++ arch/arm/include/asm/arch-davinci/da850_lowlevel.h | 3 - arch/arm/include/asm/arch-davinci/i2c_defs.h | 71 +------- arch/arm/include/asm/arch-keystone/clock-k2hk.h | 109 ++++++++++++ arch/arm/include/asm/arch-keystone/clock.h | 17 ++ arch/arm/include/asm/arch-keystone/clock_defs.h | 111 ++++++++++++ arch/arm/include/asm/arch-keystone/emac_defs.h | 240 ++++++++++++++++++++++++++ arch/arm/include/asm/arch-keystone/emif_defs.h | 73 ++++++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 150 +++++++++++++++++ arch/arm/include/asm/arch-keystone/hardware.h | 175 +++++++++++++++++++ arch/arm/include/asm/arch-keystone/i2c_defs.h | 17 ++ arch/arm/include/asm/arch-keystone/keystone_nav.h | 193 +++++++++++++++++++++ arch/arm/include/asm/arch-keystone/nand_defs.h | 23 +++ arch/arm/include/asm/arch-keystone/psc_defs.h | 90 ++++++++++ arch/arm/include/asm/arch-keystone/spl.h | 12 ++ arch/arm/include/asm/arch-omap3/sys_proto.h | 3 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 1 - arch/arm/include/asm/arch-omap5/sys_proto.h | 1 - arch/arm/include/asm/{arch-tegra20 => arch-tegra}/apb_misc.h | 2 + arch/arm/include/asm/arch-tegra/board.h | 1 + arch/arm/include/asm/arch-tegra/pinmux.h | 185 ++++++++++++++++++++ arch/arm/include/asm/arch-tegra/usb.h | 223 +++++++++++++++++++++++- arch/arm/include/asm/arch-tegra114/pinmux.h | 836 +++++++++++++++++++++++++++++------------------------------------------------------------- arch/arm/include/asm/arch-tegra114/usb.h | 156 ----------------- arch/arm/include/asm/arch-tegra124/pinmux.h | 866 ++++++++++++++++++++++++++++++++------------------------------------------------------------- arch/arm/include/asm/arch-tegra124/usb.h | 268 ----------------------------- arch/arm/include/asm/arch-tegra20/pinmux.h | 372 +++++++++++++++------------------------- arch/arm/include/asm/arch-tegra20/usb.h | 155 ----------------- arch/arm/include/asm/arch-tegra30/pinmux.h | 963 ++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------ arch/arm/include/asm/arch-tegra30/usb.h | 168 ------------------ arch/arm/include/asm/omap_common.h | 2 + board/a3m071/a3m071.c | 3 +- board/avionic-design/common/pinmux-config-tamonten-ng.h | 492 ++++++++++++++++++++++++++--------------------------- board/avionic-design/common/tamonten-ng.c | 12 +- board/avionic-design/common/tamonten.c | 4 +- board/compal/paz00/paz00.c | 22 +-- board/compulab/trimslice/trimslice.c | 4 +- board/logicpd/zoom1/config.mk | 1 - board/logicpd/zoom1/zoom1.c | 38 ++++- board/logicpd/zoom1/zoom1.h | 19 ++- board/nvidia/cardhu/cardhu.c | 6 +- board/nvidia/cardhu/pinmux-config-cardhu.h | 498 +++++++++++++++++++++++++++--------------------------- board/nvidia/common/board.c | 9 +- board/nvidia/dalmore/dalmore.c | 9 +- board/nvidia/dalmore/pinmux-config-dalmore.h | 388 +++++++++++++++++++++--------------------- board/nvidia/harmony/harmony.c | 18 +- board/nvidia/jetson-tk1/Makefile | 9 + board/nvidia/jetson-tk1/jetson-tk1.c | 23 +++ board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 227 +++++++++++++++++++++++++ board/nvidia/seaboard/seaboard.c | 6 +- board/nvidia/venice2/as3722_init.h | 4 + board/nvidia/venice2/pinmux-config-venice2.h | 360 +++++++++++++++++++-------------------- board/nvidia/venice2/venice2.c | 15 +- board/silica/pengwyn/Makefile | 2 +- board/ti/am335x/Makefile | 2 +- board/ti/am335x/board.c | 15 +- board/ti/beagle/beagle.c | 11 ++ board/ti/dra7xx/evm.c | 19 +++ board/ti/k2hk_evm/Makefile | 9 + board/ti/k2hk_evm/README | 122 ++++++++++++++ board/ti/k2hk_evm/board.c | 301 +++++++++++++++++++++++++++++++++ board/ti/k2hk_evm/ddr3.c | 268 +++++++++++++++++++++++++++++ board/ti/omap5_uevm/evm.c | 25 +-- board/ti/panda/panda.c | 23 +-- board/toradex/colibri_t20-common/colibri_t20-common.c | 8 +- board/toradex/colibri_t20_iris/colibri_t20_iris.c | 4 +- boards.cfg | 5 +- common/env_mmc.c | 49 ++++-- common/image-fdt.c | 5 + common/image.c | 1 + common/spl/spl_fat.c | 27 +++ doc/README.falcon | 13 ++ drivers/i2c/Makefile | 2 +- drivers/i2c/davinci_i2c.c | 402 +++++++++++++++++++++++++------------------ drivers/i2c/davinci_i2c.h | 78 +++++++++ drivers/mtd/nand/Makefile | 3 + drivers/mtd/nand/am335x_spl_bch.c | 54 +++--- drivers/mtd/nand/davinci_nand.c | 3 + drivers/mtd/spi/spi_spl_load.c | 46 ++++- drivers/net/Makefile | 2 + drivers/net/keystone_net.c | 716 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/serial/ns16550.c | 8 + drivers/spi/davinci_spi.c | 49 +++++- drivers/spi/davinci_spi.h | 33 ++++ drivers/spi/tegra20_sflash.c | 6 +- drivers/spi/ti_qspi.c | 3 + drivers/usb/host/ehci-tegra.c | 28 ++- drivers/video/tegra.c | 4 +- include/configs/am335x_evm.h | 25 ++- include/configs/am43xx_evm.h | 17 +- include/configs/cam_enc_4xx.h | 8 +- include/configs/da830evm.h | 8 +- include/configs/da850evm.h | 8 +- include/configs/davinci_dm355evm.h | 8 +- include/configs/davinci_dm355leopard.h | 8 +- include/configs/davinci_dm365evm.h | 8 +- include/configs/davinci_dm6467evm.h | 8 +- include/configs/davinci_dvevm.h | 8 +- include/configs/davinci_schmoogie.h | 8 +- include/configs/davinci_sffsdr.h | 8 +- include/configs/davinci_sonata.h | 8 +- include/configs/dra7xx_evm.h | 38 ++++- include/configs/ea20.h | 7 +- include/configs/enbw_cmc.h | 8 +- include/configs/highbank.h | 26 +-- include/configs/jetson-tk1.h | 79 +++++++++ include/configs/k2hk_evm.h | 256 ++++++++++++++++++++++++++++ include/configs/omap3_beagle.h | 184 ++------------------ include/configs/omap3_zoom1.h | 167 ++++++------------ include/configs/omap5_uevm.h | 1 + include/configs/ti_am335x_common.h | 2 + include/configs/ti_armv7_common.h | 34 +++- include/configs/ti_omap3_common.h | 4 + include/configs/ti_omap4_common.h | 6 +- include/configs/ti_omap5_common.h | 9 +- include/fdt_support.h | 7 + include/image.h | 1 + spl/Makefile | 1 + tools/Makefile | 2 + tools/env/fw_env.c | 13 +- tools/gpheader.h | 40 +++++ tools/gpimage-common.c | 80 +++++++++ tools/gpimage.c | 77 +++++++++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + tools/omapimage.c | 104 ++---------- tools/omapimage.h | 5 - 172 files changed, 10253 insertions(+), 7128 deletions(-) create mode 100644 arch/arm/cpu/armv7/arch_timer.c create mode 100644 arch/arm/cpu/armv7/keystone/Makefile create mode 100644 arch/arm/cpu/armv7/keystone/aemif.c create mode 100644 arch/arm/cpu/armv7/keystone/clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_mon.c create mode 100644 arch/arm/cpu/armv7/keystone/ddr3.c create mode 100644 arch/arm/cpu/armv7/keystone/init.c create mode 100644 arch/arm/cpu/armv7/keystone/keystone_nav.c create mode 100644 arch/arm/cpu/armv7/keystone/msmc.c create mode 100644 arch/arm/cpu/armv7/keystone/psc.c create mode 100644 arch/arm/cpu/armv7/keystone/spl.c create mode 100644 arch/arm/cpu/tegra-common/pinmux-common.c create mode 100644 arch/arm/dts/tegra124-jetson-tk1.dts create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/clock.h create mode 100644 arch/arm/include/asm/arch-keystone/clock_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emac_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware.h create mode 100644 arch/arm/include/asm/arch-keystone/i2c_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/keystone_nav.h create mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/psc_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/spl.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/apb_misc.h (87%) create mode 100644 arch/arm/include/asm/arch-tegra/pinmux.h delete mode 100644 arch/arm/include/asm/arch-tegra114/usb.h delete mode 100644 arch/arm/include/asm/arch-tegra124/usb.h delete mode 100644 arch/arm/include/asm/arch-tegra20/usb.h delete mode 100644 arch/arm/include/asm/arch-tegra30/usb.h create mode 100644 board/nvidia/jetson-tk1/Makefile create mode 100644 board/nvidia/jetson-tk1/jetson-tk1.c create mode 100644 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h create mode 100644 board/ti/k2hk_evm/Makefile create mode 100644 board/ti/k2hk_evm/README create mode 100644 board/ti/k2hk_evm/board.c create mode 100644 board/ti/k2hk_evm/ddr3.c create mode 100644 drivers/i2c/davinci_i2c.h create mode 100644 drivers/net/keystone_net.c create mode 100644 include/configs/jetson-tk1.h create mode 100644 include/configs/k2hk_evm.h create mode 100644 tools/gpheader.h create mode 100644 tools/gpimage-common.c create mode 100644 tools/gpimage.c Amicalement, -- Albert.

2 1

[U-Boot] [sparc] Pull request
by Daniel Hellstrom 09 May '14

09 May '14

Hello Tom, Please pull from u-boot-sparc.git, thanks! One of the fixes enables the SPARC platform to build again, sorry for the long delay and thanks for informing me about the problem. The following changes since commit 09865465821fd35eabedcd9f102f1d576c626ad8: Michal Simek (1): serial: zynq: Fix typo in suffix function name are available in the git repository at: git://git.denx.de/u-boot-sparc.git master Daniel Hellstrom (2): leon: use CONFIG_SYS_HZ to config timer prescaler leon: implement missing get_tbclk() arch/sparc/cpu/leon2/cpu_init.c | 22 ++++++++++++++-------- arch/sparc/cpu/leon3/cpu_init.c | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) Best Regards, -- Daniel Hellstrom Software Section Head Aeroflex Gaisler AB Aeroflex Microelectronic Solutions – HiRel Kungsgatan 12 SE-411 19 Gothenburg, Sweden Phone: +46 31 7758657 daniel(a)gaisler.com www.Aeroflex.com/Gaisler

2 2

[U-Boot] [PATCH] zynq: add empty xil_io.h to avoid compile error
by Masahiro Yamada 09 May '14

09 May '14

ps7_init.c exported by hw project has #include "xil_io.h" line but U-Boot does not have "xil_io.h". So we get an error on SPL build: ps7_init.c:12581:20: fatal error: xil_io.h: No such file or directory We can delete the include directive in ps7_init.c to avoid this error. But it is painful to do this every time we export ps7_init.c file. Instead, we can put an empty xil_io.h in the same directory so we can directly copy ps7_init.c as is. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/xil_io.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 board/xilinx/zynq/xil_io.h diff --git a/board/xilinx/zynq/xil_io.h b/board/xilinx/zynq/xil_io.h new file mode 100644 index 0000000..e59a977 --- /dev/null +++ b/board/xilinx/zynq/xil_io.h @@ -0,0 +1,13 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef XIL_IO_H /* prevent circular inclusions */ +#define XIL_IO_H + +/* + * This empty file is here because ps7_init.c exported by hw project + * has #include "xil_io.h" line. + */ + +#endif /* XIL_IO_H */ -- 1.8.3.2

3 2

[U-Boot] [i2c] Pull request
by Heiko Schocher 09 May '14

09 May '14

Hello Tom, please pull from u-boot-i2c.git, thanks! The following changes since commit 173d294b94cfec10063a5be40934d6d8fb7981ce: Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze (2014-05-06 14:55:45 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 5146fc2b37a3098f0973b2f2339e069adfc7d272: i2c: zynq: Fixed compilation errors when using DEBUG (2014-05-08 07:03:37 +0200) ---------------------------------------------------------------- Jesper B. Christensen (1): i2c: zynq: Fixed compilation errors when using DEBUG drivers/i2c/zynq_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH v3 1/2] wandboard: add Future Eletronics 7" WVGA LCD extension board
by Otavio Salvador 09 May '14

09 May '14

This adds support for the 7" WVGA produced by Future Eletronics and make it dynamically detect if it is connected or not based on the touchscreen controller. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v3: - Drop LVDS related code (unused) Changes in v2: - Drop LDB related code (unused) board/wandboard/wandboard.c | 147 ++++++++++++++++++++++++++++++++++++-------- include/configs/wandboard.h | 7 +++ 2 files changed, 128 insertions(+), 26 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index f1951dc..311a442 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. + * Copyright (C) 2014 O.S. Systems Software LTDA. * * Author: Fabio Estevam <fabio.estevam(a)freescale.com> * @@ -15,18 +16,19 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/boot_mode.h> +#include <asm/imx-common/video.h> #include <asm/io.h> #include <linux/sizes.h> #include <common.h> #include <fsl_esdhc.h> -#include <ipu_pixfmt.h> #include <mmc.h> #include <miiphy.h> #include <netdev.h> -#include <linux/fb.h> #include <phy.h> #include <input.h> +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR; @@ -41,6 +43,10 @@ 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 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 USDHC1_CD_GPIO IMX_GPIO_NR(1, 2) #define USDHC3_CD_GPIO IMX_GPIO_NR(3, 9) #define ETH_PHY_RESET IMX_GPIO_NR(3, 29) @@ -210,41 +216,124 @@ int board_phy_config(struct phy_device *phydev) } #if defined(CONFIG_VIDEO_IPUV3) -static struct fb_videomode const hdmi = { - .name = "HDMI", - .refresh = 60, - .xres = 1024, - .yres = 768, - .pixclock = 15385, - .left_margin = 220, - .right_margin = 40, - .upper_margin = 21, - .lower_margin = 7, - .hsync_len = 60, - .vsync_len = 10, - .sync = FB_SYNC_EXT, - .vmode = FB_VMODE_NONINTERLACED +struct i2c_pads_info i2c2_pad_info = { + .scl = { + .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(4, 12) + }, + .sda = { + .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(4, 13) + } }; -int board_video_skip(void) -{ - int ret; +static iomux_v3_cfg_t const fwadapt_7wvga_pads[] = { + MX6_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK, + MX6_PAD_DI0_PIN2__IPU1_DI0_PIN02, /* HSync */ + MX6_PAD_DI0_PIN3__IPU1_DI0_PIN03, /* VSync */ + MX6_PAD_DI0_PIN4__IPU1_DI0_PIN04 + | MUX_PAD_CTRL(PAD_CTL_DSE_120ohm), /* Contrast */ + MX6_PAD_DI0_PIN15__IPU1_DI0_PIN15, /* DISP0_DRDY */ + + MX6_PAD_DISP0_DAT0__IPU1_DISP0_DATA00, + MX6_PAD_DISP0_DAT1__IPU1_DISP0_DATA01, + MX6_PAD_DISP0_DAT2__IPU1_DISP0_DATA02, + MX6_PAD_DISP0_DAT3__IPU1_DISP0_DATA03, + MX6_PAD_DISP0_DAT4__IPU1_DISP0_DATA04, + MX6_PAD_DISP0_DAT5__IPU1_DISP0_DATA05, + MX6_PAD_DISP0_DAT6__IPU1_DISP0_DATA06, + MX6_PAD_DISP0_DAT7__IPU1_DISP0_DATA07, + MX6_PAD_DISP0_DAT8__IPU1_DISP0_DATA08, + MX6_PAD_DISP0_DAT9__IPU1_DISP0_DATA09, + MX6_PAD_DISP0_DAT10__IPU1_DISP0_DATA10, + MX6_PAD_DISP0_DAT11__IPU1_DISP0_DATA11, + MX6_PAD_DISP0_DAT12__IPU1_DISP0_DATA12, + MX6_PAD_DISP0_DAT13__IPU1_DISP0_DATA13, + MX6_PAD_DISP0_DAT14__IPU1_DISP0_DATA14, + MX6_PAD_DISP0_DAT15__IPU1_DISP0_DATA15, + MX6_PAD_DISP0_DAT16__IPU1_DISP0_DATA16, + MX6_PAD_DISP0_DAT17__IPU1_DISP0_DATA17, + + MX6_PAD_SD4_DAT2__GPIO2_IO10 + | MUX_PAD_CTRL(NO_PAD_CTRL), /* DISP0_BKLEN */ + MX6_PAD_SD4_DAT3__GPIO2_IO11 + | MUX_PAD_CTRL(NO_PAD_CTRL), /* DISP0_VDDEN */ +}; - ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24); +static void do_enable_hdmi(struct display_info_t const *dev) +{ + imx_enable_hdmi_phy(); +} - if (ret) { - printf("HDMI cannot be configured: %d\n", ret); - return ret; - } +static int detect_i2c(struct display_info_t const *dev) +{ + return (0 == i2c_set_bus_num(dev->bus)) && + (0 == i2c_probe(dev->addr)); +} - imx_enable_hdmi_phy(); +static void enable_fwadapt_7wvga(struct display_info_t const *dev) +{ + imx_iomux_v3_setup_multiple_pads( + fwadapt_7wvga_pads, + ARRAY_SIZE(fwadapt_7wvga_pads)); - return ret; + gpio_direction_output(IMX_GPIO_NR(2, 10), 1); + gpio_direction_output(IMX_GPIO_NR(2, 11), 1); } +struct display_info_t const displays[] = {{ + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_RGB24, + .detect = detect_hdmi, + .enable = do_enable_hdmi, + .mode = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +} }, { + .bus = 1, + .addr = 0x10, + .pixfmt = IPU_PIX_FMT_RGB666, + .detect = detect_i2c, + .enable = enable_fwadapt_7wvga, + .mode = { + .name = "FWBADAPT-LCD-F07A-0102", + .refresh = 60, + .xres = 800, + .yres = 480, + .pixclock = 33260, + .left_margin = 128, + .right_margin = 128, + .upper_margin = 22, + .lower_margin = 22, + .hsync_len = 1, + .vsync_len = 1, + .sync = 0, + .vmode = FB_VMODE_NONINTERLACED +} } }; +size_t display_count = ARRAY_SIZE(displays); + static void setup_display(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; int reg; enable_ipu_clock(); @@ -254,6 +343,10 @@ static void setup_display(void) reg |= (CHSCCDR_CLK_SEL_LDB_DI0 << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); writel(reg, &mxc_ccm->chsccdr); + + /* Disable LCD backlight */ + imx_iomux_v3_setup_pad(MX6_PAD_DI0_PIN4__GPIO4_IO20); + gpio_direction_input(IMX_GPIO_NR(4, 20)); } #endif /* CONFIG_VIDEO_IPUV3 */ @@ -305,6 +398,8 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c2_pad_info); + return 0; } diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index a49544f..6defc00 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -58,6 +58,12 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 +/* I2C Configs */ +#define CONFIG_CMD_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_SPEED 100000 + /* MMC Configuration */ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC @@ -116,6 +122,7 @@ #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI +#define CONFIG_IMX_VIDEO_SKIP #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" -- 2.0.0.rc0

2 4

[U-Boot] [PATCH] imx: ventana: Convert to generic board
by Tim Harvey 09 May '14

09 May '14

Enable CONFIG_SYS_GENERIC_BOARD on ventana. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- include/configs/gw_ventana.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index b984f27..335f2ff 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -24,6 +24,8 @@ #define CONFIG_SERIAL_TAG #define CONFIG_REVISION_TAG +#define CONFIG_SYS_GENERIC_BOARD + /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -- 1.8.3.2

2 1

[U-Boot] [PATCH] imx6: ventana: fix system-serial dt property
by Tim Harvey 09 May '14

09 May '14

Fix typo in setting of system-serial property causing the prop len to be off by 1. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/gw_ventana/gw_ventana.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index f38a777..79b3e01 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1278,7 +1278,7 @@ void ft_board_setup(void *blob, bd_t *bd) /* board serial number */ fdt_setprop(blob, 0, "system-serial", getenv("serial#"), - strlen(getenv("serial#") + 1)); + strlen(getenv("serial#")) + 1); /* board (model contains model from device-tree) */ fdt_setprop(blob, 0, "board", info->model, -- 1.8.3.2

2 1

[U-Boot] [PATCH] imx: ventana: add HDMI and LVDS display capability
by Tim Harvey 09 May '14

09 May '14

Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/gw_ventana/gw_ventana.c | 134 ++++++++++++++++++++++++++++++++ include/configs/gw_ventana.h | 16 ++++ 2 files changed, 150 insertions(+) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 79b3e01..f5b9f90 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -12,6 +12,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> +#include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> @@ -19,6 +20,7 @@ #include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/boot_mode.h> #include <asm/imx-common/sata.h> +#include <asm/imx-common/video.h> #include <jffs2/load_kernel.h> #include <hwconfig.h> #include <i2c.h> @@ -369,6 +371,135 @@ int board_eth_init(bd_t *bis) return 0; } +#if defined(CONFIG_VIDEO_IPUV3) + +static void enable_hdmi(struct display_info_t const *dev) +{ + imx_enable_hdmi_phy(); +} + +static int detect_i2c(struct display_info_t const *dev) +{ + return ((0 == i2c_set_bus_num(dev->bus)) + && + (0 == i2c_probe(dev->addr))); +} + +static void enable_lvds(struct display_info_t const *dev) +{ + struct iomuxc *iomux = (struct iomuxc *) + IOMUXC_BASE_ADDR; + + /* set CH0 data width to 24bit (IOMUXC_GPR2:5 0=18bit, 1=24bit) */ + u32 reg = readl(&iomux->gpr[2]); + reg |= IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT; + writel(reg, &iomux->gpr[2]); + + /* Enable Backlight */ + imx_iomux_v3_setup_pad(MX6_PAD_SD1_CMD__GPIO1_IO18 | + MUX_PAD_CTRL(NO_PAD_CTRL)); + gpio_direction_output(IMX_GPIO_NR(1, 18), 1); +} + +struct display_info_t const displays[] = {{ + /* HDMI Output */ + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_RGB24, + .detect = detect_hdmi, + .enable = enable_hdmi, + .mode = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +} }, { + /* Freescale MXC-LVDS1: HannStar HSD100PXN1-A00 w/ egalx_ts cont */ + .bus = 2, + .addr = 0x4, + .pixfmt = IPU_PIX_FMT_LVDS666, + .detect = detect_i2c, + .enable = enable_lvds, + .mode = { + .name = "Hannstar-XGA", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +} } }; +size_t display_count = ARRAY_SIZE(displays); + +static void setup_display(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; + int reg; + + enable_ipu_clock(); + imx_setup_hdmi(); + /* Turn on LDB0,IPU,IPU DI0 clocks */ + reg = __raw_readl(&mxc_ccm->CCGR3); + reg |= MXC_CCM_CCGR3_LDB_DI0_MASK; + writel(reg, &mxc_ccm->CCGR3); + + /* set LDB0, LDB1 clk select to 011/011 */ + reg = readl(&mxc_ccm->cs2cdr); + reg &= ~(MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK + |MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK); + reg |= (3<<MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET) + |(3<<MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->cs2cdr); + + reg = readl(&mxc_ccm->cscmr2); + reg |= MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV; + writel(reg, &mxc_ccm->cscmr2); + + reg = readl(&mxc_ccm->chsccdr); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + <<MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->chsccdr); + + reg = IOMUXC_GPR2_BGREF_RRMODE_EXTERNAL_RES + |IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_HIGH + |IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW + |IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG + |IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT + |IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG + |IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT + |IOMUXC_GPR2_LVDS_CH1_MODE_DISABLED + |IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0; + writel(reg, &iomux->gpr[2]); + + reg = readl(&iomux->gpr[3]); + reg = (reg & ~IOMUXC_GPR3_LVDS0_MUX_CTL_MASK) + | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 + <<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET); + writel(reg, &iomux->gpr[3]); + + /* Backlight CABEN on LVDS connector */ + imx_iomux_v3_setup_pad(MX6_PAD_SD2_CLK__GPIO1_IO10 | + MUX_PAD_CTRL(NO_PAD_CTRL)); + gpio_direction_output(IMX_GPIO_NR(1, 10), 0); +} +#endif /* CONFIG_VIDEO_IPUV3 */ + /* read ventana EEPROM, check for validity, and return baseboard type */ static int read_eeprom(void) @@ -942,6 +1073,9 @@ int board_early_init_f(void) setup_iomux_uart(); gpio_direction_output(GP_USB_OTG_PWR, 0); /* OTG power off */ +#if defined(CONFIG_VIDEO_IPUV3) + setup_display(); +#endif return 0; } diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 335f2ff..cd55495 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -194,6 +194,22 @@ #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1200 +/* Framebuffer and LCD */ +#define CONFIG_VIDEO +#define CONFIG_VIDEO_IPUV3 +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_LOGO +#define CONFIG_IPUV3_CLK 260000000 +#define CONFIG_CMD_HDMIDETECT +#define CONFIG_CONSOLE_MUX +#define CONFIG_IMX_HDMI +#define CONFIG_IMX_VIDEO_SKIP + /* serial console (ttymxc1,115200) */ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 -- 1.8.3.2

2 1

[U-Boot] [PATCH 0/4] imx25: Add hardware support
by dietho＠gmx.de 09 May '14

09 May '14

From: Thomas Diener <dietho(a)gmx.de> This patchset adds support for the imx25 lcd controller and support for variants of cpu and base boards with drivers. Thomas Diener (4): imx25: Add new hardware registers video: Add support for imx25 lcd controller zmx25: Add extended support for the cpu board and belonging base boards Update of the company logo arch/arm/include/asm/arch-mx25/imx-regs.h | 175 ++++++ arch/arm/include/asm/arch-mx25/iomux-mx25.h | 25 +- arch/arm/include/asm/imx-common/iomux-v3.h | 13 +- arch/arm/lib/asm-offsets.c | 9 + board/syteco/zmx25/Makefile | 2 +- board/syteco/zmx25/fma1125.c | 193 ++++++ board/syteco/zmx25/fma1125.h | 19 + board/syteco/zmx25/lowlevel_init.S | 20 + board/syteco/zmx25/mpr121.c | 204 ++++++ board/syteco/zmx25/mpr121.h | 20 + board/syteco/zmx25/polytouch.c | 123 ++++ board/syteco/zmx25/polytouch.h | 19 + board/syteco/zmx25/zmx25.c | 897 +++++++++++++++++++++++++-- drivers/video/Makefile | 1 + drivers/video/imx25lcdc.c | 123 ++++ include/configs/zmx25.h | 47 +- tools/logos/syteco.bmp | Bin 11414 -> 11414 bytes 17 files changed, 1830 insertions(+), 60 deletions(-) create mode 100644 board/syteco/zmx25/fma1125.c create mode 100644 board/syteco/zmx25/fma1125.h create mode 100644 board/syteco/zmx25/mpr121.c create mode 100644 board/syteco/zmx25/mpr121.h create mode 100644 board/syteco/zmx25/polytouch.c create mode 100644 board/syteco/zmx25/polytouch.h create mode 100644 drivers/video/imx25lcdc.c -- 1.7.9.5

3 10

[U-Boot] [PATCH v2] iomux-v3: Add support for mx6sl LVE bit
by Fabio Estevam 09 May '14

09 May '14

On mx6sl there is a LVE (Low Voltage Enable) bit in the IOMUXC_SW_PAD_CTL register that can enable or disable low voltage on the pad. LVE is bit 22 of IOMUXC_SW_PAD_CTL register, but in order to make the calculation easier we can define it as a flag in bit 1, since this bit is unused. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Use bit 1, which is unused. arch/arm/imx-common/iomux-v3.c | 8 ++++++++ arch/arm/include/asm/imx-common/iomux-v3.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index b59b802..6e46ea8 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -30,6 +30,14 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT; u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT; +#if defined CONFIG_MX6SL + /* Check whether LVE bit needs to be set */ + if (pad_ctrl & PAD_CTL_LVE) { + pad_ctrl &= ~PAD_CTL_LVE; + pad_ctrl |= PAD_CTL_LVE_BIT; + } +#endif + if (mux_ctrl_ofs) __raw_writel(mux_mode, base + mux_ctrl_ofs); diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index dec11a1..cca920b 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -111,6 +111,11 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_DSE_40ohm (6 << 3) #define PAD_CTL_DSE_34ohm (7 << 3) +#if defined CONFIG_MX6SL +#define PAD_CTL_LVE (1 << 1) +#define PAD_CTL_LVE_BIT (1 << 22) +#endif + #elif defined(CONFIG_VF610) #define PAD_MUX_MODE_SHIFT 20 -- 1.8.3.2

3 2