July 2015 - U-Boot

[U-Boot] [PATCH v2 0/8] ARM: keystone2: Clocks and PLLs cleanup
by Lokesh Vutla 13 Aug '15

13 Aug '15

This seires does a several bunch of cleanups for clock and PLL related definitions. This helps a lot in adding data for new Keystone2 SoCs. And also adds support for CPU detection. This is based on Nishanth's config cleanup series: https://www.mail-archive.com/u-boot%40lists.denx.de/msg177822.html Tested on K2HK-evm: http://pastebin.ubuntu.com/11952380/ Changes since v1: - Added support for detecting SR - Corrected CPU detection. - Corrected DEV speeds for Edison - Added proper delays for PLL init code. Lokesh Vutla (8): ARM: keystone2: Cleanup SoC detection ARM: keystone2: Enable CONFIG_DISPLAY_CPUINFO ARM: keystone2: Cleanup PLL init code ARM: keystone2: Fix dev and arm speed detection ARM: keystone2: Use common structure for PLLs ARM: keystone2: Cleanup init_pll definition ARM: keystone2: Remove unsed external clocks ARM: keystone2: Use common definition for clk_get_rate arch/arm/mach-keystone/Makefile | 3 - arch/arm/mach-keystone/clock-k2e.c | 117 ----- arch/arm/mach-keystone/clock-k2hk.c | 145 ------ arch/arm/mach-keystone/clock-k2l.c | 138 ------ arch/arm/mach-keystone/clock.c | 513 +++++++++++++-------- arch/arm/mach-keystone/cmd_clock.c | 7 +- arch/arm/mach-keystone/include/mach/clock-k2e.h | 58 +-- arch/arm/mach-keystone/include/mach/clock-k2hk.h | 64 +-- arch/arm/mach-keystone/include/mach/clock-k2l.h | 59 +-- arch/arm/mach-keystone/include/mach/clock.h | 67 ++- arch/arm/mach-keystone/include/mach/clock_defs.h | 98 ++-- .../arm/mach-keystone/include/mach/hardware-k2hk.h | 4 - arch/arm/mach-keystone/include/mach/hardware.h | 51 +- arch/arm/mach-keystone/init.c | 32 ++ board/ti/ks2_evm/board.c | 1 - board/ti/ks2_evm/board_k2e.c | 76 ++- board/ti/ks2_evm/board_k2hk.c | 69 +-- board/ti/ks2_evm/board_k2l.c | 68 +-- include/configs/ti_armv7_keystone2.h | 1 + 19 files changed, 663 insertions(+), 908 deletions(-) delete mode 100644 arch/arm/mach-keystone/clock-k2e.c delete mode 100644 arch/arm/mach-keystone/clock-k2hk.c delete mode 100644 arch/arm/mach-keystone/clock-k2l.c -- 2.1.4

2 16

[U-Boot] [PATCH V2 0/3] ARM: DRA74x: Provide support for ARM erratum 801819
by Nishanth Menon 13 Aug '15

13 Aug '15

Provide support ARM erratum 801819 with capability to disable write streaming. Obvioulsy on SMP systems such as DRA74x/OMAP5, this will benefit only CPU0. CPU1 when made online in HLOS such as linux kernel will need similar workaround as well. Ignoring v1 of the patch completely here. Nishanth Menon (3): ARM: Introduce erratum workaround for 801819 ARM: DRA7/ OMAP5: implement Auxiliary Control Register configuration ARM: DRA72: disable workaround for 801819 README | 1 + arch/arm/cpu/armv7/omap5/hwinit.c | 17 +++++++++++++++++ arch/arm/cpu/armv7/start.S | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-omap5/sys_proto.h | 1 + 4 files changed, 40 insertions(+) -- 2.1.4

2 6

[U-Boot] [PATCH 7/7] net: lpc32xx: eth buffers base config
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> Add support to specify the Ethernet buffer base address; if none are supply by the board, the default value is use (from existing code). Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- drivers/net/lpc32xx_eth.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index f3ab0f4..e76e9bc 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -353,15 +353,17 @@ int lpc32xx_eth_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr, #endif /* + * Provide default Ethernet buffers base address if target did not. * Locate buffers in SRAM at 0x00001000 to avoid cache issues and * maximize throughput. */ - -#define LPC32XX_ETH_BUFS 0x00001000 +#if !defined(CONFIG_LPC32XX_ETH_BUFS_BASE) +#define CONFIG_LPC32XX_ETH_BUFS_BASE 0x00001000 +#endif static struct lpc32xx_eth_device lpc32xx_eth = { .regs = (struct lpc32xx_eth_registers *)LPC32XX_ETH_BASE, - .bufs = (struct lpc32xx_eth_buffers *)LPC32XX_ETH_BUFS, + .bufs = (struct lpc32xx_eth_buffers *)CONFIG_LPC32XX_ETH_BUFS_BASE, #if defined(CONFIG_RMII) .phy_rmii = true, #endif -- 1.8.3.1

3 2

[U-Boot] [PATCH 6/7] i2c: lpc32xx: fix write timeout
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> Fix a condition that generate watchdog timeout inside "lpc32xx_i2c_write" when parameters alen = 0 and len = 0. Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- drivers/i2c/lpc32xx_i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 4c66769..7f4eccd 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -200,6 +200,8 @@ static int lpc32xx_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr, if (alen | length) /* Address slave in write mode */ writel((dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); + else + return 0; /* write address bytes */ while (alen) { /* wait for transmit fifo not full */ -- 1.8.3.1

2 1

[U-Boot] [PATCH 5/7] i2c: lpc32xx: fix read timeout
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> Fix a condition that generate watchdog timeout inside "lpc32xx_i2c_read" when parameters alen != 0 and len = 0. Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- drivers/i2c/lpc32xx_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 98106fa..4c66769 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -172,12 +172,12 @@ static int lpc32xx_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr, *(data++) = readl(&i2c->rx); } } + /* wait for end of transation */ + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) + ; + /* clear end-of-transaction flag */ + writel(1, &i2c->stat); } - /* wait for end of transation */ - while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) - ; - /* clear end-of-transaction flag */ - writel(1, &i2c->stat); /* success */ return 0; } -- 1.8.3.1

2 1

[U-Boot] [PATCH 4/7] i2c: lpc32xx: use api to get hclk instead of fix value
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> The HCLK is not constant and can take different value; use the api function to get the value of the HCLK for the I2C clock high and low computation. Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- drivers/i2c/lpc32xx_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 78d26e4..98106fa 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -72,7 +72,7 @@ static unsigned int lpc32xx_i2c_set_bus_speed(struct i2c_adapter *adap, if (speed == 0) return -EINVAL; - half_period = (105000000 / speed) / 2; + half_period = (get_hclk_clk_rate() / speed) / 2; if ((half_period > 255) || (half_period < 0)) return -EINVAL; -- 1.8.3.1

2 1

[U-Boot] [PATCH 3/7] arm: lpc32xx: gpio macro for pin mapping
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> Add LPC32xx GPIO interface macro for pin mapping. Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- arch/arm/include/asm/arch-lpc32xx/gpio_grp.h | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 arch/arm/include/asm/arch-lpc32xx/gpio_grp.h diff --git a/arch/arm/include/asm/arch-lpc32xx/gpio_grp.h b/arch/arm/include/asm/arch-lpc32xx/gpio_grp.h new file mode 100644 index 0000000..c9cf9df --- /dev/null +++ b/arch/arm/include/asm/arch-lpc32xx/gpio_grp.h @@ -0,0 +1,40 @@ +/* + * LPC32xx GPIO interface macro for pin mapping. + * + * (C) Copyright 2015 DENX Software Engineering GmbH + * Written-by: Sylvain Lemieux <slemieux@@tycoint.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _LPC32XX_GPIO_GRP_H +#define _LPC32XX_GPIO_GRP_H + +/* + * Macro to map the pin for the lpc32xx_gpio driver. + * Note: - GPIOS are considered here as homogeneous and linear, from 0 to 127; + * mapping is done per register, as group of 32. + * (see drivers/gpio/lpc32xx_gpio.c for details). + * - macros can be use with the following pins: + * P0.0 - P0.7 + * P1.0 - P1.23 + * P2.0 - P2.12 + * P3 GPI_0 - GPI_9 / GPI_15 - GPI_23 / GPI_25 / GPI_27 - GPI_28 + * P3 GPO_0 - GPO_23 + * P3 GPIO_0 - GPIO_5 (output register only) + */ +#define LPC32XX_GPIO_P0_GRP 0 +#define LPC32XX_GPIO_P1_GRP 32 +#define LPC32XX_GPIO_P2_GRP 64 +#define LPC32XX_GPI_P3_GRP 96 +#define LPC32XX_GPO_P3_GRP 96 +#define LPC32XX_GPIO_P3_GRP (LPC32XX_GPO_P3_GRP + 25) + +/* + * A specific GPIO can be selected with this macro + * ie, GPIO P0.1 can be selected with LPC32XX_GPIO(LPC32XX_GPIO_P0_GRP, 1) + * See the LPC32x0 User's guide for GPIO group numbers + */ +#define LPC32XX_GPIO(x, y) ((x) + (y)) + +#endif /* _LPC32XX_GPIO_GRP_H */ -- 1.8.3.1

2 1

[U-Boot] [PATCH 2/7] lpc32xx: cpu: add support for soft reset
by slemieux.tyco＠gmail.com 13 Aug '15

13 Aug '15

From: Sylvain Lemieux <slemieux(a)tycoint.com> Add support for optional soft reset (i.e. "RESOUT_N" not asserted during reset). To be compatible with the original U-Boot code, when the "addr" parameter is 0, a hard is performed; for any other values, a soft reset is done. Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c index f757474..bee9318 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> + * Copyright (C) 2011-2015 by Vladimir Zapolskiy <vz(a)mleia.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -20,12 +20,23 @@ void reset_cpu(ulong addr) /* Enable watchdog clock */ setbits_le32(&clk->timclk_ctrl, CLK_TIMCLK_WATCHDOG); - /* Reset pulse length is 13005 peripheral clock frames */ - writel(13000, &wdt->pulse); + /* To be compatible with the original U-Boot code: + * addr: - 0: perform hard reset. + * - !=0: perform a soft reset; i.e. "RESOUT_N" not asserted). */ + if (addr == 0) { + /* Reset pulse length is 13005 peripheral clock frames */ + writel(13000, &wdt->pulse); - /* Force WDOG_RESET2 and RESOUT_N signal active */ - writel(WDTIM_MCTRL_RESFRC2 | WDTIM_MCTRL_RESFRC1 | WDTIM_MCTRL_M_RES2, - &wdt->mctrl); + /* Force WDOG_RESET2 and RESOUT_N signal active */ + writel(WDTIM_MCTRL_RESFRC2 | WDTIM_MCTRL_RESFRC1 + | WDTIM_MCTRL_M_RES2, &wdt->mctrl); + } else { + /* Force match output active */ + writel(0x01, &wdt->emr); + + /* Internal reset on match output (no pulse on "RESOUT_N") */ + writel(WDTIM_MCTRL_M_RES1, &wdt->mctrl); + } while (1) /* NOP */; -- 1.8.3.1

2 1

[U-Boot] [PATCH v2] integrator: switch to DM serial port
by Linus Walleij 13 Aug '15

13 Aug '15

This switches the Integrator boards over to using the device model for its serial ports. Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v1->v2: - Moved CONFIG_DM and CONFIG_DM_SERIAL to Kconfig selects - Moved CONFIG_SYS_MALLOC_F_LEN to Kconfig option --- arch/arm/Kconfig | 2 ++ arch/arm/mach-integrator/Kconfig | 3 +++ board/armltd/integrator/integrator.c | 18 ++++++++++++++++++ include/configs/integrator-common.h | 5 +++++ include/configs/integratorap.h | 11 ----------- include/configs/integratorcp.h | 9 --------- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3355b3bcaa58..04006176553c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -457,6 +457,8 @@ config ARCH_HIGHBANK config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" + select DM + select DM_SERIAL config ARCH_KEYSTONE bool "TI Keystone" diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index c54d69db0e42..d506ee5b39cd 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -53,4 +53,7 @@ config SYS_CONFIG_NAME default "integratorap" if ARCH_INTEGRATOR_AP default "integratorcp" if ARCH_INTEGRATOR_CP +config SYS_MALLOC_F_LEN + default 0x2000 + endmenu diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index e94ac850c751..cbe706170d0f 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -20,11 +20,29 @@ #include <common.h> #include <netdev.h> #include <asm/io.h> +#include <dm/platdata.h> +#include <dm/platform_data/serial_pl01x.h> #include "arm-ebi.h" #include "integrator-sc.h" DECLARE_GLOBAL_DATA_PTR; +static const struct pl01x_serial_platdata serial_platdata = { + .base = 0x16000000, +#ifdef CONFIG_ARCH_CINTEGRATOR + .type = TYPE_PL011, + .clock = 14745600, +#else + .type = TYPE_PL010, + .clock = 0, /* Not used for PL010 */ +#endif +}; + +U_BOOT_DEVICE(integrator_serials) = { + .name = "serial_pl01x", + .platdata = &serial_platdata, +}; + void peripheral_power_enable (void); #if defined(CONFIG_SHOW_BOOT_PROGRESS) diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 1d307ca1e6a8..a22efd699c17 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -20,6 +20,11 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ +/* Serial port PL010/PL011 through the device model */ +#define CONFIG_PL01X_SERIAL +#define CONFIG_BAUDRATE 38400 +#define CONFIG_CONS_INDEX 0 + #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_OF_LIBFDT /* enable passing a Device Tree */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index c76ebcbb60a9..26aa8cadc01d 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -21,17 +21,6 @@ #define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */ /* - * PL010 Configuration - */ -#define CONFIG_PL010_SERIAL -#define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 38400 -#define CONFIG_PL01x_PORTS { (void *) (CONFIG_SYS_SERIAL0), (void *) (CONFIG_SYS_SERIAL1) } -#define CONFIG_SYS_SERIAL0 0x16000000 -#define CONFIG_SYS_SERIAL1 0x17000000 - - -/* * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index d6f260287534..4d04f544c815 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -28,15 +28,6 @@ #define CONFIG_SMC91111_BASE 0xC8000000 #undef CONFIG_SMC91111_EXT_PHY -/* PL011 configuration */ -#define CONFIG_PL011_SERIAL -#define CONFIG_PL011_CLOCK 14745600 -#define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 } -#define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 38400 -#define CONFIG_SYS_SERIAL0 0x16000000 -#define CONFIG_SYS_SERIAL1 0x17000000 - /* * Command line configuration. */ -- 2.4.3

2 1

[U-Boot] [PATCH v3 0/4] ARM & m68k: cache: add weak cache code then enable usb cache support
by Josh Wu 13 Aug '15

13 Aug '15

This series add empty stub for invalidate/flush dcache functions, so that usb driver can enable cache support. Also it include patch to clean up the ARM cache code: - add weak functions for flush_cache(). - make them use the weak function flush_cache(). - remove not used code in flush_cache() in lib/cache.c. Changes in v3: - add Angelo's Acked-by. - remove the same functions in the cpu/ files as they will use the weak function provided in lib/cache.c Changes in v2: - CONFIG_DM_USB in periodic_unlink() should be remove as well. This version remove it. - Add Hans de Goede's acked-by. Josh Wu (4): m68k: cache: add an empty stub functions for invalidate/flush dcache ARM: cache: add an empty stub function for invalidate/flush dcache ARM: cache: implement a default weak flush_cache() function usb: ohci: enable cache support arch/arm/cpu/arm1136/cpu.c | 17 ----------------- arch/arm/cpu/arm926ejs/cache.c | 17 ----------------- arch/arm/cpu/armv7/cache_v7.c | 21 --------------------- arch/arm/cpu/armv8/cache_v8.c | 16 ---------------- arch/arm/lib/cache.c | 35 ++++++++++++++--------------------- arch/m68k/lib/cache.c | 9 +++++++++ drivers/usb/host/ohci-hcd.c | 12 +----------- drivers/usb/host/ohci.h | 2 +- 8 files changed, 25 insertions(+), 104 deletions(-) -- 1.9.1

3 16