July 2018 - U-Boot

[U-Boot] [PATCH] arm: zynq: Remove #address/#size-cells from gpio-keys
by Michal Simek 17 Jul '18

17 Jul '18

dts reports incorrect usage of these properties in gpio-keys node. Warning (avoid_unnecessary_addr_size): /gpio-keys: unnecessary The patch is removing these useless properties. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/boot/dts/zynq-zc702.dts | 2 -- arch/arm/boot/dts/zynq-zturn.dts | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 6653e34409cd..cc5a3dc2b4a0 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -29,8 +29,6 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; sw14 { label = "sw14"; diff --git a/arch/arm/boot/dts/zynq-zturn.dts b/arch/arm/boot/dts/zynq-zturn.dts index b25beaed874d..b38704657960 100644 --- a/arch/arm/boot/dts/zynq-zturn.dts +++ b/arch/arm/boot/dts/zynq-zturn.dts @@ -49,8 +49,6 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; K1 { label = "K1"; -- 1.9.1

1 0

[U-Boot] [PATCH] Add Beaglebone Enhanced support
by Koen Kooi 17 Jul '18

17 Jul '18

The "Beaglebone Enhanced" by Sancloud is based on the Beaglebone Black, but with the following differences: * Gigabit capable PHY * Extra USB hub, optional i2c control * lps3331ap barometer connected over i2c * MPU6050 6 axis MEMS accelerometer/gyro connected over i2c * 1GiB DDR3 RAM * RTL8723 Wifi/Bluetooth connected over USB Signed-off-by: Koen Kooi <koen(a)dominion.thruhere.net> --- board/ti/am335x/board.c | 6 ++++-- board/ti/am335x/board.h | 8 +++++++- board/ti/am335x/mux.c | 7 +++++++ include/configs/am335x_evm.h | 2 ++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 147ff0b..a359d20 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -725,6 +725,8 @@ int board_late_init(void) if (board_is_bbg1()) name = "BBG1"; + if (board_is_bben()) + name = "BBEN"; set_board_info_env(name); /* @@ -870,7 +872,7 @@ int board_eth_init(bd_t *bis) (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) #ifdef CONFIG_DRIVER_TI_CPSW - if (board_is_bone() || board_is_bone_lt() || + if (board_is_bone() || board_is_bone_lt() || board_is_bben() || board_is_idk()) { writel(MII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = @@ -906,7 +908,7 @@ int board_eth_init(bd_t *bis) #define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5 #define AR8051_RGMII_TX_CLK_DLY 0x100 - if (board_is_evm_sk() || board_is_gp_evm()) { + if (board_is_evm_sk() || board_is_gp_evm() || board_is_bben()) { const char *devname; devname = miiphy_get_current_dev(); diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index 652b10b..48df914 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -43,9 +43,15 @@ static inline int board_is_bbg1(void) return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4); } +static inline int board_is_bben(void) +{ + return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "SE", 2); +} + static inline int board_is_beaglebonex(void) { - return board_is_pb() || board_is_bone() || board_is_bone_lt() || board_is_bbg1(); + return board_is_pb() || board_is_bone() || board_is_bone_lt() || + board_is_bbg1() || board_is_bben(); } static inline int board_is_evm_sk(void) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index aa18760..f38424d 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -381,6 +381,13 @@ void enable_board_pin_mux(void) configure_module_pin_mux(mmc0_pin_mux_sk_evm); } else if (board_is_bone_lt()) { /* Beaglebone LT pinmux */ + if (board_is_bben()) { + /* SanCloud Beaglebone LT Enhanced pinmux */ + configure_module_pin_mux(rgmii1_pin_mux); + } else { + /* Beaglebone LT pinmux */ + configure_module_pin_mux(mii1_pin_mux); + } configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); #if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ff87adc..f1aa653 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -153,6 +153,8 @@ "setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \ "if test $board_name = BBBL; then " \ "setenv fdtfile am335x-boneblue.dtb; fi; " \ + "if test $board_name = BBEN; then " \ + "setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ -- 2.0.1

2 2

[U-Boot] [PATCH v2] serial: ns16550: Add register shift variable
by Felix Brack 17 Jul '18

17 Jul '18

This patch adds a new Kconfig variable that allows setting the register offset shift value for the ns16550 driver to some other value then 0 if not defined by the DT. All credit for this patch goes to Lokesh Vutla as it was his idea. The motivation for writing this patch originates in the effort of synchronizing U-Boot DT to Linux DT for am33xx SOCs. The current am33xx.dtsi file from U-Boot defines the <reg-shift> property for all UART nodes. The actual (4.18+) am33xx.dtsi file from Linux does not define <reg-shift> anymore. To prevent (probably difficult) changes in many .dts and .dtsi files once the synchronization is done, one can use this new variable. For the pdu001 board, for example, SYS_NS16550_REG_SHIFT is set to 2; no need to clutter U-Boot and board specific dts files with <reg-shift> properties. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- Changes in v2: - clarify variable usage - set default value to 2 for AM33XX SoC drivers/serial/Kconfig | 15 +++++++++++++++ drivers/serial/ns16550.c | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 766e5ce..7eb3c6f 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -530,6 +530,21 @@ config SYS_NS16550 be used. It can be a constant or a function to get clock, eg, get_serial_clock(). +config SYS_NS16550_REG_SHIFT + int "Amount of bits to shift register offsets left" + default 2 if AM33XX + default 0 + depends on SYS_NS16550 + help + Use this to specify the amount of bits to shift device register + offsets to the left. The resulting register offset is calculate as + follows: "reg offset" << SYS_NS16550_REG_SHIFT. If, for example, + the device register offsets are 0x00, 0x04, 0x08, 0x0C and so forth + than set this to 2. + In case of AM33XX SoC the default value is 2, 0 otherwise. Note + that a <reg-shift> property defined in a UART node of the device + tree will always take precedence. + config INTEL_MID_SERIAL bool "Intel MID platform UART support" depends on DM_SERIAL && OF_CONTROL diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 9c80090..9ff6dbe 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -442,7 +442,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) #endif plat->reg_offset = dev_read_u32_default(dev, "reg-offset", 0); - plat->reg_shift = dev_read_u32_default(dev, "reg-shift", 0); + plat->reg_shift = dev_read_u32_default(dev, "reg-shift", + CONFIG_SYS_NS16550_REG_SHIFT); err = clk_get_by_index(dev, 0, &clk); if (!err) { -- 2.7.4

5 12

[U-Boot] [UBOOT PATCH v2] env: Added support to save env to spi through Kconfig
by Vipul Kumar 17 Jul '18

17 Jul '18

This patch added support to enable CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET and CONFIG_ENV_SECT_SIZE through Kconfig for Zynq and Zynqmp. Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> --- Changes in v2: - Changed if condition of ENV_SIZE for Zynqmp - Changed if condition for ENV_SECT_SIZE --- env/Kconfig | 28 ++++++++++++++++++++++++++++ include/configs/xilinx_zynqmp.h | 3 --- include/configs/zynq-common.h | 13 ------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index 8618376..b37dcd7 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -480,6 +480,34 @@ config ENV_SIZE endif +if ARCH_ZYNQMP || ARCH_ZYNQ + +config ENV_OFFSET + hex "Environment Offset" + depends on !ENV_IS_NOWHERE + default 0x1E00000 if ARCH_ZYNQMP + default 0xE0000 if ARCH_ZYNQ + help + Offset from the start of the device (or partition) + +config ENV_SIZE + hex "Environment Size" + default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP + default 0x8000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the environment storage area. + +config ENV_SECT_SIZE + hex "Environment Sector-Size" + depends on !ENV_IS_NOWHERE + default 0x40000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the sector containing the environment. + +endif + config USE_DEFAULT_ENV_FILE bool "Create default environment from file" help diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index ebc6c6f..ef242c7 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -99,9 +99,6 @@ # define PARTS_DEFAULT #endif -/* Do not preserve environment */ -#define CONFIG_ENV_SIZE 0x8000 - /* Monitor Command Prompt */ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 2048 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a6f2ace..c41dc2c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -121,22 +121,9 @@ # define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */ #endif -/* Total Size of Environment Sector */ -#ifndef CONFIG_ENV_SIZE -# define CONFIG_ENV_SIZE (128 << 10) -#endif - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -/* Environment */ -#ifndef CONFIG_ENV_IS_NOWHERE -# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -# ifndef CONFIG_ENV_OFFSET -# define CONFIG_ENV_OFFSET 0xE0000 -# endif -#endif - /* enable preboot to be loaded before CONFIG_BOOTDELAY */ #define CONFIG_PREBOOT -- 2.7.4

1 0

[U-Boot] [PATCH] sysreset: Add support for gpio-restart
by Michal Simek 17 Jul '18

17 Jul '18

The Linux kernel has binding for gpio-restart node. This patch is adding basic support without supporting any optional properties. This driver was tested on Microblaze system where gpio is connected to SoC reset logic. Output value is handled via gpios cells values. In gpio_reboot_request() set_value is writing 1 because dm_gpio_set_value() is capable to changing it when it is ACTIVE_LOW. ... if (desc->flags & GPIOD_ACTIVE_LOW) value = !value; ... Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/sysreset/Kconfig | 6 ++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_gpio.c | 59 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 drivers/sysreset/sysreset_gpio.c diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index a6d48e8a662c..1e228b97443a 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -15,6 +15,12 @@ config SYSRESET if SYSRESET +config SYSRESET_GPIO + bool "Enable support for GPIO restart driver" + select GPIO + help + Restart support via GPIO pin connected reset logic. + config SYSRESET_PSCI bool "Enable support for PSCI System Reset" depends on ARM_PSCI_FW diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index 0da58a1cf6ad..ca533cfefaad 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -3,6 +3,7 @@ # (C) Copyright 2016 Cadence Design Systems Inc. obj-$(CONFIG_SYSRESET) += sysreset-uclass.o +obj-$(CONFIG_SYSRESET_GPIO) += sysreset_gpio.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o diff --git a/drivers/sysreset/sysreset_gpio.c b/drivers/sysreset/sysreset_gpio.c new file mode 100644 index 000000000000..4c1c1510f285 --- /dev/null +++ b/drivers/sysreset/sysreset_gpio.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 Xilinx, Inc. - Michal Simek + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <sysreset.h> +#include <asm/gpio.h> + +struct gpio_reboot_priv { + struct gpio_desc gpio; +}; + +static int gpio_reboot_request(struct udevice *dev, enum sysreset_t type) +{ + struct gpio_reboot_priv *priv = dev_get_priv(dev); + + /* + * When debug log is enabled please make sure that chars won't end up + * in output fifo. Or you can append udelay(); to get enough time + * to HW to emit output fifo. + */ + debug("GPIO restart\n"); + + /* 1 is just setting value - based on gpio->flags 0 or 1 is written */ + return dm_gpio_set_value(&priv->gpio, 1); +} + +static struct sysreset_ops gpio_reboot_ops = { + .request = gpio_reboot_request, +}; + +int gpio_reboot_probe(struct udevice *dev) +{ + struct gpio_reboot_priv *priv = dev_get_priv(dev); + + /* + * Linux kernel DT binding contain others optional properties + * which are not supported now + */ + + return gpio_request_by_name(dev, "gpios", 0, &priv->gpio, GPIOD_IS_OUT); +} + +static const struct udevice_id led_gpio_ids[] = { + { .compatible = "gpio-restart" }, + { } +}; + +U_BOOT_DRIVER(gpio_reboot) = { + .id = UCLASS_SYSRESET, + .name = "gpio_restart", + .of_match = led_gpio_ids, + .ops = &gpio_reboot_ops, + .priv_auto_alloc_size = sizeof(struct gpio_reboot_priv), + .probe = gpio_reboot_probe, +}; -- 1.9.1

3 5

[U-Boot] [PATCH] microblaze: Remove XILINX_SPI_FLASH_BASEADDR logic
by Michal Simek 17 Jul '18

17 Jul '18

XILINX_SPI_FLASH_BASEADDR logic has been converted to DM that's why there is no reason to depend on this address anymore. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/microblaze-generic.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 5eab2e5a3881..d6a0f5aa9d6c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -19,16 +19,10 @@ #undef SPIFLASH #undef RAMENV /* hold environment in flash */ #else -#ifdef XILINX_SPI_FLASH_BASEADDR -#undef FLASH -#define SPIFLASH -#undef RAMENV /* hold environment in flash */ -#else #undef FLASH #undef SPIFLASH #define RAMENV /* hold environment in RAM */ #endif -#endif /* uart */ /* The following table includes the supported baudrates */ @@ -91,7 +85,6 @@ #else /* !FLASH */ #ifdef SPIFLASH -# define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 # define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ # define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS -- 1.9.1

1 0

[U-Boot] [PATCH 0/8] musb: sunxi: Few fixes/improvements
by Jagan Teki 17 Jul '18

17 Jul '18

All these changes mostly related to musb/sunxi.c and msub core files with few fixes on sunxi front and some code improvements on musb while handling shutdown code. One patch mark it as 'RFC' about "including UCLASS_USB_DEV_GENERIC into shutdown caller" so expecting some inputs on the same. patch 1, fix improper musb host pointer patch 2, musb-new/sunxi allocate phy in private patch 3, use phy_passby even for PHY#0 patch 4, don't set usb_clk_cfg in PHY probe patch 5, update PHY#4 rst_mask for H3_H5 patch 6, shutdown UCLASS_USB_DEV_GENERIC patch 7, musb-new/sunxi add proper exit patch 8, call musb_platform_exit from musb_stop Jagan Teki (8): usb: musb-new: Fix improper musb host pointer usb: musb-new: sunxi: Allocate struct phy in private phy: sun4i-usb: Call phy_passby even for PHY#0 phy: sun4i-usb: Remove usb_clk_cfg set in probe phy: sun4i-usb: Update PHY#3 rst_mask only for H3_H5 dm: usb: Add UCLASS_USB_DEV_GENERIC shutdown usb: musb-new: sunxi: Add proper musb exit support usb: musb-new: core: Call musb_platform_exit from musb_stop board/compulab/cm_t3517/cm_t3517.c | 4 +- drivers/phy/allwinner/phy-sun4i-usb.c | 7 +-- drivers/usb/host/usb-uclass.c | 43 +++++++++++++++ drivers/usb/musb-new/musb_core.c | 1 + drivers/usb/musb-new/musb_uboot.c | 10 ++-- drivers/usb/musb-new/pic32.c | 6 ++- drivers/usb/musb-new/sunxi.c | 76 +++++++++++++++------------ include/linux/usb/musb.h | 4 +- 8 files changed, 101 insertions(+), 50 deletions(-) -- 2.17.1

6 17

[U-Boot] [PATCH] watchdog: cadence: Do not stop wdt in probe
by Michal Simek 17 Jul '18

17 Jul '18

Watchdog can be started before probe and u-boot should just take control over it. That's why do not stop watchdog in probe to cover cases where watchdog can expire before probe and start. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/watchdog/cdns_wdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c index 71575cb300f4..fc85fbcec252 100644 --- a/drivers/watchdog/cdns_wdt.c +++ b/drivers/watchdog/cdns_wdt.c @@ -224,8 +224,6 @@ static int cdns_wdt_probe(struct udevice *dev) { debug("%s: Probing wdt%u\n", __func__, dev->seq); - cdns_wdt_stop(dev); - return 0; } -- 1.9.1

1 0

[U-Boot] Question: Frescale imx board repositories
by Fernando AE 17 Jul '18

17 Jul '18

Hello all, I'd like to know what's the difference between the Frescale imx board repositories from: 1) https://source.codeaurora.org/external/imx/uboot-imx 2) https://github.com/Freescale/u-boot-fslc It seems that #2 is rebased more often and is referenced by yocto. I was wordering if the differece could be in stability or board support. Thanks for your help, Fernando

1 0

[U-Boot] ls1021atwr: Convert to use driver model TSEC driver
by Bin Meng 17 Jul '18

17 Jul '18

Hi York, There was a patch [1] previously done by me to convert to use driver model TSEC driver on LS1021ATWR. It was never accepted given at that time the PCI driver for LS1021A has not been converted to use driver model yet, and DM PCI is unfortunately bundled to DM ETH. Now that we have converted to use DM PCI, would it possible for NXP guys to pick up this work and do the DM ETH conversion for LS1021ATWR? Thanks! [1] http://patchwork.ozlabs.org/patch/566347/ Regards, Bin

3 9