May 2014 - U-Boot

[U-Boot] [PATCH 0/4] ventana: Add LTC3676 PMIC support
by Tim Harvey 09 May '14

09 May '14

The Gateworks Ventana boards share much in common, but there are two differing PMIC's used on them. This patch series adds a new PMIC driver for the LTC3676 and supports them both within the common board support file. Signed-off-By: Tim Harvey <tharvey(a)gateworks.com> Tim Harvey (4): power: make pfuze100 be able to coexist with other pmics ventana: use non-generic pfuze100 init power: Add support for LTC3676 PMIC ventana: Add support for the LTC3676 PMIC board/gateworks/gw_ventana/gw_ventana.c | 78 ++++++++++++++++++++++++--------- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_ltc3676.c | 32 ++++++++++++++ drivers/power/pmic/pmic_pfuze100.c | 2 +- include/configs/gw_ventana.h | 2 + include/power/ltc3676_pmic.h | 51 +++++++++++++++++++++ include/power/pfuze100_pmic.h | 1 + 7 files changed, 145 insertions(+), 22 deletions(-) create mode 100644 drivers/power/pmic/pmic_ltc3676.c create mode 100644 include/power/ltc3676_pmic.h -- 1.8.3.2

2 14

[U-Boot] Booting using intiramfs isnetad of uramdisk (Zynq)
by Heshsham Abdul Basit 09 May '14

09 May '14

Hi, I have taken boot.bin and u-boot.img from teh TOPDIR after compiling teh u-boot source code from master-next branch. I have my own uImage that expect a initramfs. When I am trying to boot, I observed that u-boot is expecting ramdsik and not initramfs. In the same SD card I have a uramdisk.image.gz, and so you boot loads it. then the kernel starts , and hangs later on. I suspect this is because kernel is expecting initramfs which is not loaded by u-boot.img How do I make u-boot.img load initramfs instead of uramdisk.image.gz.? Thanks and regards, Heshsham

1 0

[U-Boot] [PATCH] powerpc/t2080qds: add fdt_fixup_dma3
by Shengzhou Liu 09 May '14

09 May '14

On T2080 the 3rd DMA is not functional if SRIO2 is chosen in SerDes2. we add fdt_fixup_dma3() to disable the 3rd DMA if SRIO2 is chosen. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- board/freescale/t208xqds/t208xqds.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index 9cfc0bd..548d46a 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -433,6 +433,32 @@ int misc_init_r(void) return 0; } +void fdt_fixup_dma3(void *blob) +{ + /* the 3rd DMA is not functional if SRIO2 is chosen in SerDes2 */ + int nodeoff; + ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + u32 srds_prtcl_s2 = in_be32(&gur->rcwsr[4]) & + FSL_CORENET2_RCWSR4_SRDS2_PRTCL; + srds_prtcl_s2 >>= FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT; +#define CONFIG_SYS_ELO3_DMA2 (0xffe000000 + 0x102300) + + switch (srds_prtcl_s2) { + case 0x29: + case 0x2d: + case 0x2e: + nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,elo3-dma", + CONFIG_SYS_ELO3_DMA2); + if (nodeoff > 0) + fdt_status_disabled(blob, nodeoff); + else + printf("\nWARNING unable to set status for dma3\n"); + break; + default: + return; + } +} + void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; @@ -456,4 +482,5 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_fixup_fman_ethernet(blob); fdt_fixup_board_enet(blob); #endif + fdt_fixup_dma3(blob); } -- 1.8.0

1 0

[U-Boot] Pull request for u-boot-arm -> u-boot?
by Stephen Warren 09 May '14

09 May '14

Albert, I was wondering when the next pull request for u-boot-arm/master -> u-boot/master was likely to be? I asked because some changes to the Tegra USB driver went through the u-boot-tegra/master and hence are now in u-boot-arm/master, but not in u-boot-usb/master. I have some more USB driver changes which rely on the earlier USB patches, and these should really go through u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, u-boot-usb/master needs to contain the patches currently in u-boot-arm/master, and the best way for that to happen is for those patches to get into u-boot/master so that u-boot-usb/master can merge them. Or, should Marek just merge u-boot-arm/master into his tree directly? Thanks.

6 11

[U-Boot] [PATCH 1/3] mx28evk: Remove extra CONFIG_ENV_SIZE
by Fabio Estevam 09 May '14

09 May '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> When building a target with CONFIG_ENV_IS_IN_SPI_FLASH the following build warning is seen: include/configs/mx28evk.h:73:0: warning: "CONFIG_ENV_SIZE" redefined [enabled by default] Each target has its own CONFIG_ENV_SIZE definition, so remove the one that does not belong to any target. While at it, fix a typo. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx28evk.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 9b9124a..e5370f3 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ @@ -67,7 +66,7 @@ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #endif -/* Environemnt is in SPI flash */ +/* Environment is in SPI flash */ #if defined(CONFIG_CMD_SF) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SIZE 0x1000 /* 4KB */ -- 1.8.3.2

1 2

[U-Boot] [PATCH] usb: ci_udc: parse QTD before over-writing it
by Stephen Warren 09 May '14

09 May '14

From: Stephen Warren <swarren(a)nvidia.com> ci_udc only allocates a single QTD structure per EP. All data needs to be extracted from the DTD prior to calling handle_ep_complete(), since that fills the QTD with next transaction's parameters. Fix handle_ep_complete() to extract the transaction (remaining) length before kicking off the next transaction. In practice, this only causes writes to UMS devices to fail for me. I may have tested the final versions of my previous ci_udc patch only with reads. More recently, I had patches applied locally that allocated a QTD per USB request rather than per USB EP, although since that doesn't give any performance benefit, I'm dropping those. Fixes: 2813006fecda ("usb: ci_udc: allow multiple buffer allocs per ep") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/usb/gadget/ci_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 290863d61fc9..9cd003636a44 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -424,6 +424,7 @@ static void handle_ep_complete(struct ci_ep *ep) item = ci_get_qtd(num, in); ci_invalidate_qtd(num); + len = (item->info >> 16) & 0x7fff; if (item->info & 0xff) printf("EP%d/%s FAIL info=%x pg0=%x\n", num, in ? "in" : "out", item->info, item->page0); @@ -435,7 +436,6 @@ static void handle_ep_complete(struct ci_ep *ep) if (!list_empty(&ep->queue)) ci_ep_submit_next_request(ep); - len = (item->info >> 16) & 0x7fff; ci_req->req.actual = ci_req->req.length - len; ci_debounce(ci_req, in); -- 1.8.1.5

1 1

[U-Boot] [PATCH V2] ARM: tegra: use a CPU freq that all SKUs can support
by Stephen Warren 08 May '14

08 May '14

From: Stephen Warren <swarren(a)nvidia.com> U-Boot on Tegra30 currently selects a main CPU frequency that cannot be supported at all on some SKUs, and needs higher VDD_CPU/VDD_CORE values on some others. This can result in unreliable operation of the main CPUs. Resolve this by switching to a CPU frequency that can be supported by any SKU. According to the following link, the maximum supported CPU frequency of the slowest Tegra30 SKU is 600MHz: repo http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=summary branch l4t/l4t-r16-r2 path arch/arm/mach-tegra/tegra3_dvfs.c table cpu_dvfs_table[] According to that same table, the minimum VDD_CPU required to operate at that frequency across all SKUs is 1.007V. Given the adjustment resolution of the TPS65911 PMIC that's used on all Tegra30-based boards we support, we'll end up using 1.0125V instead. At that VDD_CPU, tegra3_get_core_floor_mv() in that same file dictates that VDD_CORE must be at least 1.2V on all SKUs. According to tegra_core_speedo_mv() (in tegra3_speedo.c in the same source tree), that voltage is safe for all SKUs. An alternative would be to port much of the code from tegra3_dvfs.c and tegra3_speedo.c in the kernel tree mentioned above. That's more work than I want to take on right now. While all the currently supported boards use the same regulator chip for VDD_CPU, different types of regulators are used for VDD_CORE. Hence, we add some small conditional code to select how VDD_CORE is programmed. If this becomes more complex in the future as new boards are added, or we end up adding code to detect the SoC SKU and dynamically determine the allowed frequency and required voltages, we should probably make this a runtime call into a function provided by the board file and/or relevant PMIC driver. Cc: Alban Bedel <alban.bedel(a)avionic-design.de> Cc: Marcel Ziswiler <marcel(a)ziswiler.com> Cc: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: * Fix 7-vs-8-bit I2C address and register value shifting confusion pointed out by Lucas Stach. Alban, I don't know which regulator is used for VDD_CORE on Tec-NG. If could you find this out, I can adjust tec-ng.h too. Thanks. --- arch/arm/cpu/arm720t/tegra-common/cpu.c | 10 +++++----- arch/arm/cpu/arm720t/tegra30/cpu.c | 23 +++++++++++++++++++++-- include/configs/beaver.h | 3 +++ include/configs/cardhu.h | 3 +++ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/arm720t/tegra-common/cpu.c b/arch/arm/cpu/arm720t/tegra-common/cpu.c index 168f525ec7c8..c6f3b029a16e 100644 --- a/arch/arm/cpu/arm720t/tegra-common/cpu.c +++ b/arch/arm/cpu/arm720t/tegra-common/cpu.c @@ -82,7 +82,7 @@ struct clk_pll_table tegra_pll_x_table[TEGRA_SOC_CNT][CLOCK_OSC_FREQ_COUNT] = { { .n = 600, .m = 13, .p = 0, .cpcon = 12 }, /* OSC: 26.0 MHz */ }, /* - * T30: 1.4 GHz + * T30: 600 MHz * * Register Field Bits Width * ------------------------------ @@ -92,10 +92,10 @@ struct clk_pll_table tegra_pll_x_table[TEGRA_SOC_CNT][CLOCK_OSC_FREQ_COUNT] = { * PLLX_MISC cpcon 11: 8 4 */ { - { .n = 862, .m = 8, .p = 0, .cpcon = 8 }, /* OSC: 13.0 MHz */ - { .n = 583, .m = 8, .p = 0, .cpcon = 4 }, /* OSC: 19.2 MHz */ - { .n = 700, .m = 6, .p = 0, .cpcon = 8 }, /* OSC: 12.0 MHz */ - { .n = 700, .m = 13, .p = 0, .cpcon = 8 }, /* OSC: 26.0 MHz */ + { .n = 600, .m = 13, .p = 0, .cpcon = 8 }, /* OSC: 13.0 MHz */ + { .n = 500, .m = 16, .p = 0, .cpcon = 8 }, /* OSC: 19.2 MHz */ + { .n = 600, .m = 12, .p = 0, .cpcon = 8 }, /* OSC: 12.0 MHz */ + { .n = 600, .m = 26, .p = 0, .cpcon = 8 }, /* OSC: 26.0 MHz */ }, /* * T114: 700 MHz diff --git a/arch/arm/cpu/arm720t/tegra30/cpu.c b/arch/arm/cpu/arm720t/tegra30/cpu.c index 85a945bc7918..9003902e3ff7 100644 --- a/arch/arm/cpu/arm720t/tegra30/cpu.c +++ b/arch/arm/cpu/arm720t/tegra30/cpu.c @@ -41,10 +41,18 @@ void tegra_i2c_ll_write_data(uint data, uint config) writel(config, &reg->cnfg); } +#define TPS62366A_I2C_ADDR 0xC0 +#define TPS62366A_SET1_REG 0x01 +#define TPS62366A_SET1_DATA (0x4600 | TPS62366A_SET1_REG) + +#define TPS62361B_I2C_ADDR 0xC0 +#define TPS62361B_SET3_REG 0x03 +#define TPS62361B_SET3_DATA (0x4600 | TPS62361B_SET3_REG) + #define TPS65911_I2C_ADDR 0x5A #define TPS65911_VDDCTRL_OP_REG 0x28 #define TPS65911_VDDCTRL_SR_REG 0x27 -#define TPS65911_VDDCTRL_OP_DATA (0x2300 | TPS65911_VDDCTRL_OP_REG) +#define TPS65911_VDDCTRL_OP_DATA (0x2400 | TPS65911_VDDCTRL_OP_REG) #define TPS65911_VDDCTRL_SR_DATA (0x0100 | TPS65911_VDDCTRL_SR_REG) #define I2C_SEND_2_BYTES 0x0A02 @@ -58,9 +66,20 @@ static void enable_cpu_power_rail(void) reg |= CPUPWRREQ_OE; writel(reg, &pmc->pmc_cntrl); + /* Set VDD_CORE to 1.200V. */ +#ifdef CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 + tegra_i2c_ll_write_addr(TPS62366A_I2C_ADDR, 2); + tegra_i2c_ll_write_data(TPS62366A_SET1_DATA, I2C_SEND_2_BYTES); +#endif +#ifdef CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 + tegra_i2c_ll_write_addr(TPS62361B_I2C_ADDR, 2); + tegra_i2c_ll_write_data(TPS62361B_SET3_DATA, I2C_SEND_2_BYTES); +#endif + udelay(1000); + /* * Bring up CPU VDD via the TPS65911x PMIC on the DVC I2C bus. - * First set VDD to 1.0V, then enable the VDD regulator. + * First set VDD to 1.0125V, then enable the VDD regulator. */ tegra_i2c_ll_write_addr(TPS65911_I2C_ADDR, 2); tegra_i2c_ll_write_data(TPS65911_VDDCTRL_OP_DATA, I2C_SEND_2_BYTES); diff --git a/include/configs/beaver.h b/include/configs/beaver.h index df9a98bca6e2..9ff089e67c36 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -21,6 +21,9 @@ #include "tegra30-common.h" +/* VDD core PMIC */ +#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 + /* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver #define CONFIG_OF_CONTROL diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index e15b52737b24..59f429cf5784 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -21,6 +21,9 @@ #include "tegra30-common.h" +/* VDD core PMIC */ +#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 + /* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu #define CONFIG_OF_CONTROL -- 1.8.1.5

1 0

[U-Boot] [PATCH] zynq: treat ps7_init.c/h as external files to ignore them
by Masahiro Yamada 08 May '14

08 May '14

ps7_init.c and ps7_init.h are supposed to be exported by hw project and copied to board/xilinx/zynq/ directory. We want them to be ignored by git. So what we should do is to always treat them as external files rather than replacing ps7_init.c This commit does: - Move a weak function ps7_init() to arch/arm/cpu/armv7/zynq/spl.c and delete board/xilinx/zynq/ps7_init.c - Compile board/xilinx/zynq/ps7_init.c only when it exists - Add .gitignore to ignore ps7_init.c/h Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/cpu/armv7/zynq/spl.c | 8 ++++++++ board/xilinx/zynq/.gitignore | 1 + board/xilinx/zynq/Makefile | 5 ++++- board/xilinx/zynq/ps7_init.c | 12 ------------ 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 board/xilinx/zynq/.gitignore delete mode 100644 board/xilinx/zynq/ps7_init.c diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index fcad762..e97695e 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -67,3 +67,11 @@ int spl_start_uboot(void) return 0; } #endif + +__weak void ps7_init(void) +{ + /* + * This function is replaced by the one in + * board/xilinx/zynq/ps7_init.c, if it exists. + */ +} diff --git a/board/xilinx/zynq/.gitignore b/board/xilinx/zynq/.gitignore new file mode 100644 index 0000000..68b8edd --- /dev/null +++ b/board/xilinx/zynq/.gitignore @@ -0,0 +1 @@ +ps7_init.[ch] diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 3f19a1c..f91214c 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -6,4 +6,7 @@ # obj-y := board.o -obj-$(CONFIG_SPL_BUILD) += ps7_init.o + +# Please copy ps7_init.c/h from hw project +obj-$(CONFIG_SPL_BUILD) += \ + $(if $(wildcard $(srctree)/$(src)/ps7_init.c),ps7_init.o) diff --git a/board/xilinx/zynq/ps7_init.c b/board/xilinx/zynq/ps7_init.c deleted file mode 100644 index c47da09..0000000 --- a/board/xilinx/zynq/ps7_init.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * (C) Copyright 2014 Xilinx, Inc. Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include <common.h> -#include <asm/arch/spl.h> - -__weak void ps7_init(void) -{ - puts("Please copy ps7_init.c/h from hw project\n"); -} -- 1.8.3.2

2 1

[U-Boot] Pull request: u-boot-dfu
by Lukasz Majewski 08 May '14

08 May '14

Dear Marek, Please pull following code. In the same occasion I would like to apologize for the fuzz with sending the last PR. This one is ready to go and (hopefully) clans up all the code floating around various USB gadgets and DFU. The following changes since commit 340ed422d2a58c4858ba8e110c233e8ae92c04e0: usb: ums: remove ci_udc special case (2014-05-07 23:36:58 +0200) are available in the git repository at: ssh://gu-dfu@git.denx.de/u-boot-dfu master for you to fetch changes up to fc25fa27e5f439705e9ca42182014e2d75d9f0ae: dfu, nand: add medium specific polltimeout function (2014-05-08 10:38:30 +0200) ---------------------------------------------------------------- Heiko Schocher (2): musb-new, dfu: first send request answer then call completions dfu, nand: add medium specific polltimeout function Rob Herring (1): arm: beagle: enable Android fastboot support Sebastian Siewior (2): image: add support for Android's boot image format usb/gadget: add the fastboot gadget Stephen Warren (9): usb: ums: add error handling for failed registration ums: support block devices not MMC devices ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR ums: remove error-checking of MMC device size ums: remove ums_disk_init() ums: move IO support code to common location ums: use get_device() not find_mmc_device(); ums: move all variable declarations to the start of the block ums: allow the user to specify the device type README | 22 +++++++ board/samsung/common/Makefile | 1 - board/samsung/common/ums.c | 74 ------------------------ common/Makefile | 3 + common/cmd_bootm.c | 23 +++++++- common/cmd_fastboot.c | 36 ++++++++++++ common/cmd_usb_mass_storage.c | 91 +++++++++++++++++++++++++---- common/image-android.c | 84 +++++++++++++++++++++++++++ common/image.c | 20 +++++-- doc/README.android-fastboot | 91 +++++++++++++++++++++++++++++ doc/README.android-fastboot-protocol | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/dfu/dfu_nand.c | 13 +++++ drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/f_dfu.c | 10 +++- drivers/usb/gadget/f_fastboot.c | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb-new/musb_gadget_ep0.c | 8 +-- include/android_image.h | 69 ++++++++++++++++++++++ include/configs/omap3_beagle.h | 10 ++++ include/dfu.h | 1 + include/image.h | 13 +++++ include/usb_mass_storage.h | 13 +---- 21 files changed, 1157 insertions(+), 109 deletions(-) delete mode 100644 board/samsung/common/ums.c create mode 100644 common/cmd_fastboot.c create mode 100644 common/image-android.c create mode 100644 doc/README.android-fastboot create mode 100644 doc/README.android-fastboot-protocol create mode 100644 drivers/usb/gadget/f_fastboot.c create mode 100644 include/android_image.h -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

2 1

[U-Boot] [PATCH] zynq: ignore ps7_init.h
by Masahiro Yamada 08 May '14

08 May '14

ps_init.h should be ignored because it is supposed to be copied from an external project. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 board/xilinx/zynq/.gitignore diff --git a/board/xilinx/zynq/.gitignore b/board/xilinx/zynq/.gitignore new file mode 100644 index 0000000..5255763 --- /dev/null +++ b/board/xilinx/zynq/.gitignore @@ -0,0 +1 @@ +ps7_init.h -- 1.8.3.2

2 4