June 2014 - U-Boot

[U-Boot] [PATCH v3] ARM: tegra: Disable VPR
by Alexandre Courbot 02 Jul '14

02 Jul '14

From: Bryan Wu <pengw(a)nvidia.com> On Tegra114 and Tegra124 platforms, certain display-related registers cannot be accessed unless the VPR registers are programmed. For bootloader, we probably don't care about VPR, so we disable it (which counts as programming it, and allows those display-related registers to be accessed. This patch is based on the commit 5f499646c83ba08079f3fdff6591f638a0ce4c0c in Chromium OS U-Boot project. Signed-off-by: Andrew Chew <achew(a)nvidia.com> Signed-off-by: Jimmy Zhang <jimmzhang(a)nvidia.com> Signed-off-by: Bryan Wu <pengw(a)nvidia.com> [acourbot: ensure write went through, vpr.c style changes] Signed-off-by: Alexandre Courbot <acourbot(a)nvidia.com> Reviewed-by: Stephen Warren <swarren(a)nvidia.com> Cc: Tom Warren <TWarren(a)nvidia.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Terje Bergstrom <tbergstrom(a)nvidia.com> --- Changes since v2: - Remove useless switch case Changes since v1: - Use proper defines for fields values - Move MC layout to T124 arch as it is exclusive to it - Only compile VPR support if T124 is enabled arch/arm/cpu/tegra-common/Makefile | 1 + arch/arm/cpu/tegra-common/ap.c | 3 ++ arch/arm/cpu/tegra-common/vpr.c | 35 +++++++++++++++++++++++ arch/arm/include/asm/arch-tegra/ap.h | 9 ++++++ arch/arm/include/asm/arch-tegra124/mc.h | 49 +++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 arch/arm/cpu/tegra-common/vpr.c create mode 100644 arch/arm/include/asm/arch-tegra124/mc.h diff --git a/arch/arm/cpu/tegra-common/Makefile b/arch/arm/cpu/tegra-common/Makefile index 892556e64451..a18c318739fa 100644 --- a/arch/arm/cpu/tegra-common/Makefile +++ b/arch/arm/cpu/tegra-common/Makefile @@ -14,3 +14,4 @@ obj-y += clock.o obj-y += lowlevel_init.o obj-y += pinmux-common.o obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o +obj-$(CONFIG_TEGRA124) += vpr.o diff --git a/arch/arm/cpu/tegra-common/ap.c b/arch/arm/cpu/tegra-common/ap.c index 91d70da65661..a17dfd1e225e 100644 --- a/arch/arm/cpu/tegra-common/ap.c +++ b/arch/arm/cpu/tegra-common/ap.c @@ -163,4 +163,7 @@ void s_init(void) /* init the cache */ config_cache(); + + /* init vpr */ + config_vpr(); } diff --git a/arch/arm/cpu/tegra-common/vpr.c b/arch/arm/cpu/tegra-common/vpr.c new file mode 100644 index 000000000000..f695811c9b6d --- /dev/null +++ b/arch/arm/cpu/tegra-common/vpr.c @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* Tegra vpr routines */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/tegra.h> +#include <asm/arch/mc.h> + +/* Configures VPR. Right now, all we do is turn it off. */ +void config_vpr(void) +{ + struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE; + + /* Turn VPR off */ + writel(0, &mc->mc_video_protect_size_mb); + writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED, + &mc->mc_video_protect_reg_ctrl); + /* read back to ensure the write went through */ + readl(&mc->mc_video_protect_reg_ctrl); +} diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h index bc5851c1d045..5c8be94d9772 100644 --- a/arch/arm/include/asm/arch-tegra/ap.h +++ b/arch/arm/include/asm/arch-tegra/ap.h @@ -65,3 +65,12 @@ int tegra_get_sku_info(void); /* Do any chip-specific cache config */ void config_cache(void); + +#if defined(CONFIG_TEGRA124) +/* Do chip-specific vpr config */ +void config_vpr(void); +#else +static inline void config_vpr(void) +{ +} +#endif diff --git a/arch/arm/include/asm/arch-tegra124/mc.h b/arch/arm/include/asm/arch-tegra124/mc.h new file mode 100644 index 000000000000..d526dfe15c30 --- /dev/null +++ b/arch/arm/include/asm/arch-tegra124/mc.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _TEGRA124_MC_H_ +#define _TEGRA124_MC_H_ + +/** + * Defines the memory controller registers we need/care about + */ +struct mc_ctlr { + u32 reserved0[4]; /* offset 0x00 - 0x0C */ + u32 mc_smmu_config; /* offset 0x10 */ + u32 mc_smmu_tlb_config; /* offset 0x14 */ + u32 mc_smmu_ptc_config; /* offset 0x18 */ + u32 mc_smmu_ptb_asid; /* offset 0x1C */ + u32 mc_smmu_ptb_data; /* offset 0x20 */ + u32 reserved1[3]; /* offset 0x24 - 0x2C */ + u32 mc_smmu_tlb_flush; /* offset 0x30 */ + u32 mc_smmu_ptc_flush; /* offset 0x34 */ + u32 reserved2[6]; /* offset 0x38 - 0x4C */ + u32 mc_emem_cfg; /* offset 0x50 */ + u32 mc_emem_adr_cfg; /* offset 0x54 */ + u32 mc_emem_adr_cfg_dev0; /* offset 0x58 */ + u32 mc_emem_adr_cfg_dev1; /* offset 0x5C */ + u32 reserved3[12]; /* offset 0x60 - 0x8C */ + u32 mc_emem_arb_reserved[28]; /* offset 0x90 - 0xFC */ + u32 reserved4[338]; /* offset 0x100 - 0x644 */ + u32 mc_video_protect_bom; /* offset 0x648 */ + u32 mc_video_protect_size_mb; /* offset 0x64c */ + u32 mc_video_protect_reg_ctrl; /* offset 0x650 */ +}; + +#define TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_ENABLED (0 << 0) +#define TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED (1 << 0) + +#endif /* _TEGRA124_MC_H_ */ -- 2.0.0

3 2

[U-Boot] [PATCH] usb: ci_udc: Allocate the qTD list directly
by Marek Vasut 02 Jul '14

02 Jul '14

Instead of weird allocation of ci_drv->items_mem and then even weirder distribution of offsets in this memory area into ci_drv->items array, just allocate ci_drv->items as a big slab of aligned memory (replaces ci_drv->items_mem) and let ci_get_qtd() do the distribution of offsets in this memory area. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Jörg Krause <jkrause(a)posteo.de> Cc: Stephen Warren <swarren(a)wwwdotorg.org> --- drivers/usb/gadget/ci_udc.c | 18 +++++++----------- drivers/usb/gadget/ci_udc.h | 3 +-- 2 files changed, 8 insertions(+), 13 deletions(-) Note: Please test, it's too late and I'm barely conscious anymore ... diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 334b5d2..8d92324 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -137,7 +137,7 @@ static struct ept_queue_head *ci_get_qh(int ep_num, int dir_in) */ static struct ept_queue_item *ci_get_qtd(int ep_num, int dir_in) { - return controller.items[(ep_num * 2) + dir_in]; + return controller.items + ((ep_num * 2) + dir_in); } /** @@ -727,7 +727,8 @@ static int ci_udc_probe(void) const int ilist_sz = NUM_ENDPOINTS * ilist_ent_sz; /* The QH list must be aligned to 4096 bytes. */ - controller.epts = memalign(eplist_align, eplist_sz); + if (!controller.epts) + controller.epts = memalign(eplist_align, eplist_sz); if (!controller.epts) return -ENOMEM; memset(controller.epts, 0, eplist_sz); @@ -738,12 +739,13 @@ static int ci_udc_probe(void) * only one of them is used for the endpoint at time, so we can group * them together. */ - controller.items_mem = memalign(ilist_align, ilist_sz); - if (!controller.items_mem) { + if (!controller.items) + controller.items = memalign(ilist_align, ilist_sz); + if (!controller.items) { free(controller.epts); return -ENOMEM; } - memset(controller.items_mem, 0, ilist_sz); + memset(controller.items, 0, ilist_sz); for (i = 0; i < 2 * NUM_ENDPOINTS; i++) { /* @@ -763,12 +765,6 @@ static int ci_udc_probe(void) head->next = TERMINATE; head->info = 0; - imem = controller.items_mem + ((i >> 1) * ilist_ent_sz); - if (i & 1) - imem += sizeof(struct ept_queue_item); - - controller.items[i] = (struct ept_queue_item *)imem; - if (i & 1) { ci_flush_qh(i - 1); ci_flush_qtd(i - 1); diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h index 7d76af8..d464368 100644 --- a/drivers/usb/gadget/ci_udc.h +++ b/drivers/usb/gadget/ci_udc.h @@ -101,8 +101,7 @@ struct ci_drv { struct usb_gadget_driver *driver; struct ehci_ctrl *ctrl; struct ept_queue_head *epts; - struct ept_queue_item *items[2 * NUM_ENDPOINTS]; - uint8_t *items_mem; + struct ept_queue_item *items; struct ci_ep ep[NUM_ENDPOINTS]; }; -- 2.0.0.rc2

3 19

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 01 Jul '14

01 Jul '14

Dear Albert, The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f: arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200) are available in the git repository at: http://git.denx.de/u-boot-samsung for you to fetch changes up to 5287d595449512385e25f5afcb68a130bf08bae6: Samsung: Goni: change maintainer to Robert Baldyga (2014-06-30 14:02:42 +0900) ---------------------------------------------------------------- Akshay Saraswat (9): Exynos5: DMC: Modify the definition of ddr3_mem_ctrl_init Exynos5420: Remove code for enabling read leveling Exynos5420: DMC: Add software read leveling Exynos: SPI: Fix reading data from SPI flash Exynos5420: Let macros be used for exynos5420 Exynos5420: Introduce support for the Peach-Pit board Exynos5: Config: Place environment at the end of SPI flash Exynos5: Config: Increase SPL footprint for Exynos5420 Exynos5: Config: Enable USB boot mode for all Exynos5 SoCs Doug Anderson (1): DMC: exynos5420: Gate CLKM to when reading PHY_CON13 Jeroen Hofstee (1): PMIC: MAX77686: fix invalid bus check Michael Pratt (1): Exynos: Split 5250 and 5420 memory bank configuration Minkyu Kang (1): Revert "exynos: Enable PSHOLD in SPL" Przemyslaw Marczak (2): trats/trats2: exynos_power_init: return 0 if no battery detected. Samsung: Goni: change maintainer to Robert Baldyga Tushar Behera (1): Arndale: Enable preboot support Łukasz Majewski (2): FIX: config: goni: Change goni configuration to use Tizen's THOR downlodader FIX: config: goni: Change goni configuration to store envs at eMMC arch/arm/cpu/armv7/exynos/dmc_common.c | 2 +- arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c | 369 ++++++++++++++++++++++------- arch/arm/cpu/armv7/exynos/exynos5_setup.h | 21 +- arch/arm/cpu/armv7/exynos/lowlevel_init.c | 2 - arch/arm/dts/Makefile | 3 +- arch/arm/dts/exynos5420-peach-pit.dts | 127 ++++++++++ arch/arm/dts/exynos5420-smdk5420.dts | 23 +- arch/arm/dts/exynos5420.dtsi | 70 ------ arch/arm/dts/exynos54xx.dtsi | 151 ++++++++++++ arch/arm/include/asm/arch-exynos/dmc.h | 3 + arch/arm/include/asm/arch-exynos/power.h | 4 +- board/samsung/trats/trats.c | 2 +- board/samsung/trats2/trats2.c | 2 +- boards.cfg | 3 +- drivers/power/pmic/pmic_max77686.c | 13 +- drivers/spi/exynos_spi.c | 5 +- include/configs/arndale.h | 2 + include/configs/exynos5-dt.h | 15 +- include/configs/exynos5250-dt.h | 13 +- include/configs/exynos5420.h | 52 ++++ include/configs/peach-pit.h | 25 ++ include/configs/s5p_goni.h | 17 +- include/configs/smdk5420.h | 49 +--- 23 files changed, 717 insertions(+), 256 deletions(-) create mode 100644 arch/arm/dts/exynos5420-peach-pit.dts delete mode 100644 arch/arm/dts/exynos5420.dtsi create mode 100644 arch/arm/dts/exynos54xx.dtsi create mode 100644 include/configs/exynos5420.h create mode 100644 include/configs/peach-pit.h -- Thanks, Minkyu Kang.

2 1

[U-Boot] [PATCH] ARM: tegra: Add support for norrin board
by Allen Martin 01 Jul '14

01 Jul '14

Norrin (PM370) is a Tegra124 clamshell board that is very similar to venice2, but it has a different panel, the sdcard cd sense is flipped, and it has a different revision of the AS3722 PMIC. Reuse the venice2 config with a norrin dtb. This board is also refered to as "nyan" in the ChromeOS trees. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/tegra124-norrin.dts | 91 ++++++++++++++++++++++++++++++++++++++ board/nvidia/venice2/as3722_init.h | 2 +- boards.cfg | 1 + include/configs/venice2.h | 9 ++++ 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/tegra124-norrin.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 55546152b94b..414f206cb6f0 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -23,7 +23,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra30-tec-ng.dtb \ tegra114-dalmore.dtb \ tegra124-jetson-tk1.dtb \ - tegra124-venice2.dtb + tegra124-venice2.dtb \ + tegra124-norrin.dtb dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ zynq-zc706.dtb \ zynq-zed.dtb \ diff --git a/arch/arm/dts/tegra124-norrin.dts b/arch/arm/dts/tegra124-norrin.dts new file mode 100644 index 000000000000..fdf000cf75ec --- /dev/null +++ b/arch/arm/dts/tegra124-norrin.dts @@ -0,0 +1,91 @@ +/dts-v1/; + +#include "tegra124.dtsi" + +/ { + model = "NVIDIA Norrin"; + compatible = "nvidia,norrin", "nvidia,tegra124"; + + aliases { + i2c0 = "/i2c@7000d000"; + i2c1 = "/i2c@7000c000"; + i2c2 = "/i2c@7000c400"; + i2c3 = "/i2c@7000c500"; + i2c4 = "/i2c@7000c700"; + i2c5 = "/i2c@7000d100"; + sdhci0 = "/sdhci@700b0600"; + sdhci1 = "/sdhci@700b0400"; + spi0 = "/spi@7000d400"; + spi1 = "/spi@7000da00"; + usb0 = "/usb@7d000000"; + usb1 = "/usb@7d008000"; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; + + i2c@7000c000 { + status = "okay"; + clock-frequency = <100000>; + }; + + i2c@7000c400 { + status = "okay"; + clock-frequency = <100000>; + }; + + i2c@7000c500 { + status = "okay"; + clock-frequency = <100000>; + }; + + i2c@7000c700 { + status = "okay"; + clock-frequency = <100000>; + }; + + i2c@7000d000 { + status = "okay"; + clock-frequency = <400000>; + }; + + i2c@7000d100 { + status = "okay"; + clock-frequency = <400000>; + }; + + spi@7000d400 { + status = "okay"; + spi-max-frequency = <25000000>; + }; + + spi@7000da00 { + status = "okay"; + spi-max-frequency = <25000000>; + }; + + sdhci@700b0400 { + status = "okay"; + cd-gpios = <&gpio 170 1>; /* gpio PV2 */ + power-gpios = <&gpio 136 0>; /* gpio PR0 */ + bus-width = <4>; + }; + + sdhci@700b0600 { + status = "okay"; + bus-width = <8>; + }; + + usb@7d000000 { + status = "okay"; + dr_mode = "otg"; + nvidia,vbus-gpio = <&gpio 108 0>; /* gpio PN4, USB_VBUS_EN0 */ + }; + + usb@7d008000 { + status = "okay"; + nvidia,vbus-gpio = <&gpio 109 0>; /* gpio PN5, USB_VBUS_EN1 */ + }; +}; diff --git a/board/nvidia/venice2/as3722_init.h b/board/nvidia/venice2/as3722_init.h index a7b24039f6aa..7c80ef09387b 100644 --- a/board/nvidia/venice2/as3722_init.h +++ b/board/nvidia/venice2/as3722_init.h @@ -18,7 +18,7 @@ #define AS3722_LDO6VOLTAGE_REG 0x16 /* VDD_SDMMC */ #define AS3722_LDCONTROL_REG 0x4E -#ifdef CONFIG_BOARD_JETSON_TK1 +#if defined(CONFIG_BOARD_JETSON_TK1) || defined(CONFIG_BOARD_NORRIN) #define AS3722_SD0VOLTAGE_DATA (0x3C00 | AS3722_SD0VOLTAGE_REG) #else #define AS3722_SD0VOLTAGE_DATA (0x2800 | AS3722_SD0VOLTAGE_REG) diff --git a/boards.cfg b/boards.cfg index 5a85fad48095..3950688ba30b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -395,6 +395,7 @@ Active arm armv7 zynq xilinx zynq Active arm armv7:arm720t tegra114 nvidia dalmore dalmore - Tom Warren <twarren(a)nvidia.com> Active arm armv7:arm720t tegra124 nvidia jetson-tk1 jetson-tk1 jetson-tk1:BOARD_JETSON_TK1= Stephen Warren <swarren(a)nvidia.com> Active arm armv7:arm720t tegra124 nvidia venice2 venice2 - Tom Warren <twarren(a)nvidia.com> +Active arm armv7:arm720t tegra124 nvidia venice2 norrin venice2:BOARD_NORRIN Tom Warren <twarren(a)nvidia.com> Active arm armv7:arm720t tegra20 avionic-design medcom-wide medcom-wide - Alban Bedel <alban.bedel(a)avionic-design.de> Active arm armv7:arm720t tegra20 avionic-design plutux plutux - Alban Bedel <alban.bedel(a)avionic-design.de> Active arm armv7:arm720t tegra20 avionic-design tec tec - Alban Bedel <alban.bedel(a)avionic-design.de> diff --git a/include/configs/venice2.h b/include/configs/venice2.h index c4a1b94b98e1..7162d2e4bd47 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -13,13 +13,22 @@ #include "tegra124-common.h" /* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */ +#ifdef CONFIG_BOARD_NORRIN +#define CONFIG_DEFAULT_DEVICE_TREE tegra124-norrin +#else #define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2 +#endif #define CONFIG_OF_CONTROL #define CONFIG_OF_SEPARATE /* High-level configuration options */ +#ifdef CONFIG_BOARD_NORRIN +#define V_PROMPT "Tegra124 (Norrin) # " +#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Norrin" +#else #define V_PROMPT "Tegra124 (Venice2) # " #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" +#endif /* Board-specific serial config */ #define CONFIG_SERIAL_MULTI -- 1.8.1.5

2 2

[U-Boot] pull request for u-boot-tegra/master into ARM/master
by Tom Warren 01 Jul '14

01 Jul '14

Albert, Please pull u-boot-tegra/master into ARM/master. Thanks! ./MAKEALL -s tegra AOK, checkpatch.pl is OK, and ./MAKEALL -a arm only shows failures that were already present in ARM/master. The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f: arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200) are available in the git repository at: git://git.denx.de/u-boot-tegra.git master for you to fetch changes up to fe7b7cd26683b29bed407bf5ab778e8d80201d73: ARM: tegra: set initrd_high so boot scripts work (2014-06-19 10:47:20 -0700) ---------------------------------------------------------------- Jeroen Hofstee (2): tegra20: display: fix checking of return value ARM: tegra: fix include guard Stephen Warren (2): ARM: tegra: fix extlinux.conf search location ARM: tegra: set initrd_high so boot scripts work arch/arm/cpu/armv7/tegra20/display.c | 2 +- include/configs/tegra-common-post.h | 9 +++++---- include/configs/tegra-common-ums.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-)

2 1

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 01 Jul '14

01 Jul '14

Hey, The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f: arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 12cc54376768461533b55ada1b0b6d4979f40579: omap3: overo: Select fdtfile for expansion board (2014-06-19 17:53:59 -0400) ---------------------------------------------------------------- Ash Charles (3): omap: Don't enable GPMC CS0 with nothing attached omap4: duovero: Correct name of default device tree omap3: overo: Select fdtfile for expansion board Axel Lin (1): spi: davinci: Fix register address for SPI1_BUS Felipe Balbi (5): board: ti: am43xx: print unsupported board name cpu: armv7: am33x: ddr: write emif ref_ctrl_shadow register board: ti: am43xx: add support for AM43xx Starter Kit board: ti: am43xx: add AM437x SK PHY Address board: ti: am43xx: enable QSPI and Gbit Ethernet on AM437x SK Jeroen Hofstee (1): omap3: board: trivial: add void for no args Khoronzhuk, Ivan (2): mtd: nand: davinci: add header file for driver definitions ARM: keystone: aemif: move aemif driver to drivers/memory/ti-aemif.c Stefano Babic (1): OMAP: disable gpmc timeout safely for reenabling arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 1 + arch/arm/cpu/armv7/am33xx/ddr.c | 1 + arch/arm/cpu/armv7/keystone/Makefile | 1 - arch/arm/cpu/armv7/omap-common/mem-common.c | 6 +- arch/arm/cpu/armv7/omap3/board.c | 4 +- arch/arm/include/asm/arch-davinci/emif_defs.h | 72 ------------------ arch/arm/include/asm/arch-davinci/hardware.h | 1 - arch/arm/include/asm/arch-davinci/nand_defs.h | 38 ---------- arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 7 -- arch/arm/include/asm/arch-keystone/hardware.h | 30 +------- arch/arm/include/asm/arch-keystone/nand_defs.h | 23 ------ arch/arm/include/asm/arch-tnetv107x/emif_defs.h | 1 - arch/arm/include/asm/arch-tnetv107x/hardware.h | 2 + arch/arm/include/asm/arch-tnetv107x/nand_defs.h | 23 ------ .../emif_defs.h => ti-common/davinci_nand.h} | 55 ++++++++++---- arch/arm/include/asm/ti-common/ti-aemif.h | 39 ++++++++++ board/Barix/ipam390/ipam390.c | 2 +- board/ait/cam_enc_4xx/cam_enc_4xx.c | 2 +- board/davinci/da8xxevm/da830evm.c | 3 +- board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/dm355evm/dm355evm.c | 3 +- board/davinci/dm355leopard/dm355leopard.c | 2 +- board/davinci/dm365evm/dm365evm.c | 3 +- board/davinci/dm6467evm/dm6467evm.c | 3 +- board/davinci/ea20/ea20.c | 2 +- board/davinci/sonata/sonata.c | 2 +- board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/omicron/calimain/calimain.c | 2 +- board/overo/overo.c | 14 ++++ board/ti/am43xx/board.c | 79 +++++++++++++++++++- board/ti/am43xx/board.h | 5 ++ board/ti/am43xx/mux.c | 3 + board/ti/k2hk_evm/board.c | 10 +-- board/ti/tnetv107xevm/sdb_board.c | 2 +- drivers/Makefile | 1 + drivers/memory/Makefile | 1 + .../keystone/aemif.c => drivers/memory/ti-aemif.c | 37 +++++---- drivers/mtd/nand/davinci_nand.c | 3 +- drivers/spi/davinci_spi.c | 2 +- include/configs/am43xx_evm.h | 2 + include/configs/davinci_dm6467evm.h | 2 + include/configs/k2hk_evm.h | 6 ++ include/configs/omap3_overo.h | 10 +-- include/configs/ti_omap4_common.h | 2 +- 45 files changed, 255 insertions(+), 258 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-davinci/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/nand_defs.h rename arch/arm/include/asm/{arch-keystone/emif_defs.h => ti-common/davinci_nand.h} (56%) create mode 100644 arch/arm/include/asm/ti-common/ti-aemif.h create mode 100644 drivers/memory/Makefile rename arch/arm/cpu/armv7/keystone/aemif.c => drivers/memory/ti-aemif.c (63%) -- Tom

2 1

[U-Boot] [PULL] : Please pull u-boot-imx
by Stefano Babic 01 Jul '14

01 Jul '14

Hi Albert, please pull from u-boot-imx, thanks ! The following changes since commit 49692c5f517d8e44ed9db0de778728fe7d2a300c: net/designware: Make DMA burst length configurable and reduce by default (2014-05-25 17:23:58 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0: mx25pdk: Remove CONFIG_SYS_GENERIC_BOARD (2014-06-26 10:17:19 +0200) ---------------------------------------------------------------- Eric Nelson (1): serial_mxc: disable new features of autobaud detection Fabio Estevam (10): mx6sabreauto: Add the mx6dual-lite variant mx6sabred: Add PFUZE100 PMIC support mx25pdk: Add generic board support mx6: Fix definition of IOMUXC_GPR12_DEVICE_TYPE_RC embestmx6boards: Fix CONFIG_CONSOLE_DEV embestmx6boards: Fix the dtb file name for riotboard mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected mx28evk: Add a target for SPI NOR boot mx28evk: Add documentation on how to boot from SPI NOR mx25pdk: Remove CONFIG_SYS_GENERIC_BOARD Marek Vasut (1): arm: mx5: Enable CONFIG_SYS_GENERIC_BOARD on M53EVK Masahiro Yamada (1): spl: consolidate arch/arm/include/asm/arch-*/spl.h Shawn Guo (1): mx6: drop ARM errata 742230 Stefano Babic (3): MX25: fix build due to missing sys_proto.h imx: correct HAB status for new chip TO vf610: fix build due to missing sys_proto.h Tim Harvey (12): spl: nand: add support for mxs nand mx6: add common SPL configuration mx6: add boot device support for SPL imx: add comments and remove unused struct fields mx6: add structs for mmdc and ddr iomux registers mx6: add mmdc configuration for MX6Q/MX6DL imx: iomux: add macros to setup iomux for multiple SoC types imx: ventana: split read_eeprom into standalone file imx: ventana: auto-configure for IMX6Q vs IMX6DL imx: ventana: switch to SPL dwc_ahsata: return failure for MX6 if not IMX6Q/IMX6D imx: sata: return failure if not IMX6Q/IMX6D arch/arm/cpu/arm720t/tegra-common/spl.c | 2 +- arch/arm/cpu/armv7/mx6/Makefile | 1 + arch/arm/cpu/armv7/mx6/ddr.c | 490 +++++++++++++++++++++++ arch/arm/cpu/armv7/mx6/hab.c | 73 +++- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/cpu.c | 16 +- arch/arm/imx-common/iomux-v3.c | 18 +- arch/arm/imx-common/sata.c | 7 +- arch/arm/imx-common/spl.c | 81 ++++ arch/arm/include/asm/arch-at91/spl.h | 24 -- arch/arm/include/asm/arch-davinci/spl.h | 16 - arch/arm/include/asm/arch-mx35/spl.h | 22 - arch/arm/include/asm/arch-mx5/spl.h | 13 - arch/arm/include/asm/arch-mx6/hab.h | 17 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/iomux.h | 2 +- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 231 +++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 4 +- arch/arm/include/asm/arch-tegra114/spl.h | 22 - arch/arm/include/asm/arch-tegra124/spl.h | 13 - arch/arm/include/asm/arch-tegra20/spl.h | 12 - arch/arm/include/asm/arch-tegra30/spl.h | 12 - arch/arm/include/asm/imx-common/iomux-v3.h | 25 ++ arch/arm/include/asm/spl.h | 20 + board/denx/m53evk/m53evk.c | 2 +- board/freescale/mx28evk/README | 22 +- board/freescale/mx6qsabreauto/mx6dl.cfg | 130 ++++++ board/freescale/mx6sabresd/mx6sabresd.c | 84 ++++ board/gateworks/gw_ventana/Makefile | 3 +- board/gateworks/gw_ventana/README | 92 +++-- board/gateworks/gw_ventana/eeprom.c | 89 +++++ board/gateworks/gw_ventana/gw_ventana.c | 597 +++++++++++++++------------- board/gateworks/gw_ventana/gw_ventana.cfg | 15 - board/gateworks/gw_ventana/gw_ventana_spl.c | 419 +++++++++++++++++++ board/gateworks/gw_ventana/ventana_eeprom.h | 11 + boards.cfg | 8 +- doc/README.mxs | 26 ++ drivers/block/dwc_ahsata.c | 5 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxs_nand_spl.c | 231 +++++++++++ drivers/serial/serial_mxc.c | 4 +- include/configs/embestmx6boards.h | 4 +- include/configs/gw_ventana.h | 11 + include/configs/imx6_spl.h | 71 ++++ include/configs/m53evk.h | 1 + include/configs/mx28evk.h | 5 +- include/configs/mx6_common.h | 1 - include/configs/mx6qsabreauto.h | 4 + include/configs/mx6sabresd.h | 12 + include/power/pfuze100_pmic.h | 4 + 50 files changed, 2473 insertions(+), 503 deletions(-) create mode 100644 arch/arm/cpu/armv7/mx6/ddr.c create mode 100644 arch/arm/imx-common/spl.c delete mode 100644 arch/arm/include/asm/arch-at91/spl.h delete mode 100644 arch/arm/include/asm/arch-davinci/spl.h delete mode 100644 arch/arm/include/asm/arch-mx35/spl.h delete mode 100644 arch/arm/include/asm/arch-mx5/spl.h delete mode 100644 arch/arm/include/asm/arch-tegra114/spl.h delete mode 100644 arch/arm/include/asm/arch-tegra124/spl.h delete mode 100644 arch/arm/include/asm/arch-tegra20/spl.h delete mode 100644 arch/arm/include/asm/arch-tegra30/spl.h create mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg create mode 100644 board/gateworks/gw_ventana/eeprom.c create mode 100644 board/gateworks/gw_ventana/gw_ventana_spl.c create mode 100644 drivers/mtd/nand/mxs_nand_spl.c create mode 100644 include/configs/imx6_spl.h -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH] usb: ci_udc: fix interaction with CONFIG_USB_ETH_CDC
by Stephen Warren 01 Jul '14

01 Jul '14

From: Stephen Warren <swarren(a)nvidia.com> ci_udc.c's usb_gadget_unregister_driver() doesn't call driver->unbind() unlike other USB gadget drivers. Fix it to do this. Without this, when ether.c's CDC Ethernet device is torn down, eth_unbind() is never called, so dev->gadget is never set to NULL. For some reason, usb_eth_halt() is called both at the end of the first use of the Ethernet device, and prior to any subsequent use. Since dev->gadget is never cleared, all calls to usb_eth_halt() attempt to stop, disconnect, and clean up the device, resulting in double cleanup, which hangs U-Boot on my Tegra device at least. ci_udc allocates its own singleton EP0 request object, and cleans it up during usb_gadget_unregister_driver(). This appears necessary when using the USB gadget framework in U-Boot, since that does not allocate/free the EP0 request. However, the CDC Ethernet driver *does* allocate and free its own EP0 requests. Consequently, we must protect ci_ep_free_request() against double-freeing the request. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/usb/gadget/ci_udc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index b18bee43ad89..c3f6467b7db4 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -226,8 +226,11 @@ static void ci_ep_free_request(struct usb_ep *ep, struct usb_request *req) int num; num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; - if (num == 0) + if (num == 0) { + if (!controller.ep0_req) + return; controller.ep0_req = 0; + } if (ci_req->b_buf) free(ci_req->b_buf); @@ -909,6 +912,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) { udc_disconnect(); + driver->unbind(&controller.gadget); + controller.driver = NULL; + ci_ep_free_request(&controller.ep[0].ep, &controller.ep0_req->req); free(controller.items_mem); free(controller.epts); -- 1.8.1.5

4 29

[U-Boot] Pull request v2: u-boot-sh/rmobile into u-boot-arm/master
by Nobuhiro Iwamatsu 30 Jun '14

30 Jun '14

Dear Albert Aribaud, Please pull u-boot-sh/rmobile into u-boot-arm/master. The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f: arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200) are available in the git repository at: git://git.denx.de/u-boot-sh.git rmobile for you to fetch changes up to 2f7b27caf4e6bdc6cb4047ef3ee4021f20e14c5f: arm: rmobile: lager: Remove NOR-Flash support from boards.cfg (2014-06-11 06:59:36 +0900) ---------------------------------------------------------------- Nobuhiro Iwamatsu (2): arm: rmobile: koelsch: Remove NOR-Flash support from boards.cfg arm: rmobile: lager: Remove NOR-Flash support from boards.cfg boards.cfg | 2 -- 1 file changed, 2 deletions(-) -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] Why spi flash probe runs twice on Xilinx Zynq board ?
by Heshsham Abdul Basit 30 Jun '14

30 Jun '14

Hi, I am re-sending this email because earlier I forgot to put the subject line properly. I am struggling to figure out few things in u-boot , but I failed to get a good resource or help. This is a section of the log from u-boot running on Avnet Microzed board: [Thu Jun 26 17:40:53.656 2014] [Thu Jun 26 17:40:53.656 2014] [Thu Jun 26 17:40:53.656 2014] U-Boot 2013.07 (Jun 26 2014 - 17:34:41) [Thu Jun 26 17:40:53.656 2014] [Thu Jun 26 17:40:53.656 2014] 1 GiB [Thu Jun 26 17:40:53.671 2014] SF: Detected S25FL129P_64K/S25FL128S_64K with page size 64 KiB, total 16 MiB [Thu Jun 26 17:40:53.703 2014] *** Warning - bad CRC, using default environment [Thu Jun 26 17:40:53.703 2014] [Thu Jun 26 17:40:53.703 2014] In: serial [Thu Jun 26 17:40:53.703 2014] Out: serial [Thu Jun 26 17:40:53.703 2014] Err: serial [Thu Jun 26 17:40:53.703 2014] U-BOOT for suheb_24 [Thu Jun 26 17:40:53.703 2014] [Thu Jun 26 17:40:53.703 2014] [Thu Jun 26 17:40:53.703 2014] SF: Detected S25FL129P_64K/S25FL128S_64K with page size 64 KiB, total 16 MiB [Thu Jun 26 17:40:54.453 2014] SF: 5242880 bytes @ 0x520000 Read: OK [Thu Jun 26 17:40:54.453 2014] Description: PetaLinux Kernel [Thu Jun 26 17:40:54.453 2014] 0x010000f0 [Thu Jun 26 17:40:54.453 2014] 4620145 Bytes = 4.4 MiB [Thu Jun 26 17:40:54.453 2014] Description: Flattened Device Tree blob [Thu Jun 26 17:40:54.453 2014] 0x01468114 [Thu Jun 26 17:40:54.453 2014] 9766 Bytes = 9.5 KiB [Thu Jun 26 17:40:54.453 2014] Hash algo: crc32 [Thu Jun 26 17:40:54.453 2014] Hash value: 9a94aca8 [Thu Jun 26 17:40:54.453 2014] Hash algo: sha1 [Thu Jun 26 17:40:54.453 2014] Hash value: 97b81e3014decb706ff19e61e1227dace97d4232 [Thu Jun 26 17:40:54.453 2014] crc32+ sha1+ Uncompressing Kernel Image ... OK . .I noticed that the following lines are coming twice: SF: Detected S25FL129P_64K/S25FL128S_64K with page size 64 KiB, total 16 MiB This corresponds to the function spi_flash_probe from drivers/mtd/spi/spi_flash.c I need to know: 1- Why it is probed twice? 2- The name and location of the file from where it is called (twice). 3- The second time it is being probed is considerably slow, why it is so? I have searched many forums and have looked in the code but still I am not able to figure out these things. Thanks and regards, Abdul Basit

3 7