[U-Boot] [PATCH v4 2/9] arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support
Michael Nazzareno Trimarchi
michael at amarulasolutions.com
Sat Jan 28 13:39:55 CET 2017
Hi
On 28 Jan 2017 1:25 p.m., "Stefano Babic" <sbabic at denx.de> wrote:
Hi Jagan, Tom,
On 27/01/2017 16:55, Jagan Teki wrote:
> n Fri, Jan 27, 2017 at 1:38 PM, Stefano Babic <sbabic at denx.de> wrote:
>> Hi Jagan,
>>
>> On 27/01/2017 09:54, Jagan Teki wrote:
>>> From: Jagan Teki <jagan at amarulasolutions.com>
>>>
>>> Boot from MMC:
>>> -------------
>>> U-Boot SPL 2017.01-rc2-gba3c151-dirty (Jan 02 2017 - 16:59:33)
>>> Trying to boot from MMC1
>>>
>>> U-Boot 2017.01-rc2-gba3c151-dirty (Jan 02 2017 - 16:59:33 +0100)
>>>
>>> CPU: Freescale i.MX6UL rev1.1 528 MHz (running at 396 MHz)
>>> CPU: Industrial temperature grade (-40C to 105C) at 33C
>>> Reset cause: POR
>>> Model: Engicam Is.IoT MX6UL Starterkit
>>> DRAM: 512 MiB
>>> MMC: FSL_SDHC: 0
>>> *** Warning - bad CRC, using default environment
>>>
>>> In: serial
>>> Out: serial
>>> Err: serial
>>> Net: CPU Net Initialization Failed
>>> No ethernet found.
>>> Hit any key to stop autoboot: 0
>>> isiotmx6ul>
>>>
>>> Cc: Stefano Babic <sbabic at denx.de>
>>> Cc: Matteo Lisi <matteo.lisi at engicam.com>
>>> Cc: Michael Trimarchi <michael at amarulasolutions.com>
>>> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
>>> ---
>>> arch/arm/cpu/armv7/mx6/Kconfig | 11 ++
>>> arch/arm/dts/Makefile | 3 +-
>>> arch/arm/dts/imx6ul-isiot-mmc.dts | 50 +++++++
>>> arch/arm/dts/imx6ul-isiot.dtsi | 92 +++++++++++++
>>> board/engicam/isiotmx6ul/Kconfig | 12 ++
>>> board/engicam/isiotmx6ul/MAINTAINERS | 6 +
>>> board/engicam/isiotmx6ul/Makefile | 6 +
>>> board/engicam/isiotmx6ul/README | 28 ++++
>>> board/engicam/isiotmx6ul/isiotmx6ul.c | 247
++++++++++++++++++++++++++++++++++
>>> configs/imx6ul_isiot_mmc_defconfig | 36 +++++
>>> include/configs/imx6ul_isiot.h | 142 +++++++++++++++++++
>>> 11 files changed, 632 insertions(+), 1 deletion(-)
>>> create mode 100644 arch/arm/dts/imx6ul-isiot-mmc.dts
>>> create mode 100644 arch/arm/dts/imx6ul-isiot.dtsi
>>> create mode 100644 board/engicam/isiotmx6ul/Kconfig
>>> create mode 100644 board/engicam/isiotmx6ul/MAINTAINERS
>>> create mode 100644 board/engicam/isiotmx6ul/Makefile
>>> create mode 100644 board/engicam/isiotmx6ul/README
>>> create mode 100644 board/engicam/isiotmx6ul/isiotmx6ul.c
>>> create mode 100644 configs/imx6ul_isiot_mmc_defconfig
>>> create mode 100644 include/configs/imx6ul_isiot.h
>>>
>>> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/
Kconfig
>>> index c646966..72780d7 100644
>>> --- a/arch/arm/cpu/armv7/mx6/Kconfig
>>> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
>>> @@ -205,6 +205,16 @@ config TARGET_MX6UL_GEAM
>>> select DM_THERMAL
>>> select SUPPORT_SPL
>>>
>>> +config TARGET_MX6UL_ISIOT
>>> + bool "Support Engicam Is.IoT MX6UL"
>>> + select MX6UL
>>> + select OF_CONTROL
>>> + select DM
>>> + select DM_GPIO
>>> + select DM_MMC
>>> + select DM_THERMAL
>>> + select SUPPORT_SPL
>>> +
>>> config TARGET_MX6ULL_14X14_EVK
>>> bool "Support mx6ull_14x14_evk"
>>> select MX6ULL
>>> @@ -313,6 +323,7 @@ source "board/embest/mx6boards/Kconfig"
>>> source "board/engicam/geam6ul/Kconfig"
>>> source "board/engicam/icorem6/Kconfig"
>>> source "board/engicam/icorem6_rqs/Kconfig"
>>> +source "board/engicam/isiotmx6ul/Kconfig"
>>> source "board/freescale/mx6qarm2/Kconfig"
>>> source "board/freescale/mx6qsabreauto/Kconfig"
>>> source "board/freescale/mx6sabresd/Kconfig"
>>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>>> index 6a7924e..e83308c 100644
>>> --- a/arch/arm/dts/Makefile
>>> +++ b/arch/arm/dts/Makefile
>>> @@ -313,7 +313,8 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
>>> imx6dl-icore-rqs.dtb \
>>> imx6q-icore.dtb \
>>> imx6q-icore-rqs.dtb \
>>> - imx6ul-geam-kit.dtb
>>> + imx6ul-geam-kit.dtb \
>>> + imx6ul-isiot-mmc.dtb
>>>
>>> dtb-$(CONFIG_MX7) += imx7-colibri.dtb
>>>
>>> diff --git a/arch/arm/dts/imx6ul-isiot-mmc.dts
b/arch/arm/dts/imx6ul-isiot-mmc.dts
>>> new file mode 100644
>>> index 0000000..bb5086a
>>> --- /dev/null
>>> +++ b/arch/arm/dts/imx6ul-isiot-mmc.dts
>>> @@ -0,0 +1,50 @@
>>> +/*
>>> + * Copyright (C) 2016 Amarula Solutions B.V.
>>> + * Copyright (C) 2016 Engicam S.r.l.
>>> + *
>>> + * This file is dual-licensed: you can use it either under the terms
>>> + * of the GPL or the X11 license, at your option. Note that this dual
>>> + * licensing only applies to this file, and not this project as a
>>> + * whole.
>>> + *
>>
>>
>> I have seen that a lot of files slipped into mainline, and I have myself
>> not paid enough attention befeore (see your imx6ul-geam-kit.dts for
>> example).
>>
>> But we moved some years ago to SPDX-License-Identifier. Other DTS files
>> are using this as well without copying the whole license. Could you do
>> this here, too ? It would be also nice if you plan to fix this for all
>> Engicam's boards, thanks !
>
> Yes for boards, I will prepare patch.
>
> For devicetress, since the base dtsi files copied from Linux, we keep
> the license as it is. I am not sure all other dts(i) files use the
> SPDX-License-Identifier. example imx6sll-evk, imx6ull-14x14-evk and
> all sunxi .
It is true that some files slipped into mainline copying again all
license stuff - and several files ported from Linux was adjusting for SPDX.
Tom, what do you think ?
>
>
>>
>>> +
>>> +/dts-v1/;
>>> +
>>> +#include "imx6ul-isiot.dtsi"
>>> +
>>> +/ {
>>> + model = "Engicam Is.IoT MX6UL MMC Starterkit";
>>> + compatible = "engicam,imx6ul-isiot", "fsl,imx6ul";
>>> +};
>>> diff --git a/arch/arm/dts/imx6ul-isiot.dtsi b/arch/arm/dts/imx6ul-isiot.
dtsi
>>> new file mode 100644
>>> index 0000000..6108a1a
>>> --- /dev/null
>>> +++ b/arch/arm/dts/imx6ul-isiot.dtsi
>>> @@ -0,0 +1,92 @@
>>> +/*
>>> + * Copyright (C) 2016 Amarula Solutions B.V.
>>> + * Copyright (C) 2016 Engicam S.r.l.
>>
>> Ditto.
>>
>>
>>> diff --git a/board/engicam/isiotmx6ul/Kconfig
b/board/engicam/isiotmx6ul/Kconfig
>>> new file mode 100644
>>> index 0000000..213ffad
>>> --- /dev/null
>>> +++ b/board/engicam/isiotmx6ul/Kconfig
>>> @@ -0,0 +1,12 @@
>>> +if TARGET_MX6UL_ISIOT
>>> +
>>> +config SYS_BOARD
>>> + default "isiotmx6ul"
>>> +
>>> +config SYS_VENDOR
>>> + default "engicam"
>>> +
>>> +config SYS_CONFIG_NAME
>>> + default "imx6ul_isiot"
>>> +
>>> +endif
>>> diff --git a/board/engicam/isiotmx6ul/MAINTAINERS
b/board/engicam/isiotmx6ul/MAINTAINERS
>>> new file mode 100644
>>> index 0000000..0258531
>>> --- /dev/null
>>> +++ b/board/engicam/isiotmx6ul/MAINTAINERS
>>> @@ -0,0 +1,6 @@
>>> +GEAM6UL BOARD
>>> +M: Jagan Teki <jagan at amarulasolutions.com>
>>> +S: Maintained
>>> +F: board/engicam/isiotmx6ul
>>> +F: include/configs/imx6ul_isiot.h
>>> +F: configs/imx6ul_isiot_mmc_defconfig
>>
>> Should you not add the DTS files ?
>
> Good idea, I will add.
>
>>
>>> diff --git a/board/engicam/isiotmx6ul/Makefile
b/board/engicam/isiotmx6ul/Makefile
>>> new file mode 100644
>>> index 0000000..f4f8c78
>>> --- /dev/null
>>> +++ b/board/engicam/isiotmx6ul/Makefile
>>> @@ -0,0 +1,6 @@
>>> +# Copyright (C) 2016 Amarula Solutions B.V.
>>> +#
>>> +# SPDX-License-Identifier: GPL-2.0+
>>> +#
>>> +
>>> +obj-y := isiotmx6ul.o
>>> diff --git a/board/engicam/isiotmx6ul/README b/board/engicam/isiotmx6ul/
README
>>> new file mode 100644
>>> index 0000000..1d177ac
>>> --- /dev/null
>>> +++ b/board/engicam/isiotmx6ul/README
>>> @@ -0,0 +1,28 @@
>>> +How to use U-Boot on Engicam Is.IoT MX6UL Starter Kit:
>>> +-----------------------------------------------------
>>> +
>>> +- Configure U-Boot for Engicam Is.IoT MX6UL
>>> +
>>> +$ make mrproper
>>> +$ make imx6ul_isiot_mmc_defconfig
>>> +$ make
>>> +
>>> +This will generate the SPL image called SPL and the u-boot-dtb.img.
>>> +
>>> +- Flash the SPL image into the micro SD card:
>>> +
>>> +sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync
>>> +
>>> +- Flash the u-boot-dtb.img image into the micro SD card:
>>> +
>>> +sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync
>>> +
>>> +- Jumper settings:
>>> +
>>> +MMC Boot: JM3 Closed
>>> +
>>> +- Connect the Serial cable between the Starter Kit and the PC for the
console.
>>> +(J28 is the Linux Serial console connector)
>>> +
>>> +- Insert the micro SD card in the board, power it up and U-Boot
messages should
>>> +come up.
>>> diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c
b/board/engicam/isiotmx6ul/isiotmx6ul.c
>>> new file mode 100644
>>> index 0000000..c0b18c3
>>> --- /dev/null
>>> +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c
>>> @@ -0,0 +1,247 @@
>>> +/*
>>> + * Copyright (C) 2016 Amarula Solutions B.V.
>>> + * Copyright (C) 2016 Engicam S.r.l.
>>> + * Author: Jagan Teki <jagan at amarulasolutions.com>
>>> + *
>>> + * SPDX-License-Identifier: GPL-2.0+
>>> + */
>>> +
>>> +#include <common.h>
>>> +
>>> +#include <asm/io.h>
>>> +#include <asm/gpio.h>
>>> +#include <linux/sizes.h>
>>> +
>>> +#include <asm/arch/clock.h>
>>> +#include <asm/arch/crm_regs.h>
>>> +#include <asm/arch/iomux.h>
>>> +#include <asm/arch/mx6-pins.h>
>>> +#include <asm/arch/sys_proto.h>
>>> +#include <asm/imx-common/iomux-v3.h>
>>> +
>>> +DECLARE_GLOBAL_DATA_PTR;
>>> +
>>> +#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
>>> + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
>>> + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST |
PAD_CTL_HYS)
>>> +
>>> +static iomux_v3_cfg_t const uart1_pads[] = {
>>> + MX6_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
>>> + MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
>>> +};
>>> +
>>> +int board_early_init_f(void)
>>> +{
>>> + imx_iomux_v3_setup_multiple_pads(uart1_pads,
ARRAY_SIZE(uart1_pads));
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +int board_init(void)
>>> +{
>>> + /* Address of boot parameters */
>>> + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +int dram_init(void)
>>> +{
>>> + gd->ram_size = imx_ddr_size();
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +#ifdef CONFIG_SPL_BUILD
>>> +#include <libfdt.h>
>>> +#include <spl.h>
>>> +
>>> +#include <asm/arch/crm_regs.h>
>>> +#include <asm/arch/mx6-ddr.h>
>>> +
>>> +/* MMC board initialization is needed till adding DM support in SPL */
>>> +#if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC)
>>> +#include <mmc.h>
>>> +#include <fsl_esdhc.h>
>>> +
>>> +#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
>>> + PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \
>>> + PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
>>> +
>>> +static iomux_v3_cfg_t const usdhc1_pads[] = {
>>> + MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + MX6_PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + MX6_PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + MX6_PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + MX6_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + MX6_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> +
>>> + /* VSELECT */
>>> + MX6_PAD_GPIO1_IO05__USDHC1_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL),
>>> + /* CD */
>>> + MX6_PAD_UART1_RTS_B__GPIO1_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL),
>>> + /* RST_B */
>>> + MX6_PAD_GPIO1_IO09__GPIO1_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
>>> +};
>>> +
>>> +#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 19)
>>> +
>>> +struct fsl_esdhc_cfg usdhc_cfg[1] = {
>>> + {USDHC1_BASE_ADDR, 0, 4},
>>> +};
>>> +
>>> +int board_mmc_getcd(struct mmc *mmc)
>>> +{
>>> + struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
>>> + int ret = 0;
>>> +
>>> + switch (cfg->esdhc_base) {
>>> + case USDHC1_BASE_ADDR:
>>> + ret = !gpio_get_value(USDHC1_CD_GPIO);
>>> + break;
>>> + }
>>> +
>>> + return ret;
>>> +}
>>> +
>>> +int board_mmc_init(bd_t *bis)
>>> +{
>>> + int i, ret;
>>> +
>>> + /*
>>> + * According to the board_mmc_init() the following map is done:
>>> + * (U-boot device node) (Physical Port)
>>> + * mmc0 USDHC1
>>> + */
>>> + for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) {
>>> + switch (i) {
>>> + case 0:
>>> + imx_iomux_v3_setup_multiple_pads(
>>> + usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
>>> + gpio_direction_input(USDHC1_CD_GPIO);
>>> + usdhc_cfg[i].sdhc_clk =
mxc_get_clock(MXC_ESDHC_CLK);
>>> + break;
>>> + default:
>>> + printf("Warning - USDHC%d controller not
supporting\n",
>>> + i + 1);
>>> + return 0;
>>> + }
>>> +
>>> + ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
>>> + if (ret) {
>>> + printf("Warning: failed to initialize mmc dev
%d\n", i);
>>> + return ret;
>>> + }
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +#endif /* CONFIG_FSL_ESDHC */
>>> +
>>> +static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = {
>>> + .grp_addds = 0x00000030,
>>> + .grp_ddrmode_ctl = 0x00020000,
>>> + .grp_b0ds = 0x00000030,
>>> + .grp_ctlds = 0x00000030,
>>> + .grp_b1ds = 0x00000030,
>>> + .grp_ddrpke = 0x00000000,
>>> + .grp_ddrmode = 0x00020000,
>>> + .grp_ddr_type = 0x000c0000,
>>> +};
>>> +
>>> +static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = {
>>> + .dram_dqm0 = 0x00000030,
>>> + .dram_dqm1 = 0x00000030,
>>> + .dram_ras = 0x00000030,
>>> + .dram_cas = 0x00000030,
>>> + .dram_odt0 = 0x00000030,
>>> + .dram_odt1 = 0x00000030,
>>> + .dram_sdba2 = 0x00000000,
>>> + .dram_sdclk_0 = 0x00000008,
>>> + .dram_sdqs0 = 0x00000038,
>>> + .dram_sdqs1 = 0x00000030,
>>> + .dram_reset = 0x00000030,
>>> +};
>>> +
>>> +static struct mx6_mmdc_calibration mx6_mmcd_calib = {
>>> + .p0_mpwldectrl0 = 0x00070007,
>>> + .p0_mpdgctrl0 = 0x41490145,
>>> + .p0_mprddlctl = 0x40404546,
>>> + .p0_mpwrdlctl = 0x4040524D,
>>> +};
>>> +
>>> +struct mx6_ddr_sysinfo ddr_sysinfo = {
>>> + .dsize = 0,
>>> + .cs_density = 20,
>>> + .ncs = 1,
>>> + .cs1_mirror = 0,
>>> + .rtt_wr = 2,
>>> + .rtt_nom = 1, /* RTT_Nom = RZQ/2 */
>>> + .walat = 1, /* Write additional latency */
>>> + .ralat = 5, /* Read additional latency */
>>> + .mif3_mode = 3, /* Command prediction working mode */
>>> + .bi_on = 1, /* Bank interleaving enabled */
>>> + .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */
>>> + .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */
>>> + .ddr_type = DDR_TYPE_DDR3,
>>> +};
>>> +
>>> +static struct mx6_ddr3_cfg mem_ddr = {
>>> + .mem_speed = 800,
>>> + .density = 4,
>>> + .width = 16,
>>> + .banks = 8,
>>> + .rowaddr = 15,
>>> + .coladdr = 10,
>>> + .pagesz = 2,
>>> + .trcd = 1375,
>>> + .trcmin = 4875,
>>> + .trasmin = 3500,
>>> +};
>>> +
>>> +static void ccgr_init(void)
>>> +{
>>> + struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
>>> +
>>> + writel(0xFFFFFFFF, &ccm->CCGR0);
>>> + writel(0xFFFFFFFF, &ccm->CCGR1);
>>> + writel(0xFFFFFFFF, &ccm->CCGR2);
>>> + writel(0xFFFFFFFF, &ccm->CCGR3);
>>> + writel(0xFFFFFFFF, &ccm->CCGR4);
>>> + writel(0xFFFFFFFF, &ccm->CCGR5);
>>> + writel(0xFFFFFFFF, &ccm->CCGR6);
>>> + writel(0xFFFFFFFF, &ccm->CCGR7);
>>
>> Just a mention here: why do you activate all clocks instead of just what
>> you really need ?
>
> May be yes, but it's better to have full clock initialization so-that
> nothing broke during SPL runtime.
You are the board maintainer, and it is your decision. Anyway, clocks
are not disable in u-boot, and they can remain on in Linux, because they
are set just if needed. Some kernels had disabled in the past for some
platform (I know OMAP3) all not required clocks, but this was in the era
before DT. Kernel just supposes that nothing is set.
I agree with Stefano. Clocks part should clean up. We have done in the past
for OMAP architecture
Michael
Best regards,
Stefano Babic
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
More information about the U-Boot
mailing list