August 2016 - U-Boot

[U-Boot] [PATCH v1 0/2] clk: at91: Fix the wrong used class ID
by Wenyou Yang 06 Sep '16

06 Sep '16

This patch set is to fix the wrong used class ID. The class ID of the at91-pmc and at91-sckc driver should be UCLASS_SIMPLE_BUS, instead of UCLASS_CLK. And add an empty .ops callback for the clk_generic driver to avoid a wild pointer. Wenyou Yang (2): clk: at91: Fix at91-pmc and at91-sckc's class ID clk: at91: Add .ops callback for clk_generic drivers/clk/at91/pmc.c | 13 +++++-------- drivers/clk/at91/sckc.c | 17 +++++------------ 2 files changed, 10 insertions(+), 20 deletions(-) -- 2.7.4

3 5

[U-Boot] [PATCH v1 0/4] board: sama5d2_xplained: Convert to use device tree and drivers with DM
by Wenyou Yang 06 Sep '16

06 Sep '16

Convert to use the drivers which support the driver model and use the device tree. And add the support to enable an early debug UART for debugging. It is based on the following patches: - [PATCH v1] i2c: at91_i2c: Fix the wrong include file http://lists.denx.de/pipermail/u-boot/2016-August/265265.html - [PATCH v1 0/2] clk: at91: Fix the wrong used class ID http://lists.denx.de/pipermail/u-boot/2016-August/265266.html - [PATCH v1] mmc: mmc-uclass: Add mmc_init() in mmc preinit phrase http://lists.denx.de/pipermail/u-boot/2016-August/265269.html - [PATCH v1 0/2] serial: atmel_usart: Support to enable an early debug UART http://lists.denx.de/pipermail/u-boot/2016-August/265270.html - [PATCH v8] dm: at91: Add driver model support for the spi driver http://lists.denx.de/pipermail/u-boot/2016-August/264484.html - [PATCH] sf: fix sf probe http://lists.denx.de/pipermail/u-boot/2016-August/264104.html Wenyou Yang (4): board: sama5d2_xplained: Move config options to defconfigs board: sama5d2_xplained: Clean up code board: sama5d2_xplained: Set 'ethaddr' got from AT24MAC board: sama5d2_xplained: Enable an early debug UART board/atmel/sama5d2_xplained/sama5d2_xplained.c | 167 +++++++++--------------- configs/sama5d2_xplained_mmc_defconfig | 37 +++++- configs/sama5d2_xplained_spiflash_defconfig | 38 +++++- include/configs/sama5d2_xplained.h | 32 +---- 4 files changed, 145 insertions(+), 129 deletions(-) -- 2.7.4

2 6

[U-Boot] [PATCH v1 0/2] serial: atmel_usart: Support to enable an early debug UART
by Wenyou Yang 06 Sep '16

06 Sep '16

The patch set is to add support to enable an early debug UART for debugging. And add ATMEL_USART option to enable the Atmel usartdriver from Kconfig. Wenyou Yang (2): serial: Kconfig: Add ATMEL_USART option serial: atmel_usart: Support enable an early debug UART drivers/serial/Kconfig | 14 ++++++++++++++ drivers/serial/atmel_usart.c | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) -- 2.7.4

2 3

[U-Boot] [PATCH] rockchip: rk3288-firefly: enable boot from eMMC
by Jacob Chen 06 Sep '16

06 Sep '16

Add eMMC dt node and define fallback boot devices. Signed-off-by: Jacob Chen <jacob2.chen(a)rock-chips.com> --- arch/arm/dts/rk3288-firefly.dts | 5 +++++ board/firefly/firefly-rk3288/firefly-rk3288.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts index 3176d50..27f348e 100644 --- a/arch/arm/dts/rk3288-firefly.dts +++ b/arch/arm/dts/rk3288-firefly.dts @@ -67,6 +67,11 @@ u-boot,dm-pre-reloc; }; +&emmc { + u-boot,dm-pre-reloc; +}; + + &gpio3 { u-boot,dm-pre-reloc; }; diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c index 5119e95..3e89389 100644 --- a/board/firefly/firefly-rk3288/firefly-rk3288.c +++ b/board/firefly/firefly-rk3288/firefly-rk3288.c @@ -5,3 +5,11 @@ */ #include <common.h> +#include <spl.h> + +void board_boot_order(u32 *spl_boot_list) +{ + /* eMMC prior to sdcard. */ + spl_boot_list[0] = BOOT_DEVICE_MMC2; + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} -- 1.9.1

3 5

[U-Boot] [PATCH 0/5] mmc: uniphier: migrate to CONFIG_DM_MMC_OPS and CONFIG_BLK
by Masahiro Yamada 06 Sep '16

06 Sep '16

Masahiro Yamada (5): mmc: uniphier-sd: migrate to CONFIG_DM_MMC_OPS mmc: uniphier-sd: move uniphier_sd_init() below mmc: uniphier-sd: return error code if unsupported width is given mmc: uniphier-sd: just return if already set to desired clock rate mmc: uniphier-sd: migrate to CONFIG_BLK arch/arm/Kconfig | 1 + drivers/mmc/Kconfig | 2 + drivers/mmc/uniphier-sd.c | 186 ++++++++++++++++++++++++---------------------- 3 files changed, 99 insertions(+), 90 deletions(-) -- 1.9.1

2 8

[U-Boot] [PATCH 0/3] rockchip: i2c: fix >32 byte writes
by John Keeping 06 Sep '16

06 Sep '16

The first two patches are just cleanup that I noticed while in the area, the point of the series is the final patch which fixes an error when trying to write more than 32 bytes via the Rockchip I2C driver. John Keeping (3): rockchip: i2c: use named constant when appropriate rockchip: i2c: move register write out of inner loop rockchip: i2c: fix >32 byte writes drivers/i2c/rk_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.9.3.728.g30b24b4.dirty

2 6

[U-Boot] [RFC PATCH] rockchip: rk3288: skip lowlevel_init process
by Ziyuan Xu 06 Sep '16

06 Sep '16

lowlevel_init() is never needed for rk3288, so drop it. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> --- arch/arm/mach-rockchip/board.c | 4 ---- arch/arm/mach-rockchip/rk3288-board-spl.c | 4 ---- include/configs/rk3288_common.h | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index bec756d..6c36bf9 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -81,10 +81,6 @@ void enable_caches(void) } #endif -void lowlevel_init(void) -{ -} - #if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) #include <usb.h> #include <usb/dwc2_udc.h> diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index e0d92a6..ae509ff 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -280,7 +280,3 @@ err: /* No way to report error here */ hang(); } - -void lowlevel_init(void) -{ -} diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index d3d4c68..e909ef9 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> +#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 -- 2.9.2

2 2

[U-Boot] [PATCH v3 0/7] rk3399: enable host controllers
by Kever Yang 06 Sep '16

06 Sep '16

rk3399 evb has two typec port(dwc3 controller) which support dual role device with separate GPIO for vbus control and two USB 2.0 host port (generic EHCI controller) with one GPIO for vbus control. This patch set enable all these host controllers and have test with usb disk and usb ethernet devices on rk3399 evb. Note: type-C port only support usb 2.0 currently because the PD driver and USB 3.0 phy driver not enabled. Changes in v3: - using fdtdec_get_bool and fdtdec_get_int instead of fdt_get_property - other update by follow comments from Marek and Simon - add Acked-by tag from Simon Changes in v2: - update for comments from Marek - use regulator_get_by_platname instead of uclass_get_device_by_name - add Acked-by Tag from Simon Kever Yang (3): dts: rk3399-evb: add regulator-fixed for usb host vbus board: evb-rk3399: enable usb 2.0 host vbus power on board_init config: evb-rk3399: enable fixed regulator MengDongyang (4): usb: xhci-rockchip: add rockchip dwc3 controller driver rockchip: select DM_USB for rockchip SoC config: rk3399: add usb related configs dts: rk3399: add dwc3_typec node for rk3399 arch/arm/Kconfig | 1 + arch/arm/dts/rk3399-evb.dts | 14 +++ arch/arm/dts/rk3399.dtsi | 45 +++++++ board/rockchip/evb_rk3399/evb-rk3399.c | 15 ++- configs/evb-rk3399_defconfig | 9 ++ drivers/usb/host/Makefile | 1 + drivers/usb/host/xhci-rockchip.c | 211 +++++++++++++++++++++++++++++++++ include/configs/rk3399_common.h | 13 ++ include/linux/usb/dwc3.h | 14 +++ 9 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 drivers/usb/host/xhci-rockchip.c -- 1.9.1

3 17

[U-Boot] [PATCH] armv8: Remove the codes about switching to EL1 before jumping to kernel
by Alison Wang 05 Sep '16

05 Sep '16

As CONFIG_ARMV8_SWITCH_TO_EL1 is not used now, this patch is to remove CONFIG_ARMV8_SWITCH_TO_EL1 and the corresponding functions. Signed-off-by: Alison Wang <alison.wang(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 13 -------- arch/arm/cpu/armv8/start.S | 5 +-- arch/arm/cpu/armv8/transition.S | 6 ---- arch/arm/include/asm/macro.h | 47 ---------------------------- arch/arm/include/asm/system.h | 1 - arch/arm/lib/bootm.c | 3 -- arch/arm/mach-exynos/soc.c | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/xilinx_zynqmp.h | 2 -- 9 files changed, 1 insertion(+), 78 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index 5af6b73..d3a0117 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -325,19 +325,12 @@ ENTRY(secondary_boot_func) #endif bl secondary_switch_to_el2 -#ifdef CONFIG_ARMV8_SWITCH_TO_EL1 - bl secondary_switch_to_el1 -#endif slave_cpu: wfe ldr x0, [x11] cbz x0, slave_cpu -#ifndef CONFIG_ARMV8_SWITCH_TO_EL1 mrs x1, sctlr_el2 -#else - mrs x1, sctlr_el1 -#endif tbz x1, #25, cpu_is_le rev x0, x0 /* BE to LE conversion */ cpu_is_le: @@ -350,12 +343,6 @@ ENTRY(secondary_switch_to_el2) 1: armv8_switch_to_el2_m x0 ENDPROC(secondary_switch_to_el2) -ENTRY(secondary_switch_to_el1) - switch_el x0, 0f, 1f, 0f -0: ret -1: armv8_switch_to_el1_m x0, x1 -ENDPROC(secondary_switch_to_el1) - /* Ensure that the literals used by the secondary boot code are * assembled within it (this is required so that we can protect * this area with a single memreserve region diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 670e323..ab434a6 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -242,12 +242,9 @@ WEAK(lowlevel_init) #endif /* - * All slaves will enter EL2 and optionally EL1. + * All slaves will enter EL2. */ bl armv8_switch_to_el2 -#ifdef CONFIG_ARMV8_SWITCH_TO_EL1 - bl armv8_switch_to_el1 -#endif #endif /* CONFIG_ARMV8_MULTIENTRY */ diff --git a/arch/arm/cpu/armv8/transition.S b/arch/arm/cpu/armv8/transition.S index 253a39b..209d5c8 100644 --- a/arch/arm/cpu/armv8/transition.S +++ b/arch/arm/cpu/armv8/transition.S @@ -15,9 +15,3 @@ ENTRY(armv8_switch_to_el2) 0: ret 1: armv8_switch_to_el2_m x0 ENDPROC(armv8_switch_to_el2) - -ENTRY(armv8_switch_to_el1) - switch_el x0, 0f, 1f, 0f -0: ret -1: armv8_switch_to_el1_m x0, x1 -ENDPROC(armv8_switch_to_el1) diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 9bb0efa..c1b3452 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -167,53 +167,6 @@ lr .req x30 eret .endm -.macro armv8_switch_to_el1_m, xreg1, xreg2 - /* Initialize Generic Timers */ - mrs \xreg1, cnthctl_el2 - orr \xreg1, \xreg1, #0x3 /* Enable EL1 access to timers */ - msr cnthctl_el2, \xreg1 - msr cntvoff_el2, xzr - - /* Initilize MPID/MPIDR registers */ - mrs \xreg1, midr_el1 - mrs \xreg2, mpidr_el1 - msr vpidr_el2, \xreg1 - msr vmpidr_el2, \xreg2 - - /* Disable coprocessor traps */ - mov \xreg1, #0x33ff - msr cptr_el2, \xreg1 /* Disable coprocessor traps to EL2 */ - msr hstr_el2, xzr /* Disable coprocessor traps to EL2 */ - mov \xreg1, #3 << 20 - msr cpacr_el1, \xreg1 /* Enable FP/SIMD at EL1 */ - - /* Initialize HCR_EL2 */ - mov \xreg1, #(1 << 31) /* 64bit EL1 */ - orr \xreg1, \xreg1, #(1 << 29) /* Disable HVC */ - msr hcr_el2, \xreg1 - - /* SCTLR_EL1 initialization - * - * setting RES1 bits (29,28,23,22,20,11) to 1 - * and RES0 bits (31,30,27,21,17,13,10,6) + - * UCI,EE,EOE,WXN,nTWE,nTWI,UCT,DZE,I,UMA,SED,ITD, - * CP15BEN,SA0,SA,C,A,M to 0 - */ - mov \xreg1, #0x0800 - movk \xreg1, #0x30d0, lsl #16 - msr sctlr_el1, \xreg1 - - /* Return to the EL1_SP1 mode from EL2 */ - mov \xreg1, sp - msr sp_el1, \xreg1 /* Migrate SP */ - mrs \xreg1, vbar_el2 - msr vbar_el1, \xreg1 /* Migrate VBAR */ - mov \xreg1, #0x3c5 - msr spsr_el2, \xreg1 /* EL1_SP1 | D | A | I | F */ - msr elr_el2, lr - eret -.endm - #if defined(CONFIG_GICV3) .macro gic_wait_for_interrupt_m xreg1 0 : wfi diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 2bdc0be..3a22661 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -101,7 +101,6 @@ int __asm_flush_l3_cache(void); void __asm_switch_ttbr(u64 new_ttbr); void armv8_switch_to_el2(void); -void armv8_switch_to_el1(void); void gic_init(void); void gic_send_sgi(unsigned long sgino); void wait_for_wakeup(void); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 0838d89..e3c9832 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -194,9 +194,6 @@ static void do_nonsec_virt_switch(void) smp_kick_all_cpus(); dcache_disable(); /* flush cache before swtiching to EL2 */ armv8_switch_to_el2(); -#ifdef CONFIG_ARMV8_SWITCH_TO_EL1 - armv8_switch_to_el1(); -#endif } #endif diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index f9c7468..c27a389 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -28,6 +28,5 @@ void enable_caches(void) void lowlevel_init(void) { armv8_switch_to_el2(); - armv8_switch_to_el1(); } #endif diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 46cf83b..05bae44 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -12,7 +12,6 @@ #ifndef CONFIG_SEMIHOSTING #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING #endif -#define CONFIG_ARMV8_SWITCH_TO_EL1 #endif #define CONFIG_REMAKE_ELF diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e776e32..c858491 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -13,8 +13,6 @@ #define CONFIG_REMAKE_ELF -/* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ - #define CONFIG_SYS_NO_FLASH /* Generic Interrupt Controller Definitions */ -- 2.1.0.27.g96db324

5 10

[U-Boot] [PATCH v2 0/4] Migrate Vybrid USB driver to driver model
by Sanchayan Maity 04 Sep '16

04 Sep '16

Hello, This is the second version of the patchset for migrating Vybrid USB driver to driver model. Compare to the first version, this version takes care of dr_mode property and correctly handles OTG as well when gpio is specified for use as ID detection pin. This is an essential requirement for OTG as Vybrid USB controller is not a true OTG though it can be configured as either host or device. The ID pin which is unique for OTG operation is not present on Vybrid. The problem with client that I was observing was related to sequence numbers. While trying to implement the OTG functionality I observed that if during probe of USB0 if it returns ENODEV, the probe of USB1 provides a sequence number of 0 while we expect 1. The code relies on sequence numbers for initialising the appropriate peripherals. I use the bind operation to force a sequence number. This also seems to solve the problems I was having with USB client and mentioned in the previous version of the patchset. Host and client functionality are both functional with this patch. Patch series is based on top of latest u-boot master at the moment of this writing. Tested on Toradex Colibri Vybrid VF61 module. Thanks to Lukasz and Stefan for their comments. V1 Patches: [1]. https://patchwork.ozlabs.org/patch/655370/ [2]. https://patchwork.ozlabs.org/patch/655371/ [3]. https://patchwork.ozlabs.org/patch/655372/ [4]. https://patchwork.ozlabs.org/patch/655373/ Sanchayan Maity (4): usb: host: ehci-vf: Migrate Vybrid USB to driver model ARM: dts: vf: Add device tree node for USB on Vybrid ARM: dts: vf-colibri: Enable USB device tree node for Colibri Vybrid configs: colibri_vf_defconfig: Enable USB driver model for Colibri Vybrid arch/arm/dts/vf-colibri.dtsi | 11 +++ arch/arm/dts/vf.dtsi | 14 +++ configs/colibri_vf_defconfig | 1 + drivers/usb/host/ehci-vf.c | 208 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 227 insertions(+), 7 deletions(-) -- 2.9.2

4 13