September 2017 - U-Boot

[U-Boot] [PATCH 00/14] Enable Stratix10 SoC support
by chin.liang.see＠intel.com 02 Oct '17

02 Oct '17

From: Chin Liang See <chin.liang.see(a)intel.com> This patch series are enabling support for Stratix 10 SoC Chin Liang See (14): arm: socfpga: stratix10: Add base address map for Statix10 SoC arm: dts: Add dts for Stratix10 SoC arm: socfpga: stratix10: Add Clock Manager driver for Stratix10 SoC arm: socfpga: stratix10: Add Reset Manager driver for Stratix10 SoC arm: socfpga: stratix10: Add pinmux support for Stratix10 SoC arm: socfpga: stratix10: Add misc support for Stratix10 SoC arm: socfpga: stratix10: Add mailbox support for Stratix10 SoC arm: socfpga: stratix10: Add MMU support for Stratix10 SoC arm: socfpga: Restructure the SPL file arm: socfpga: stratix10: Add SPL driver for Stratix10 SoC arm: socfpga: stratix10: Add timer support for Stratix10 SoC ddr: altera: stratix10: Add DDR support for Stratix10 SoC board: altera: stratix10: Add socdk board support for Stratix10 SoC arm: socfpga: stratix10: Enable Stratix10 SoC build arch/arm/Kconfig | 8 +- arch/arm/dts/Makefile | 3 +- arch/arm/dts/socfpga_stratix10_socdk.dts | 141 ++++++++ arch/arm/mach-socfpga/Kconfig | 13 + arch/arm/mach-socfpga/Makefile | 19 +- arch/arm/mach-socfpga/clock_manager.c | 4 +- arch/arm/mach-socfpga/clock_manager_s10.c | 359 +++++++++++++++++++ arch/arm/mach-socfpga/include/mach/base_addr_s10.h | 62 ++++ arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 + .../mach-socfpga/include/mach/clock_manager_s10.h | 202 +++++++++++ arch/arm/mach-socfpga/include/mach/firewall_s10.h | 84 +++++ arch/arm/mach-socfpga/include/mach/handoff_s10.h | 29 ++ arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 108 ++++++ arch/arm/mach-socfpga/include/mach/reset_manager.h | 2 + .../mach-socfpga/include/mach/reset_manager_s10.h | 116 +++++++ arch/arm/mach-socfpga/include/mach/sdram_s10.h | 333 ++++++++++++++++++ .../arm/mach-socfpga/include/mach/system_manager.h | 5 +- .../mach-socfpga/include/mach/system_manager_s10.h | 169 +++++++++ arch/arm/mach-socfpga/mailbox_s10.c | 239 +++++++++++++ arch/arm/mach-socfpga/misc.c | 4 + arch/arm/mach-socfpga/misc_s10.c | 165 +++++++++ arch/arm/mach-socfpga/mmu-arm64_s10.c | 71 ++++ arch/arm/mach-socfpga/reset_manager.c | 5 + arch/arm/mach-socfpga/reset_manager_s10.c | 140 ++++++++ arch/arm/mach-socfpga/spl_a10.c | 105 ++++++ arch/arm/mach-socfpga/{spl.c => spl_gen5.c} | 46 --- arch/arm/mach-socfpga/spl_s10.c | 138 ++++++++ arch/arm/mach-socfpga/system_manager_s10.c | 91 +++++ arch/arm/mach-socfpga/timer.c | 17 +- arch/arm/mach-socfpga/wrap_pinmux_config_s10.c | 55 +++ arch/arm/mach-socfpga/wrap_pll_config_s10.c | 46 +++ board/altera/stratix10-socdk/MAINTAINERS | 7 + board/altera/stratix10-socdk/Makefile | 7 + board/altera/stratix10-socdk/socfpga.c | 7 + configs/socfpga_stratix10_defconfig | 39 +++ drivers/ddr/altera/Makefile | 1 + drivers/ddr/altera/sdram_s10.c | 382 +++++++++++++++++++++ include/configs/socfpga_stratix10_socdk.h | 216 ++++++++++++ include/dt-bindings/reset/altr,rst-mgr-s10.h | 97 ++++++ 39 files changed, 3482 insertions(+), 55 deletions(-) create mode 100644 arch/arm/dts/socfpga_stratix10_socdk.dts create mode 100644 arch/arm/mach-socfpga/clock_manager_s10.c create mode 100644 arch/arm/mach-socfpga/include/mach/base_addr_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/firewall_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/handoff_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/mailbox_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/sdram_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10.h create mode 100644 arch/arm/mach-socfpga/mailbox_s10.c create mode 100644 arch/arm/mach-socfpga/misc_s10.c create mode 100644 arch/arm/mach-socfpga/mmu-arm64_s10.c create mode 100644 arch/arm/mach-socfpga/reset_manager_s10.c create mode 100644 arch/arm/mach-socfpga/spl_a10.c rename arch/arm/mach-socfpga/{spl.c => spl_gen5.c} (83%) create mode 100644 arch/arm/mach-socfpga/spl_s10.c create mode 100644 arch/arm/mach-socfpga/system_manager_s10.c create mode 100644 arch/arm/mach-socfpga/wrap_pinmux_config_s10.c create mode 100644 arch/arm/mach-socfpga/wrap_pll_config_s10.c create mode 100644 board/altera/stratix10-socdk/MAINTAINERS create mode 100644 board/altera/stratix10-socdk/Makefile create mode 100644 board/altera/stratix10-socdk/socfpga.c create mode 100644 configs/socfpga_stratix10_defconfig create mode 100644 drivers/ddr/altera/sdram_s10.c create mode 100644 include/configs/socfpga_stratix10_socdk.h create mode 100644 include/dt-bindings/reset/altr,rst-mgr-s10.h -- 2.2.2

4 27

[U-Boot] [PATCH v2] imx: sys_proto: Add a prototype for board_mmc_get_env_dev()
by Diego Dorta 02 Oct '17

02 Oct '17

When compiling with W=1 the following warning is observed: board/freescale/mx6sabresd/mx6sabresd.c:266:5: warning: no previous prototype for ‘board_mmc_get_env_dev’ [-Wmissing-prototypes] int board_mmc_get_env_dev(int devno) Remove this warning by adding the function prototype into sys_proto.h file. Signed-off-by: Diego Dorta <diego.dorta(a)nxp.com> --- Changes since v1: - Add 'mmc' prefix - Change function prototype to sys_proto.h - Update commit log accordingly arch/arm/include/asm/mach-imx/sys_proto.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 970c4ca..7036343 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -107,6 +107,8 @@ void init_aips(void); void init_src(void); void imx_set_wdog_powerdown(bool enable); +int board_mmc_get_env_dev(int devno); + /* * Initializes on-chip ethernet controllers. * to override, implement board_eth_init() -- 2.7.4

3 3

[U-Boot] [PATCH] imx: Include <input.h> header file
by Diego Dorta 02 Oct '17

02 Oct '17

When building with W=1 errors like the one below is seen: board/freescale/mx6sabresd/mx6sabresd.c:546:5: warning: no previous prototype for ‘overwrite_console’ [-Wmissing-prototypes] int overwrite_console(void) Fix the build warnings by including <input.h>. Signed-off-by: Diego Dorta <diego.dorta(a)nxp.com> --- board/advantech/dms-ba16/dms-ba16.c | 1 + board/aristainetos/aristainetos.c | 1 + board/beckhoff/mx53cx9020/mx53cx9020.c | 1 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 + board/el/el6x/el6x.c | 1 + board/embest/mx6boards/mx6boards.c | 1 + board/freescale/mx51evk/mx51evk.c | 1 + board/freescale/mx53loco/mx53loco.c | 1 + board/freescale/mx6sabreauto/mx6sabreauto.c | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 1 + board/ge/bx50v3/bx50v3.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/technologic/ts4800/ts4800.c | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 1 + board/toradex/colibri_imx6/colibri_imx6.c | 1 + 15 files changed, 15 insertions(+) diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c index c728943..6fe7471 100644 --- a/board/advantech/dms-ba16/dms-ba16.c +++ b/board/advantech/dms-ba16/dms-ba16.c @@ -25,6 +25,7 @@ #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <input.h> #include <pwm.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 872fedd..a60cbfc 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -28,6 +28,7 @@ #include <asm/arch/crm_regs.h> #include <linux/fb.h> #include <ipu_pixfmt.h> +#include <input.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <pwm.h> diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index a18a4e8..021bd96 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -26,6 +26,7 @@ #include <asm/gpio.h> #include <linux/fb.h> #include <ipu_pixfmt.h> +#include <input.h> #include <fs.h> #include <dm/platform_data/serial_mxc.h> diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 2ed66d3..575aff7 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -24,6 +24,7 @@ #include <mmc.h> #include <fsl_esdhc.h> #include <i2c.h> +#include <input.h> #include <power/pmic.h> #include <power/pfuze100_pmic.h> #include <linux/fb.h> diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index fb128f5..b2fe7fd 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -25,6 +25,7 @@ #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <input.h> #include <power/pmic.h> #include <power/pfuze100_pmic.h> #include <asm/arch/mx6-ddr.h> diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c index 8674599..ae04f68 100644 --- a/board/embest/mx6boards/mx6boards.c +++ b/board/embest/mx6boards/mx6boards.c @@ -26,6 +26,7 @@ #include <asm/mach-imx/spi.h> #include <asm/mach-imx/video.h> #include <i2c.h> +#include <input.h> #include <mmc.h> #include <fsl_esdhc.h> #include <miiphy.h> diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index a88ff8f..9e8a02e 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -15,6 +15,7 @@ #include <asm/arch/clock.h> #include <asm/mach-imx/mx5_video.h> #include <i2c.h> +#include <input.h> #include <mmc.h> #include <fsl_esdhc.h> #include <power/pmic.h> diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index ea36603..db0e2fb 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -17,6 +17,7 @@ #include <asm/mach-imx/mx5_video.h> #include <netdev.h> #include <i2c.h> +#include <input.h> #include <mmc.h> #include <fsl_esdhc.h> #include <asm/gpio.h> diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index 15ca029..bdeb5f7 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -24,6 +24,7 @@ #include <netdev.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <input.h> #include <asm/arch/mxc_hdmi.h> #include <asm/mach-imx/video.h> #include <asm/arch/crm_regs.h> diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 5b50bc8..0d31235 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -25,6 +25,7 @@ #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <input.h> #include <power/pmic.h> #include <power/pfuze100_pmic.h> #include "../common/pfuze.h" diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index c7df4ce..2e8f394 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -25,6 +25,7 @@ #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <input.h> #include <pwm.h> #include <stdlib.h> #include "vpd_reader.h" diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 78fc546..1f3e378 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -11,6 +11,7 @@ #include <common.h> #include <miiphy.h> +#include <input.h> #include <mmc.h> #include <fsl_esdhc.h> #include <asm/io.h> diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c index 8fe26a7..e5bec57 100644 --- a/board/technologic/ts4800/ts4800.c +++ b/board/technologic/ts4800/ts4800.c @@ -18,6 +18,7 @@ #include <asm/arch/clock.h> #include <asm/mach-imx/mx5_video.h> #include <mmc.h> +#include <input.h> #include <fsl_esdhc.h> #include <mc13892.h> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 628a61d..c43f311 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -30,6 +30,7 @@ #include <dm/platdata.h> #include <fsl_esdhc.h> #include <i2c.h> +#include <input.h> #include <imx_thermal.h> #include <linux/errno.h> #include <malloc.h> diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 756e3f3..b98aa5f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -29,6 +29,7 @@ #include <dm/platdata.h> #include <fsl_esdhc.h> #include <i2c.h> +#include <input.h> #include <imx_thermal.h> #include <linux/errno.h> #include <malloc.h> -- 2.7.4

3 2

[U-Boot] [PATCH] mx6: toradex: Remove custom CONFIG_SPL_PAD_TO definition
by Fabio Estevam 02 Oct '17

02 Oct '17

From: Fabio Estevam <fabio.estevam(a)nxp.com> CONFIG_SPL_PAD_TO is already defined inside "imx6_spl.h", so there is no need to redefine it in the board config files. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- include/configs/apalis_imx6.h | 1 - include/configs/colibri_imx6.h | 1 - 2 files changed, 2 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index a15f19d..51bf61c 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -23,7 +23,6 @@ #ifdef CONFIG_SPL #include "imx6_spl.h" -#define CONFIG_SPL_PAD_TO 0x11000 /* 4k IVT/DCD, 64k SPL */ #endif #define CONFIG_CMDLINE_TAG diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index db71369..ac9a23d 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -21,7 +21,6 @@ #ifdef CONFIG_SPL #include "imx6_spl.h" -#define CONFIG_SPL_PAD_TO 0x11000 /* 4k IVT/DCD, 64k SPL */ #endif #define CONFIG_CMDLINE_TAG -- 2.7.4

3 2

[U-Boot] [PATCH 1/2] mx25pdk: Use generic filesystem commands
by Otavio Salvador 02 Oct '17

02 Oct '17

This rework the board to use the generic filesystem commands instead of forcing the use of FAT for the boot files. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- configs/mx25pdk_defconfig | 5 +++-- include/configs/mx25pdk.h | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index e75a82c199..8ed394569a 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -15,7 +15,8 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_FS_FAT=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index bc41a3362d..57e2a6db36 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -70,6 +70,9 @@ /* U-Boot commands */ +/* Filesystem support */ +#define CONFIG_FS_EXT4 + /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f @@ -138,11 +141,11 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- 2.14.2

2 3

[U-Boot] [PATCH v3 1/2] wandboard: Add support for the latest revd1 revision
by Fabio Estevam 02 Oct '17

02 Oct '17

Latest wandboard hardware revision is revd1, which brings the following new features: - PFUZE100 PMIC - AR8035 Ethernet PHY - Upgrade Wifi/BT chip to BCM4339/BCM43430. The detection mechanism is to probe the PMIC and when it is found, then the revision of the board is revd1. As the detection is done via PMIC, we need to print the board version at a later stage via CONFIG_DISPLAY_BOARDINFO_LATE and also need to disable CONFIG_DISPLAY_BOARDINFO, which is done much earlier. Make the necessary adjustments for the AR8035 PHY to work on revd1. Based on Richard Hu's work from Technexion's U-Boot tree. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v2: - Also turn on ldb_di0 clock. Able to boot the kernel now. board/wandboard/wandboard.c | 110 +++++++++++++++++++++++++++++++++++++++++--- configs/wandboard_defconfig | 1 + include/configs/wandboard.h | 11 +++++ 3 files changed, 115 insertions(+), 7 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index adfcf48..14dd378 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -30,6 +30,8 @@ #include <phy.h> #include <input.h> #include <i2c.h> +#include <power/pmic.h> +#include <power/pfuze100_pmic.h> DECLARE_GLOBAL_DATA_PTR; @@ -51,8 +53,11 @@ DECLARE_GLOBAL_DATA_PTR; #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) +#define ETH_PHY_AR8035_POWER IMX_GPIO_NR(7, 13) #define REV_DETECTION IMX_GPIO_NR(2, 28) +static bool with_pmic; + int dram_init(void) { gd->ram_size = imx_ddr_size(); @@ -107,6 +112,11 @@ static iomux_v3_cfg_t const enet_pads[] = { IOMUX_PADS(PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; +static iomux_v3_cfg_t const enet_ar8035_power_pads[] = { + /* AR8035 POWER */ + IOMUX_PADS(PAD_GPIO_18__GPIO7_IO13 | MUX_PAD_CTRL(NO_PAD_CTRL)), +}; + static iomux_v3_cfg_t const rev_detection_pad[] = { IOMUX_PADS(PAD_EIM_EB0__GPIO2_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; @@ -120,6 +130,14 @@ static void setup_iomux_enet(void) { SETUP_IOMUX_PADS(enet_pads); + if (with_pmic) { + SETUP_IOMUX_PADS(enet_ar8035_power_pads); + /* enable AR8035 POWER */ + gpio_direction_output(ETH_PHY_AR8035_POWER, 0); + } + /* wait until 3.3V of PHY and clock become stable */ + mdelay(10); + /* Reset AR8031 PHY */ gpio_direction_output(ETH_PHY_RESET, 0); mdelay(10); @@ -192,6 +210,7 @@ int board_mmc_init(bd_t *bis) static int ar8031_phy_fixup(struct phy_device *phydev) { unsigned short val; + int mask; /* To enable AR8031 ouput a 125MHz clk from CLK_25M */ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7); @@ -199,7 +218,12 @@ static int ar8031_phy_fixup(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007); val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe); - val &= 0xffe3; + if (with_pmic) + mask = 0xffe7; /* AR8035 */ + else + mask = 0xffe3; /* AR8031 */ + + val &= mask; val |= 0x18; phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val); @@ -257,6 +281,40 @@ struct i2c_pads_info mx6dl_i2c2_pad_info = { } }; +struct i2c_pads_info mx6q_i2c3_pad_info = { + .scl = { + .i2c_mode = MX6Q_PAD_GPIO_5__I2C3_SCL + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6Q_PAD_GPIO_5__GPIO1_IO05 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(1, 5) + }, + .sda = { + .i2c_mode = MX6Q_PAD_GPIO_16__I2C3_SDA + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6Q_PAD_GPIO_16__GPIO7_IO11 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(7, 11) + } +}; + +struct i2c_pads_info mx6dl_i2c3_pad_info = { + .scl = { + .i2c_mode = MX6DL_PAD_GPIO_5__I2C3_SCL + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6DL_PAD_GPIO_5__GPIO1_IO05 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(1, 5) + }, + .sda = { + .i2c_mode = MX6DL_PAD_GPIO_16__I2C3_SDA + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gpio_mode = MX6DL_PAD_GPIO_16__GPIO7_IO11 + | MUX_PAD_CTRL(I2C_PAD_CTRL), + .gp = IMX_GPIO_NR(7, 11) + } +}; + static iomux_v3_cfg_t const fwadapt_7wvga_pads[] = { IOMUX_PADS(PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK), IOMUX_PADS(PAD_DI0_PIN2__IPU1_DI0_PIN02), /* HSync */ @@ -388,6 +446,31 @@ int board_early_init_f(void) return 0; } +#define PMIC_I2C_BUS 2 + +int power_init_board(void) +{ + struct pmic *p; + u32 reg; + + /* configure PFUZE100 PMIC */ + power_pfuze100_init(PMIC_I2C_BUS); + p = pmic_get("PFUZE100"); + if (p && !pmic_probe(p)) { + pmic_reg_read(p, PFUZE100_DEVICEID, &reg); + printf("PMIC: PFUZE100 ID=0x%02x\n", reg); + with_pmic = true; + + /* Set VGEN2 to 1.5V and enable */ + pmic_reg_read(p, PFUZE100_VGEN2VOL, &reg); + reg &= ~(LDO_VOL_MASK); + reg |= (LDOA_1_50V | (1 << (LDO_EN))); + pmic_reg_write(p, PFUZE100_VGEN2VOL, reg); + } + + return 0; +} + /* * Do not overwrite the console * Use always serial for U-Boot console @@ -417,6 +500,14 @@ static bool is_revc1(void) return false; } +static bool is_revd1(void) +{ + if (with_pmic) + return true; + else + return false; +} + int board_late_init(void) { #ifdef CONFIG_CMD_BMODE @@ -429,7 +520,9 @@ int board_late_init(void) else env_set("board_rev", "MX6DL"); - if (is_revc1()) + if (is_revd1()) + env_set("board_name", "D1"); + else if (is_revc1()) env_set("board_name", "C1"); else env_set("board_name", "B1"); @@ -442,20 +535,23 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -#if defined(CONFIG_VIDEO_IPUV3) setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info); - if (is_mx6dq()) + if (is_mx6dq()) { setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info); - else + setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c3_pad_info); + } else { setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info); -#endif + setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c3_pad_info); + } return 0; } int checkboard(void) { - if (is_revc1()) + if (is_revd1()) + puts("Board: Wandboard rev D1\n"); + else if (is_revc1()) puts("Board: Wandboard rev C1\n"); else puts("Board: Wandboard rev B1\n"); diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 9765f13..8097e6e 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_EXT_SUPPORT=y diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 3ba4c29..ba88d02 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -13,6 +13,7 @@ #include "mx6_common.h" #include "imx6_spl.h" +#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 @@ -44,6 +45,12 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 +/* PMIC */ +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_PFUZE100 +#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 + /* MMC Configuration */ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 @@ -102,6 +109,10 @@ "fi; " \ "fi\0" \ "findfdt="\ + "if test $board_name = D1 && test $board_rev = MX6Q ; then " \ + "setenv fdtfile imx6q-wandboard-revd1.dtb; fi; " \ + "if test $board_name = D1 && test $board_rev = MX6DL ; then " \ + "setenv fdtfile imx6dl-wandboard-revd1.dtb; fi; " \ "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ "setenv fdtfile imx6q-wandboard.dtb; fi; " \ "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ -- 2.7.4

2 2

[U-Boot] [PATCH 0/6] i.MX6Q: Add SPL_OF_CONTROL support
by Jagan Teki 02 Oct '17

02 Oct '17

From: Jagan Teki <jagan(a)amarulasolutions.com> This series add OF_CONTROL support for SPL on Engicam i.MX6QDL boards, along with proper code optimzation changes. Jagan Teki (6): i.MX6: engicam: Fix MAINTAINERS/README imx6ul: geam6ul/isiot: Fix to MMC devices i.MX6: engicam: Move set_fdt_file to common i.MX6Q: icorem6: Move spl load fit to common/spl i.MX6Q: icore: Add SPL_OF_CONTROL support i.MX6Q: icore: Add imx6q board for icore/icore_rqs arch/arm/dts/imx6qdl-icore-rqs.dtsi | 2 + arch/arm/dts/imx6qdl-icore.dtsi | 2 + arch/arm/dts/imx6qdl.dtsi | 5 + arch/arm/mach-imx/mx6/Kconfig | 24 +-- board/engicam/common/board.c | 24 +++ board/engicam/common/board.h | 1 - board/engicam/common/spl.c | 16 ++ board/engicam/geam6ul/MAINTAINERS | 2 +- board/engicam/geam6ul/geam6ul.c | 6 - board/engicam/icorem6/README | 33 ---- board/engicam/icorem6_rqs/Kconfig | 12 -- board/engicam/icorem6_rqs/MAINTAINERS | 9 -- board/engicam/icorem6_rqs/Makefile | 6 - board/engicam/icorem6_rqs/icorem6_rqs.c | 171 --------------------- board/engicam/{icorem6 => imx6q}/Kconfig | 2 +- board/engicam/{icorem6 => imx6q}/MAINTAINERS | 10 +- board/engicam/{icorem6 => imx6q}/Makefile | 2 +- board/engicam/{icorem6_rqs => imx6q}/README | 12 +- board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} | 108 +++---------- board/engicam/isiotmx6ul/MAINTAINERS | 2 +- board/engicam/isiotmx6ul/isiotmx6ul.c | 11 -- configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 3 +- configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - configs/imx6ul_isiot_mmc_defconfig | 1 - include/configs/imx6-engicam.h | 22 +-- 27 files changed, 112 insertions(+), 377 deletions(-) delete mode 100644 board/engicam/icorem6/README delete mode 100644 board/engicam/icorem6_rqs/Kconfig delete mode 100644 board/engicam/icorem6_rqs/MAINTAINERS delete mode 100644 board/engicam/icorem6_rqs/Makefile delete mode 100644 board/engicam/icorem6_rqs/icorem6_rqs.c rename board/engicam/{icorem6 => imx6q}/Kconfig (87%) rename board/engicam/{icorem6 => imx6q}/MAINTAINERS (51%) rename board/engicam/{icorem6 => imx6q}/Makefile (80%) rename board/engicam/{icorem6_rqs => imx6q}/README (68%) rename board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} (73%) -- 2.7.4

2 7

[U-Boot] [PATCH V4 01/12] scripts: spl: fix typo
by Peng Fan 02 Oct '17

02 Oct '17

Typo fix: CONIFG->CONFIG Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Tom Rini <trini(a)konsulko.com> --- V2: new V3: none V4: none scripts/Makefile.uncmd_spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl index 15d0836..b399411 100644 --- a/scripts/Makefile.uncmd_spl +++ b/scripts/Makefile.uncmd_spl @@ -9,7 +9,7 @@ ifdef CONFIG_SPL_BUILD ifndef CONFIG_SPL_DM CONFIG_DM_SERIAL= CONFIG_DM_GPIO= -CONIFG_DM_I2C= +CONFIG_DM_I2C= CONFIG_DM_SPI= CONFIG_DM_SPI_FLASH= endif -- 2.6.6

3 18

[U-Boot] [RFC PATCH v1 0/2] edison: Enable ACPI
by Andy Shevchenko 02 Oct '17

02 Oct '17

This RFC series based on discussion [1] to show how we may unleash the powerfulness of ACPI on the board, which initially didn't support it, via U-Boot. The series is highly experimental, though I'm using it on daily basis since my main work on ACPI pin control glue layer. More information is available on [2]. Note, I dunno the split of DSL pieces is fully correct since we need to understand the difference between SoC, platform, and board terms. Even though some stuff here declared under 'tangier' folder it's related to Intel Merrifield platform (like Wi-Fi chip connected to SDIO port of Intel Tangier). Because of some restrictions of ACPI language / interpreter I may not split some of those parts. Thus, it needs to be revisited. P.S. It would be nice if someone who possess the board can check and test this independently. [1]: https://lists.denx.de/pipermail/u-boot/2017-August/303997.html [2]: https://edison.internet-share.com/wiki/ACPI Andy Shevchenko (2): x86: tangier: Enable ACPI support for Intel Tangier x86: edison: Bring ACPI minimal support to the board arch/x86/cpu/tangier/Makefile | 1 + arch/x86/cpu/tangier/acpi.c | 86 ++++++ .../include/asm/arch-tangier/acpi/global_nvs.asl | 16 ++ .../x86/include/asm/arch-tangier/acpi/platform.asl | 31 +++ .../include/asm/arch-tangier/acpi/southcluster.asl | 306 +++++++++++++++++++++ arch/x86/include/asm/arch-tangier/global_nvs.h | 22 ++ board/intel/edison/.gitignore | 3 + board/intel/edison/Kconfig | 6 + board/intel/edison/Makefile | 1 + board/intel/edison/dsdt.asl | 13 + include/configs/edison.h | 3 + 11 files changed, 488 insertions(+) create mode 100644 arch/x86/cpu/tangier/acpi.c create mode 100644 arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl create mode 100644 arch/x86/include/asm/arch-tangier/acpi/platform.asl create mode 100644 arch/x86/include/asm/arch-tangier/acpi/southcluster.asl create mode 100644 arch/x86/include/asm/arch-tangier/global_nvs.h create mode 100644 board/intel/edison/.gitignore create mode 100644 board/intel/edison/dsdt.asl -- 2.14.1

2 5

[U-Boot] [PATCH] usb: storage: Fix overwritten in usb_stor_set_max_xfer_blk()
by Bin Meng 01 Oct '17

01 Oct '17

The stored 'blk' value is overwritten to 'size / 512' before it can be used in usb_stor_set_max_xfer_blk(). This is not what we want. In fact, when 'size' exceeds the upper limit (USHRT_MAX * 512), we should simply assign 'size' to the upper limit. Reported-by: Coverity (CID: 167250) Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- common/usb_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index a57570b..a91b1c0 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -964,7 +964,7 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev, blk = 20; } else { if (size > USHRT_MAX * 512) - blk = USHRT_MAX; + size = USHRT_MAX * 512; blk = size / 512; } #endif -- 2.7.4

2 7