December 2018 - U-Boot

[U-Boot] [PATCH v2] riscv: configs: Rename ax25-ae350 defconfig
by Andes 17 Dec '18

17 Dec '18

From: Rick Chen <rick(a)andestech.com> Remove cpu name from the defconfig naming. Because other cpus maybe run on AE350 platform. So only use platfrom name in defconfig naming will be better. Signed-off-by: Rick Chen <rick(a)andestech.com> Cc: Greentime Hu <greentime(a)andestech.com> --- Changes since v1: Use git format-patch �VM to show delta when rename. --- configs/{a25-ae350_32_defconfig => ae350_rv32_defconfig} | 0 configs/{ax25-ae350_64_defconfig => ae350_rv64_defconfig} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename configs/{a25-ae350_32_defconfig => ae350_rv32_defconfig} (100%) rename configs/{ax25-ae350_64_defconfig => ae350_rv64_defconfig} (100%) diff --git a/configs/a25-ae350_32_defconfig b/configs/ae350_rv32_defconfig similarity index 100% rename from configs/a25-ae350_32_defconfig rename to configs/ae350_rv32_defconfig diff --git a/configs/ax25-ae350_64_defconfig b/configs/ae350_rv64_defconfig similarity index 100% rename from configs/ax25-ae350_64_defconfig rename to configs/ae350_rv64_defconfig -- 2.7.4

2 1

[U-Boot] [PATCH] riscv: configs: Rename ax25-ae350 defconfig
by Andes 17 Dec '18

17 Dec '18

From: Rick Chen <rick(a)andestech.com> Remove cpu name from the defconfig naming. Because other cpus maybe run on AE350 platform. So only use platfrom name in defconfig naming will be better. Signed-off-by: Rick Chen <rick(a)andestech.com> Cc: Greentime Hu <greentime(a)andestech.com> --- configs/a25-ae350_32_defconfig | 36 ------------------------------------ configs/ae350_rv32_defconfig | 36 ++++++++++++++++++++++++++++++++++++ configs/ae350_rv64_defconfig | 37 +++++++++++++++++++++++++++++++++++++ configs/ax25-ae350_64_defconfig | 37 ------------------------------------- 4 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 configs/a25-ae350_32_defconfig create mode 100644 configs/ae350_rv32_defconfig create mode 100644 configs/ae350_rv64_defconfig delete mode 100644 configs/ax25-ae350_64_defconfig diff --git a/configs/a25-ae350_32_defconfig b/configs/a25-ae350_32_defconfig deleted file mode 100644 index 5837b48..0000000 --- a/configs/a25-ae350_32_defconfig +++ /dev/null @@ -1,36 +0,0 @@ -CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x00000000 -CONFIG_TARGET_AX25_AE350=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=2 -CONFIG_FIT=y -CONFIG_BOOTDELAY=3 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_CMD_IMLS=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SF_TEST=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_BOOTP_PREFER_SERVERIP=y -CONFIG_CMD_CACHE=y -CONFIG_OF_BOARD=y -CONFIG_DEFAULT_DEVICE_TREE="ae350_32" -CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_MMC=y -CONFIG_FTSDC010=y -CONFIG_FTSDC010_SDIO=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_FTMAC100=y -CONFIG_BAUDRATE=38400 -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_ATCSPI200_SPI=y -CONFIG_ATCPIT100_TIMER=y diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig new file mode 100644 index 0000000..5837b48 --- /dev/null +++ b/configs/ae350_rv32_defconfig @@ -0,0 +1,36 @@ +CONFIG_RISCV=y +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TARGET_AX25_AE350=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT=y +CONFIG_BOOTDELAY=3 +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " +CONFIG_CMD_IMLS=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SF_TEST=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_PREFER_SERVERIP=y +CONFIG_CMD_CACHE=y +CONFIG_OF_BOARD=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_32" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_MMC=y +CONFIG_FTSDC010=y +CONFIG_FTSDC010_SDIO=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y +CONFIG_CFI_FLASH=y +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y +CONFIG_SYS_FLASH_CFI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_FTMAC100=y +CONFIG_BAUDRATE=38400 +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_ATCSPI200_SPI=y +CONFIG_ATCPIT100_TIMER=y diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig new file mode 100644 index 0000000..b250d3f --- /dev/null +++ b/configs/ae350_rv64_defconfig @@ -0,0 +1,37 @@ +CONFIG_RISCV=y +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TARGET_AX25_AE350=y +CONFIG_ARCH_RV64I=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT=y +CONFIG_BOOTDELAY=3 +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " +CONFIG_CMD_IMLS=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SF_TEST=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_PREFER_SERVERIP=y +CONFIG_CMD_CACHE=y +CONFIG_OF_BOARD=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_64" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_MMC=y +CONFIG_FTSDC010=y +CONFIG_FTSDC010_SDIO=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y +CONFIG_CFI_FLASH=y +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y +CONFIG_SYS_FLASH_CFI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_FTMAC100=y +CONFIG_BAUDRATE=38400 +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_ATCSPI200_SPI=y +CONFIG_ATCPIT100_TIMER=y diff --git a/configs/ax25-ae350_64_defconfig b/configs/ax25-ae350_64_defconfig deleted file mode 100644 index b250d3f..0000000 --- a/configs/ax25-ae350_64_defconfig +++ /dev/null @@ -1,37 +0,0 @@ -CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x00000000 -CONFIG_TARGET_AX25_AE350=y -CONFIG_ARCH_RV64I=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=2 -CONFIG_FIT=y -CONFIG_BOOTDELAY=3 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_CMD_IMLS=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SF_TEST=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_BOOTP_PREFER_SERVERIP=y -CONFIG_CMD_CACHE=y -CONFIG_OF_BOARD=y -CONFIG_DEFAULT_DEVICE_TREE="ae350_64" -CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_MMC=y -CONFIG_FTSDC010=y -CONFIG_FTSDC010_SDIO=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_FTMAC100=y -CONFIG_BAUDRATE=38400 -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_ATCSPI200_SPI=y -CONFIG_ATCPIT100_TIMER=y -- 2.7.4

3 2

[U-Boot] [PATCH] ARM: rockchip: Add rv1108-elgin-r1 board support
by Otavio Salvador 16 Dec '18

16 Dec '18

Add the initial support for Elgin R1 board, which is based on the RV1108 SoC and has the following features currently supported in U-Boot: - UART - eMMC - USB Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rv1108-elgin-r1.dts | 48 ++++++++++++++++ arch/arm/mach-rockchip/rv1108/Kconfig | 6 ++ board/elgin/elgin_rv1108/Kconfig | 15 +++++ board/elgin/elgin_rv1108/MAINTAINERS | 6 ++ board/elgin/elgin_rv1108/Makefile | 7 +++ board/elgin/elgin_rv1108/elgin_rv1108.c | 74 +++++++++++++++++++++++++ configs/elgin-rv1108_defconfig | 58 +++++++++++++++++++ include/configs/elgin_rv1108.h | 13 +++++ 9 files changed, 228 insertions(+) create mode 100644 arch/arm/dts/rv1108-elgin-r1.dts create mode 100644 board/elgin/elgin_rv1108/Kconfig create mode 100644 board/elgin/elgin_rv1108/MAINTAINERS create mode 100644 board/elgin/elgin_rv1108/Makefile create mode 100644 board/elgin/elgin_rv1108/elgin_rv1108.c create mode 100644 configs/elgin-rv1108_defconfig create mode 100644 include/configs/elgin_rv1108.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d8be3a30dc..748b5c2e3b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3399-puma-ddr1333.dtb \ rk3399-puma-ddr1600.dtb \ rk3399-puma-ddr1866.dtb \ + rv1108-elgin-r1.dtb \ rv1108-evb.dtb dtb-$(CONFIG_ARCH_MESON) += \ meson-gxbb-nanopi-k2.dtb \ diff --git a/arch/arm/dts/rv1108-elgin-r1.dts b/arch/arm/dts/rv1108-elgin-r1.dts new file mode 100644 index 0000000000..32b95940b0 --- /dev/null +++ b/arch/arm/dts/rv1108-elgin-r1.dts @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + */ + +/dts-v1/; + +#include "rv1108.dtsi" + +/ { + model = "Elgin RV1108 R1 board"; + compatible = "elgin,rv1108-elgin", "rockchip,rv1108"; + + memory@60000000 { + device_type = "memory"; + reg = <0x60000000 0x08000000>; + }; + + chosen { + stdout-path = "serial2:1500000n8"; + }; +}; + +&emmc { + pinctrl-names = "default"; + pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; + bus-width = <8>; + cap-mmc-highspeed; + disable-wp; + non-removable; + status = "okay"; +}; + +&u2phy { + status = "okay"; + + u2phy_otg: otg-port { + status = "okay"; + }; +}; + +&uart2 { + status = "okay"; +}; + +&usb20_otg { + status = "okay"; +}; diff --git a/arch/arm/mach-rockchip/rv1108/Kconfig b/arch/arm/mach-rockchip/rv1108/Kconfig index e6cba66578..8883aeae7a 100644 --- a/arch/arm/mach-rockchip/rv1108/Kconfig +++ b/arch/arm/mach-rockchip/rv1108/Kconfig @@ -17,6 +17,11 @@ config TARGET_EVB_RV1108 * 10/100 Mbps Ethernet * camera interface compatible with imx323 / ov2710 / ov4689 +config TARGET_ELGIN_RV1108 + bool "ELGIN_RV1108" + help + RV1108 ELGIN is a board based on the Rockchip RV1108. + config SYS_SOC default "rockchip" @@ -24,5 +29,6 @@ config SYS_MALLOC_F_LEN default 0x400 source board/rockchip/evb_rv1108/Kconfig +source board/elgin/elgin_rv1108/Kconfig endif diff --git a/board/elgin/elgin_rv1108/Kconfig b/board/elgin/elgin_rv1108/Kconfig new file mode 100644 index 0000000000..be9243164a --- /dev/null +++ b/board/elgin/elgin_rv1108/Kconfig @@ -0,0 +1,15 @@ +if TARGET_ELGIN_RV1108 + +config SYS_BOARD + default "elgin_rv1108" + +config SYS_VENDOR + default "elgin" + +config SYS_CONFIG_NAME + default "elgin_rv1108" + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + +endif diff --git a/board/elgin/elgin_rv1108/MAINTAINERS b/board/elgin/elgin_rv1108/MAINTAINERS new file mode 100644 index 0000000000..7747490163 --- /dev/null +++ b/board/elgin/elgin_rv1108/MAINTAINERS @@ -0,0 +1,6 @@ +ELGIN-RV1108 +M: Otavio Salvador <otavio(a)ossystems.com.br> +S: Maintained +F: board/elgin/elgin_rv1108 +F: include/configs/elgin_rv1108.h +F: configs/elgin-rv1108_defconfig diff --git a/board/elgin/elgin_rv1108/Makefile b/board/elgin/elgin_rv1108/Makefile new file mode 100644 index 0000000000..382218006a --- /dev/null +++ b/board/elgin/elgin_rv1108/Makefile @@ -0,0 +1,7 @@ +# +# (C) Copyright 2016 Rockchip Electronics Co., Ltd +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += elgin_rv1108.o diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c new file mode 100644 index 0000000000..3abc514412 --- /dev/null +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C)Copyright 2016 Rockchip Electronics Co., Ltd + * Authors: Andy Yan <andy.yan(a)rock-chips.com> + */ + +#include <common.h> +#include <asm/io.h> +#include <fdtdec.h> +#include <asm/arch/grf_rv1108.h> +#include <asm/arch/hardware.h> +#include <asm/gpio.h> + +DECLARE_GLOBAL_DATA_PTR; + +int mach_cpu_init(void) +{ + int node; + struct rv1108_grf *grf; + enum { + GPIO3C3_SHIFT = 6, + GPIO3C3_MASK = 3 << GPIO3C3_SHIFT, + + GPIO3C2_SHIFT = 4, + GPIO3C2_MASK = 3 << GPIO3C2_SHIFT, + + GPIO2D2_SHIFT = 4, + GPIO2D2_MASK = 3 << GPIO2D2_SHIFT, + GPIO2D2_GPIO = 0, + GPIO2D2_UART2_SOUT_M0, + + GPIO2D1_SHIFT = 2, + GPIO2D1_MASK = 3 << GPIO2D1_SHIFT, + GPIO2D1_GPIO = 0, + GPIO2D1_UART2_SIN_M0, + }; + + node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "rockchip,rv1108-grf"); + grf = (struct rv1108_grf *)fdtdec_get_addr(gd->fdt_blob, node, "reg"); + + /* Elgin board use UART2 m0 for debug*/ + rk_clrsetreg(&grf->gpio2d_iomux, + GPIO2D2_MASK | GPIO2D1_MASK, + GPIO2D2_UART2_SOUT_M0 << GPIO2D2_SHIFT | + GPIO2D1_UART2_SIN_M0 << GPIO2D1_SHIFT); + rk_clrreg(&grf->gpio3c_iomux, GPIO3C3_MASK | GPIO3C2_MASK); + + return 0; +} + +#define MODEM_ENABLE_GPIO 111 + +int board_init(void) +{ + gpio_request(MODEM_ENABLE_GPIO, "modem_enable"); + gpio_direction_output(MODEM_ENABLE_GPIO, 0); + + return 0; +} + +int dram_init(void) +{ + gd->ram_size = 0x8000000; + + return 0; +} + +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = 0x60000000; + gd->bd->bi_dram[0].size = 0x8000000; + + return 0; +} diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig new file mode 100644 index 0000000000..40fbd6bd0e --- /dev/null +++ b/configs/elgin-rv1108_defconfig @@ -0,0 +1,58 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_ROCKCHIP_RV1108=y +CONFIG_TARGET_ELGIN_RV1108=y +CONFIG_DEBUG_UART_BASE=0x10210000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y +CONFIG_NR_DRAM_BANKS=1 +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_GPIO=y +CONFIG_RANDOM_UUID=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_DEFAULT_DEVICE_TREE="rv1108-elgin-r1" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CLK=y +CONFIG_FASTBOOT_BUF_ADDR=0x62000000 +CONFIG_FASTBOOT_BUF_SIZE=0x08000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_ROCKCHIP_RV1108=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_BAUDRATE=1500000 +# CONFIG_SPL_SERIAL_PRESENT is not set +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC2=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Rockchip" +CONFIG_USB_GADGET_VENDOR_NUM=0x2207 +CONFIG_USB_GADGET_PRODUCT_NUM=0x110a +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_ERRNO_STR=y diff --git a/include/configs/elgin_rv1108.h b/include/configs/elgin_rv1108.h new file mode 100644 index 0000000000..aa6c4b09e2 --- /dev/null +++ b/include/configs/elgin_rv1108.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/rv1108_common.h> + +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#endif -- 2.19.2

2 2

[U-Boot] [PATCH v3] rockchip: rk3288-evb: dts: remove 'vmmc' from emmc node
by Kever Yang 16 Dec '18

16 Dec '18

This is a sync with kernel mainline dts. The U-Boot eMMC does not need to care about the power for Rockchip SoCs, because if the board is using eMMC, the power will default on (for bootrom), so the 'vmmc', 'vqmmc' is only useful for SD in U-Boot. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v3: - update commit message base on comments from Philipp and Tom. Changes in v2: - only update for rk3288-evb, remove change for other boards. arch/arm/dts/rk3288-evb.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi index ce75bd5d28..04902c0bd3 100644 --- a/arch/arm/dts/rk3288-evb.dtsi +++ b/arch/arm/dts/rk3288-evb.dtsi @@ -150,8 +150,6 @@ num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>; - vmmc-supply = <&vcc_io>; - vqmmc-supply = <&vcc_flash>; status = "okay"; }; -- 2.18.0

2 2

[U-Boot] [PATCH v1] rockchip: rk3399-puma: Remove obsolete DTS node 'vcc5v0_host'.
by Christoph Muellner 16 Dec '18

16 Dec '18

vcc5v0_host and usbhub_enable share gpio4 RK_PA3, which is a problem during probing (the second probe will trigger a -EBUSY, when trying to get the gpio handle). An analysis of the situation shows, that both regulators are actually describing the same supply. This patch removes the (currenlty not successful probing) regulator vcc5v0_host from the DTS and adds the pinctrl-* setting to usbhub_enable. Signed-off-by: Christoph Muellner <christoph.muellner(a)theobroma-systems.com> --- arch/arm/dts/rk3399-puma.dtsi | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index ba9bb4c5994..9a61fbb4536 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -95,6 +95,8 @@ regulator-name = "usbhub_enable"; enable-active-low; gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&host_vbus_drv>; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -146,16 +148,6 @@ regulator-always-on; }; - vcc5v0_host: vcc5v0-host-regulator { - compatible = "regulator-fixed"; - enable-active-low; - gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&host_vbus_drv>; - regulator-name = "vcc5v0_host"; - regulator-always-on; - }; - vcc5v0_sys: vcc5v0-sys { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; -- 2.11.0

2 2

[U-Boot] [PATCH v2 1/1] efi_loader: efi_guid_t must be 64-bit aligned
by Heinrich Schuchardt 16 Dec '18

16 Dec '18

The UEFI Specification Version 2.7 Errata A defines: "EFI_GUID 128-bit buffer containing a unique identifier value. Unless otherwise specified, aligned on a 64-bit boundary." Before this patch efi_guid_t was 8-bit aligned. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> --- v2 remove superfluous white space --- include/efi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/efi.h b/include/efi.h index b5e2c64f38..3018c61b37 100644 --- a/include/efi.h +++ b/include/efi.h @@ -49,7 +49,7 @@ struct efi_device_path; typedef struct { u8 b[16]; -} efi_guid_t; +} efi_guid_t __attribute__((aligned(8))); #define EFI_BITS_PER_LONG (sizeof(long) * 8) -- 2.19.2

1 0

[U-Boot] [PATCH] mips: xilfpga: fix DTC warnings
by Daniel Schwierzeck 15 Dec '18

15 Dec '18

This fixes following DTC warning: arch/mips/dts/nexys4ddr.dtb: Warning (compatible_is_string_list): /ethernet@10e00000/mdio/phy@1:compatible: property is not a string list As upstream DTS in Linux doesn't have the offending property, simply remove it to fix the warning. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- arch/mips/dts/nexys4ddr.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/dts/nexys4ddr.dts b/arch/mips/dts/nexys4ddr.dts index e254ab1eaa..6de8584ea7 100644 --- a/arch/mips/dts/nexys4ddr.dts +++ b/arch/mips/dts/nexys4ddr.dts @@ -40,7 +40,6 @@ #address-cells = <1>; #size-cells = <0>; phy0: phy@1 { - compatible = <0x0007c0f0 0xfffffff0>; device_type = "ethernet-phy"; reg = <1>; } ; -- 2.20.1

1 0

[U-Boot] [PATCH] mips: ath79: fix DTC warnings
by Daniel Schwierzeck 15 Dec '18

15 Dec '18

Remove all interrupt nodes that cause warnings regarding a missing interrupt parent. There are no interrupt controller nodes defined and the device trees don't match the ones in Linux anymore. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- arch/mips/dts/ar933x.dtsi | 3 --- arch/mips/dts/qca953x.dtsi | 3 --- 2 files changed, 6 deletions(-) diff --git a/arch/mips/dts/ar933x.dtsi b/arch/mips/dts/ar933x.dtsi index 85fb14b13b..37354324fe 100644 --- a/arch/mips/dts/ar933x.dtsi +++ b/arch/mips/dts/ar933x.dtsi @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ -#include <dt-bindings/interrupt-controller/irq.h> #include "skeleton.dtsi" / { @@ -68,7 +67,6 @@ uart0: uart@18020000 { compatible = "qca,ar9330-uart"; reg = <0x18020000 0x20>; - interrupts = <128 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -103,7 +101,6 @@ spi0: spi@1f000000 { compatible = "qca,ar7100-spi"; reg = <0x1f000000 0x10>; - interrupts = <129 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; diff --git a/arch/mips/dts/qca953x.dtsi b/arch/mips/dts/qca953x.dtsi index 599e809c47..ba29ea287e 100644 --- a/arch/mips/dts/qca953x.dtsi +++ b/arch/mips/dts/qca953x.dtsi @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ -#include <dt-bindings/interrupt-controller/irq.h> #include "skeleton.dtsi" / { @@ -63,7 +62,6 @@ reg = <0x18020000 0x20>; reg-shift = <2>; clock-frequency = <25000000>; - interrupts = <128 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -72,7 +70,6 @@ spi0: spi@1f000000 { compatible = "qca,ar7100-spi"; reg = <0x1f000000 0x10>; - interrupts = <129 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; -- 2.20.1

1 0

[U-Boot] [PATCH] image: fix compiling without CMD_FDT
by Simon Goldschmidt 15 Dec '18

15 Dec '18

Booting an image currently sets the environment variable "fdtaddr" by calling into 'cmd/fdt.c'. As a result, linking U-Boot fails if CMD_FDT is not enabled. Fix this by adding 'if (CONFIG_IS_ENABLED(CMD_FDT))' to the two places where 'set_working_fdt_addr()' is called. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- common/bootm.c | 3 ++- common/image-fdt.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 8bf84ebcb7..80f304ce9f 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -262,7 +262,8 @@ int bootm_find_images(int flag, int argc, char * const argv[]) puts("Could not find a valid device tree\n"); return 1; } - set_working_fdt_addr(map_to_sysmem(images.ft_addr)); + if (CONFIG_IS_ENABLED(CMD_FDT)) + set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif #if IMAGE_ENABLE_FIT diff --git a/common/image-fdt.c b/common/image-fdt.c index 95748f0ae1..8ee5a13352 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -193,7 +193,8 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); + if (CONFIG_IS_ENABLED(CMD_FDT)) + set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0; error: -- 2.11.0

2 3

[U-Boot] Please pull u-boot-dm
by Simon Glass 15 Dec '18

15 Dec '18

Hi Tom, See here (the one failure seems to be a network error) https://travis-ci.org/sglass68/u-boot/builds/467777333 The following changes since commit d117d8f19b0625f88309e47a8a32c2faa384dddc: Merge branch 'master' of git://git.denx.de/u-boot-i2c (2018-12-13 09:36:55 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-14dec18 for you to fetch changes up to f987177db9c988142032ed8142a093cce2378a90: dm: sound: Use the correct number of channels for sound (2018-12-13 16:37:10 -0700) ---------------------------------------------------------------- Complete conversion of sound to driver model ---------------------------------------------------------------- Simon Glass (40): sandbox: Increase the pre-relocation memory snow: Expand U-Boot size dm: sound: samsung: Make local function static dm: sound: Rename en_sound_codec to sound_codec dm: sound: Drop unused pre-device-tree code dm: sound: samsung: Rename i2stx_info to samsung_i2s_priv dm: sound: Drop codec_type dm: sound: wm8994: Pass private data to internal functions dm: sound: max98095: Pass private data to internal functions dm: sound: wm8994: Create a new common init function dm: sound: wm899c: Split out interface setup code dm: sound: max98095: Split out interface setup code dm: sound: wm8994: Drop global i2c-address variable dm: sound: max98095: Drop global i2c-address variable dm: sound: wm8994: Drop g_codec_info and g_wm8994_info dm: sound: max98095: Drop g_codec_info and g_max98095_info dm: sound: wm8994: Drop wm8994_i2c_init() dm: sound: Fix up header ordering dm: sound: exynos: Correct codec bus addresses dm: sound: Create an option to use driver model for sound dm: sound: Rename samsung_i2s_priv to i2s_uc_priv dm: sound: Create a uclass for audio codecs dm: sound: Create a uclass for i2s dm: sandbox: Update sound to use two buffers dm: sound: Create a uclass for sound dm: core: Add a function to read into a unsigned int dm: sound: Start i2c IDs from 0 dm: sound: Add conversion to driver model exynos: Add proid_is_exynos542x() for common 542x exynos: Add support for exynos5420 i2s pinmux dm: sound: Move common code out of maxim98095 dm: sound: exynos: Add support for max98090 dm: exynos: sound: Convert to use driver model dm: sandbox: sound: Convert to use driver model dm: exynos: Drop CONFIG_DM_I2C_COMPAT dm: sound: Complete migration to driver model dm: sound: Fix license headers dm: sound: max98095: Tidy up error codes dm: sandbox: Allow selection of sample rate and channels dm: sound: Use the correct number of channels for sound Kconfig | 2 + arch/Kconfig | 1 + arch/arm/dts/exynos5250-smdk5250.dts | 21 ++++- arch/arm/dts/exynos5250-snow.dts | 25 ++++-- arch/arm/dts/exynos5250-spring.dts | 24 +++++- arch/arm/dts/exynos5250.dtsi | 15 ++-- arch/arm/dts/exynos5420-peach-pit.dts | 24 +++++- arch/arm/dts/exynos5420-smdk5420.dts | 21 ++++- arch/arm/dts/exynos54xx.dtsi | 14 +++ arch/arm/dts/exynos5800-peach-pi.dts | 24 +++++- arch/arm/mach-exynos/clock.c | 31 +++++-- arch/arm/mach-exynos/clock_init_exynos5.c | 2 +- arch/arm/mach-exynos/common_setup.h | 4 +- arch/arm/mach-exynos/include/mach/clock.h | 3 + arch/arm/mach-exynos/include/mach/cpu.h | 4 +- arch/arm/mach-exynos/include/mach/gpio.h | 4 +- arch/arm/mach-exynos/pinmux.c | 19 ++++- arch/arm/mach-exynos/power.c | 2 +- arch/sandbox/cpu/sdl.c | 124 ++++++++++++++++++--------- arch/sandbox/dts/sandbox.dts | 21 +++++ arch/sandbox/dts/test.dts | 23 +++++ arch/sandbox/include/asm/sdl.h | 19 +++-- arch/sandbox/include/asm/sound.h | 13 --- arch/sandbox/include/asm/test.h | 40 +++++++++ cmd/sound.c | 15 +++- configs/peach-pi_defconfig | 3 +- configs/peach-pit_defconfig | 3 +- configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - configs/smdk5250_defconfig | 1 - configs/smdk5420_defconfig | 1 - configs/snow_defconfig | 1 - configs/spring_defconfig | 1 - drivers/core/read.c | 23 +++++ drivers/sound/Kconfig | 8 ++ drivers/sound/Makefile | 8 +- drivers/sound/codec-uclass.c | 26 ++++++ drivers/sound/i2s-uclass.c | 25 ++++++ drivers/sound/max98090.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/sound/max98090.h | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/sound/max98095.c | 411 ++++++++++++++++++++++++++++++++--------------------------------------------------------- drivers/sound/max98095.h | 9 +- drivers/sound/maxim_codec.c | 87 +++++++++++++++++++ drivers/sound/maxim_codec.h | 67 +++++++++++++++ drivers/sound/samsung-i2s.c | 157 ++++++++++++++++++++++++++-------- drivers/sound/samsung_sound.c | 104 +++++++++++++++++++++++ drivers/sound/sandbox.c | 180 +++++++++++++++++++++++++++++++++++++-- drivers/sound/sound-i2s.c | 208 --------------------------------------------- drivers/sound/sound-uclass.c | 127 ++++++++++++++++++++++++++++ drivers/sound/sound.c | 11 ++- drivers/sound/wm8994.c | 470 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------ drivers/sound/wm8994.h | 2 +- include/audio_codec.h | 48 +++++++++++ include/dm/read.h | 58 +++++++++++++ include/dm/uclass-id.h | 3 + include/i2s.h | 36 ++++++-- include/sound.h | 88 +++++++++++++------ test/dm/Makefile | 3 + test/dm/audio.c | 34 ++++++++ test/dm/i2s.c | 32 +++++++ test/dm/sound.c | 34 ++++++++ test/dm/test-fdt.c | 35 ++++++++ 65 files changed, 2916 insertions(+), 928 deletions(-) delete mode 100644 arch/sandbox/include/asm/sound.h create mode 100644 drivers/sound/codec-uclass.c create mode 100644 drivers/sound/i2s-uclass.c create mode 100644 drivers/sound/max98090.c create mode 100644 drivers/sound/max98090.h create mode 100644 drivers/sound/maxim_codec.c create mode 100644 drivers/sound/maxim_codec.h create mode 100644 drivers/sound/samsung_sound.c delete mode 100644 drivers/sound/sound-i2s.c create mode 100644 drivers/sound/sound-uclass.c create mode 100644 include/audio_codec.h create mode 100644 test/dm/audio.c create mode 100644 test/dm/i2s.c create mode 100644 test/dm/sound.c Regards, Simon

2 1