June 2017 - U-Boot

[U-Boot] [PATCH] rockchip: clk: rk3036: correct setting for pll integer mode
by Kever Yang 21 Jun '17

21 Jun '17

According to rk3036 TRM, pll_con1[12] should be set to '1' for the pll interger mode, while the '0' means the frac mode. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- drivers/clk/rockchip/clk_rk3036.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index d866d0b..8fefa19 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -62,7 +62,7 @@ static int rkclk_set_pll(struct rk3036_cru *cru, enum rk_clk_id clk_id, output_hz >= OUTPUT_MIN_HZ && output_hz <= OUTPUT_MAX_HZ); /* use interger mode */ - rk_clrreg(&pll->con1, 1 << PLL_DSMPD_SHIFT); + rk_setreg(&pll->con1, 1 << PLL_DSMPD_SHIFT); rk_clrsetreg(&pll->con0, PLL_POSTDIV1_MASK << PLL_POSTDIV1_SHIFT | PLL_FBDIV_MASK, -- 1.9.1

3 3

[U-Boot] [PATCH 1/3] bootstage: Dont print reset entry separately
by Michal Simek 21 Jun '17

21 Jun '17

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Printing the first entry reset separately is no longer needed as it now prints the entries with valid name and timestamp zero. This removes duplicate printing of the reset record. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- common/bootstage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/bootstage.c b/common/bootstage.c index 35bce3d881a5..c8080dcab5d7 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -271,7 +271,7 @@ void bootstage_report(void) /* Fake the first record - we could get it from early boot */ rec->name = "reset"; rec->time_us = 0; - prev = print_time_record(BOOTSTAGE_ID_AWAKE, rec, 0); + prev = 0; /* Sort records by increasing time */ qsort(record, ARRAY_SIZE(record), sizeof(*rec), h_compare_record); -- 1.9.1

2 4

[U-Boot] [PATCH v7 00/10] usb: Extend ehci and ohci generic drivers
by patrice.chotard＠st.com 21 Jun '17

21 Jun '17

From: Patrice Chotard <patrice.chotard(a)st.com> This series improves generic ehci and ohci drivers by addition of : _ error path during probe (clocks, resets and phy release) _ .remove callback _ add generic PHY framework for both generic ehci and ohci drivers _ add RESET and CLOCK framework for generic ohci driver To implement these features, some new methods are needed in reset, clock and in dm/core framework: _ add reset_request() and reset_assert_all() methods in RESET framework _ add clk_count() and clk_disable_all() methods in CLOCK framework _ add ofnode_count_phandle_with_args() in dm/core v7: _ replace clk_count() and reset_count() methods by ofnode_count_phandle_with_args() in patches 3, 4 and 5 v6: _ replace clk_get_by_index() by dev_read_phandle_with_args() in clk_count() in patch 4 _ add Reviewed-by Simon Glass for patch 2 and 5 v5: _ rebase on top of dm/master requested by Simon Glass in order to use livetree update _ replace fdtdec_parse_phandle_with_args() by dev_read_phandle_with_args() in patch 2 v4: _ add clk_disable_all() and reset_assert_all() methods into CLOCK and RESET framework as suggested by Simon Glass and Marek Vasut _ add reset_count() and clk_count() methods which returns respectively the number of resets and clocks declared into "resets" and "clocks" DT properties. This allows to allocate the right amount of memory to keep resets and clocks reference _ update the memory allocation for deasserted resets and enabled clocks reference list. Replace lists by arrays. v3: _ keep enabled clocks and deasserted resets reference in list in order to disable clock or assert resets in error path or in .remove callback _ add missing commit message _ use struct generic_ehci * instead of struct udevice * as parameter for ehci_release_resets() and ehci_release_clocks() _ test return value on generic_phy_get_by_index() and generic_phy_init() _ split previous patch 5 in 3 independant patch for CLOCK, RESET and PHY support v2: _ add needed reset_request() in RESET framework _ add error path in ehci/ohci-generic to disable clocks and to assert resets _ add .remove callback with clocks, resets and phy release _ split the replacement of printf() by error() in an independant patch Patrice Chotard (10): reset: add reset_request() reset: add reset_assert_all() clk: add clk_disable_all() dm: core: add ofnode_count_phandle_with_args() usb: host: ehci-generic: replace printf() by error() usb: host: ehci-generic: add error path and .remove callback usb: host: ehci-generic: add generic PHY support usb: host: ohci-generic: add CLOCK support usb: host: ohci-generic: add RESET support usb: host: ohci-generic: add generic PHY support drivers/clk/clk-uclass.c | 22 ++++++ drivers/core/of_access.c | 7 ++ drivers/core/ofnode.c | 12 ++++ drivers/reset/reset-uclass.c | 31 ++++++++ drivers/usb/host/ehci-generic.c | 153 ++++++++++++++++++++++++++++++++++------ drivers/usb/host/ohci-generic.c | 132 +++++++++++++++++++++++++++++++++- include/clk.h | 10 +++ include/dm/of_access.h | 18 +++++ include/dm/ofnode.h | 17 +++++ include/reset.h | 26 +++++++ 10 files changed, 403 insertions(+), 25 deletions(-) -- 1.9.1

5 23

[U-Boot] OF_PLATDATA questions on rk3399 platfrom
by Ziyuan 21 Jun '17

21 Jun '17

hi simon, I need to achieve emmc_phy physical address in driver, so that I can configure phy in different scenarios (phy register address should be 0xff77f780). see below: sdhci: sdhci@fe330000 { phys = <&emmc_phy>; phy-names = "phy_arasan"; }; grf: syscon@ff770000 { reg = <0x0 0xff770000 0x0 0x10000>; emmc_phy: phy@f780 { compatible = "rockchip,rk3399-emmc-phy"; reg = <0xf780 0x24>; #phy-cells = <0>; status = "disabled"; }; }; AKA, I can't use libfdt if OF_PLATDATA is enabled, so how to get it?

3 3

[U-Boot] binman: 'module' object has no attribute 'FinaliseOutputDir'
by Kevin Hilman 21 Jun '17

21 Jun '17

While trying to build v2017.05 for sun5i-r8-chip (CHIP_defconfig), I get the following build error. I'm not familiar with binman, so not sure what I should be looking for. $ CROSS_COMPILE=arm-linux-gnueabihf- make [...] LD spl/drivers/serial/built-in.o LD spl/drivers/built-in.o LD spl/common/built-in.o LD spl/lib/built-in.o LD spl/u-boot-spl OBJCOPY spl/u-boot-spl-nodtb.bin COPY spl/u-boot-spl.bin MKSUNXI spl/sunxi-spl.bin BINMAN u-boot-sunxi-with-spl.bin binman: 'module' object has no attribute 'FinaliseOutputDir' Makefile:1107: recipe for target 'u-boot-sunxi-with-spl.bin' failed make: *** [u-boot-sunxi-with-spl.bin] Error 1 If it matters, compiler is: gcc version 5.3.1 20160412 (Linaro GCC 5.3-2016.05) Kevin

2 7

[U-Boot] [PATCH 0/3] dm: mmc: Tidy up use of block devices
by Simon Glass 21 Jun '17

21 Jun '17

A recent series added a patch to avoid probing block devices in find_mmc_device(). This is because callers should obtain the block device itself, not the MMC device. But for now the environment code has not been converted. The patch caused problems on some boards so was dropped. This series reinstates that patch, but ensures that the block device is probed first. Simon Glass (3): dm: blk: Add a way to obtain a block device from its parent dm: mmc: Ensure that block device is probed dm: mmc: Avoid probing block devices in find_mmc_device() common/env_mmc.c | 7 ++++++- drivers/block/blk-uclass.c | 26 ++++++++++++++++++++++++++ drivers/mmc/mmc-uclass.c | 6 ++++-- include/blk.h | 7 +++++++ test/dm/blk.c | 18 ++++++++++++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) -- 2.13.0.219.gdb65acc882-goog

3 12

[U-Boot] x86 build is broken with GCC 7
by Otavio Salvador 20 Jun '17

20 Jun '17

Hello folks, Testing with current compiler exposed an error: arch/x86/lib/built-in.o: In function `__wrap___udivdi3': /home/otavio/src/u-boot/arch/x86/lib/gcc.c:25: undefined reference to `__normal___udivdi3' Is it a known issue? -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

5 6

[U-Boot] http://git.denx.de/u-boot-dm.git cannot be cloned
by Heinrich Schuchardt 20 Jun '17

20 Jun '17

Dear custodians, http://git.denx.de/?p=u-boot-dm.git;a=summary declares that http://git.denx.de/u-boot-dm.git is a valid URL to clone the repository. $ git clone http://git.denx.de/u-boot-dm.git Cloning into 'u-boot-dm'... error: Unable to find 69f5087646c69f7d35cf24a777f7469a95ff55f8 under http://git.denx.de/u-boot-dm.git Cannot obtain needed tree 69f5087646c69f7d35cf24a777f7469a95ff55f8 while processing commit b43001176753a29457fba30fcb20946679ceb1bc. error: fetch failed. Please, correct the server configuration. Best regards Heinrich Schuchardt

1 0

[U-Boot] [PATCH] ARM: rmobile: Add missing config bits after resync
by Marek Vasut 20 Jun '17

20 Jun '17

The commit "fb82fe385173 configs: Resync defconfigs" broke all Gen3 boards by removing config options from the config which are needed for correct build. Reinstate those. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- configs/r8a7795_salvator-x_defconfig | 2 ++ configs/r8a7796_salvator-x_defconfig | 1 + 2 files changed, 3 insertions(+) diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index e4f80c427d..0cab920d96 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_RCAR_GEN3=y +CONFIG_R8A7795=y CONFIG_TARGET_SALVATOR_X=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index e859311030..dfd91d2755 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y -- 2.11.0

2 6

[U-Boot] [PATCH v3] regmap: add support for address cell 2
by Kever Yang 20 Jun '17

20 Jun '17

ARM64 is using 64bit address which address cell is 2 instead of 1, update to support it when of-platdata enabled. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v3: - move of_plat_get_number() into lib/of_plat.c Changes in v2: - rename the fdtdec_get_number() to of_plat_get_number() drivers/core/regmap.c | 9 +++++++++ include/of_plat.h | 22 ++++++++++++++++++++++ lib/Makefile | 3 +++ lib/of_plat.c | 17 +++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 include/of_plat.h create mode 100644 lib/of_plat.c diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index 3bec3df..c03279e 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -12,6 +12,7 @@ #include <malloc.h> #include <mapmem.h> #include <regmap.h> +#include <of_plat.h> #include <asm/io.h> @@ -49,11 +50,19 @@ int regmap_init_mem_platdata(struct udevice *dev, u32 *reg, int count, if (!map) return -ENOMEM; +#ifdef CONFIG_PHYS_64BIT + map->base = of_plat_get_number(reg, 2); + for (range = map->range; count > 0; reg += 4, range++, count--) { + range->start = of_plat_get_number(reg, 2); + range->size = of_plat_get_number(reg + 2, 2); + } +#else map->base = *reg; for (range = map->range; count > 0; reg += 2, range++, count--) { range->start = *reg; range->size = reg[1]; } +#endif *mapp = map; diff --git a/include/of_plat.h b/include/of_plat.h new file mode 100644 index 0000000..0badabb --- /dev/null +++ b/include/of_plat.h @@ -0,0 +1,22 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __of_plat_h +#define __of_plat_h + +#include "libfdt_env.h" +/** + * Get a variable-sized number from a property + * + * This reads a number from one or more cells. + * + * @param ptr Pointer to property + * @param cells Number of cells containing the number + * @return the value in the cells + */ +u64 of_plat_get_number(const fdt32_t *ptr, unsigned int cells); + +#endif diff --git a/lib/Makefile b/lib/Makefile index 23e9f1e..a988965 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -55,6 +55,9 @@ obj-$(CONFIG_$(SPL_)OF_CONTROL) += fdtdec_common.o obj-$(CONFIG_$(SPL_)OF_CONTROL) += fdtdec.o endif +ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_SPL_OF_PLATDATA),yy) +obj-$(CONFIG_$(SPL_)OF_CONTROL) += of_plat.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o obj-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o diff --git a/lib/of_plat.c b/lib/of_plat.c new file mode 100644 index 0000000..cf1cd1e --- /dev/null +++ b/lib/of_plat.c @@ -0,0 +1,17 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "of_plat.h" + +u64 of_plat_get_number(const u32 *ptr, unsigned int cells) +{ + u64 number = 0; + + while (cells--) + number = (number << 32) | (*ptr++); + + return number; +} -- 1.9.1

3 4