December 2014 - U-Boot

[U-Boot] [PATCH] dm: sh: serial: Add support driver model
by Nobuhiro Iwamatsu 12 Dec '14

12 Dec '14

This adds driver model support with this driver. This was tested by Koelsch board and Gose board. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- drivers/serial/serial_sh.c | 299 ++++++++++++++++++++++++----------- drivers/serial/serial_sh.h | 10 +- include/dm/platform_data/serial_sh.h | 37 +++++ 3 files changed, 245 insertions(+), 101 deletions(-) create mode 100644 include/dm/platform_data/serial_sh.h diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index 7c1f271..dd5f9bf 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -1,78 +1,20 @@ /* * SuperH SCIF device driver. * Copyright (C) 2013 Renesas Electronics Corporation - * Copyright (C) 2007,2008,2010 Nobuhiro Iwamatsu + * Copyright (C) 2007,2008,2010, 2014 Nobuhiro Iwamatsu * Copyright (C) 2002 - 2008 Paul Mundt * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <dm.h> #include <asm/io.h> #include <asm/processor.h> -#include "serial_sh.h" #include <serial.h> #include <linux/compiler.h> - -#if defined(CONFIG_CONS_SCIF0) -# define SCIF_BASE SCIF0_BASE -#elif defined(CONFIG_CONS_SCIF1) -# define SCIF_BASE SCIF1_BASE -#elif defined(CONFIG_CONS_SCIF2) -# define SCIF_BASE SCIF2_BASE -#elif defined(CONFIG_CONS_SCIF3) -# define SCIF_BASE SCIF3_BASE -#elif defined(CONFIG_CONS_SCIF4) -# define SCIF_BASE SCIF4_BASE -#elif defined(CONFIG_CONS_SCIF5) -# define SCIF_BASE SCIF5_BASE -#elif defined(CONFIG_CONS_SCIF6) -# define SCIF_BASE SCIF6_BASE -#elif defined(CONFIG_CONS_SCIF7) -# define SCIF_BASE SCIF7_BASE -#else -# error "Default SCIF doesn't set....." -#endif - -#if defined(CONFIG_SCIF_A) - #define SCIF_BASE_PORT PORT_SCIFA -#else - #define SCIF_BASE_PORT PORT_SCIF -#endif - -static struct uart_port sh_sci = { - .membase = (unsigned char*)SCIF_BASE, - .mapbase = SCIF_BASE, - .type = SCIF_BASE_PORT, -}; - -static void sh_serial_setbrg(void) -{ - DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_SCIF_USE_EXT_CLK - unsigned short dl = DL_VALUE(gd->baudrate, CONFIG_SH_SCIF_CLK_FREQ); - sci_out(&sh_sci, DL, dl); - /* Need wait: Clock * 1/dl $B!_(B 1/16 */ - udelay((1000000 * dl * 16 / CONFIG_SYS_CLK_FREQ) * 1000 + 1); -#else - sci_out(&sh_sci, SCBRR, - SCBRR_VALUE(gd->baudrate, CONFIG_SH_SCIF_CLK_FREQ)); -#endif -} - -static int sh_serial_init(void) -{ - sci_out(&sh_sci, SCSCR , SCSCR_INIT(&sh_sci)); - sci_out(&sh_sci, SCSCR , SCSCR_INIT(&sh_sci)); - sci_out(&sh_sci, SCSMR, 0); - sci_out(&sh_sci, SCSMR, 0); - sci_out(&sh_sci, SCFCR, SCFCR_RFRST|SCFCR_TFRST); - sci_in(&sh_sci, SCFCR); - sci_out(&sh_sci, SCFCR, 0); - - serial_setbrg(); - return 0; -} +#include <dm/platform_data/serial_sh.h> +#include "serial_sh.h" #if defined(CONFIG_CPU_SH7760) || \ defined(CONFIG_CPU_SH7780) || \ @@ -109,83 +51,249 @@ static int scif_rxfill(struct uart_port *port) } #endif -static int serial_rx_fifo_level(void) +static void sh_serial_init_generic(struct uart_port *port) +{ + sci_out(port, SCSCR , SCSCR_INIT(port)); + sci_out(port, SCSCR , SCSCR_INIT(port)); + sci_out(port, SCSMR, 0); + sci_out(port, SCSMR, 0); + sci_out(port, SCFCR, SCFCR_RFRST|SCFCR_TFRST); + sci_in(port, SCFCR); + sci_out(port, SCFCR, 0); +} + +static void +sh_serial_setbrg_generic(struct uart_port *port, int clk, int baudrate) { - return scif_rxfill(&sh_sci); + if (port->clk_mode == EXT_CLK) { + unsigned short dl = DL_VALUE(baudrate, clk); + sci_out(port, DL, dl); + /* Need wait: Clock * 1/dl $B!_(B 1/16 */ + udelay((1000000 * dl * 16 / clk) * 1000 + 1); + } else { + sci_out(port, SCBRR, SCBRR_VALUE(baudrate, clk)); + } } -static void handle_error(void) +static void handle_error(struct uart_port *port) { - sci_in(&sh_sci, SCxSR); - sci_out(&sh_sci, SCxSR, SCxSR_ERROR_CLEAR(&sh_sci)); - sci_in(&sh_sci, SCLSR); - sci_out(&sh_sci, SCLSR, 0x00); + sci_in(port, SCxSR); + sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port)); + sci_in(port, SCLSR); + sci_out(port, SCLSR, 0x00); } -static void serial_raw_putc(const char c) +static void serial_raw_putc(struct uart_port *port, const char c) { while (1) { /* Tx fifo is empty */ - if (sci_in(&sh_sci, SCxSR) & SCxSR_TEND(&sh_sci)) + if (sci_in(port, SCxSR) & SCxSR_TEND(port)) break; } - sci_out(&sh_sci, SCxTDR, c); - sci_out(&sh_sci, SCxSR, sci_in(&sh_sci, SCxSR) & ~SCxSR_TEND(&sh_sci)); + sci_out(port, SCxTDR, c); + sci_out(port, SCxSR, sci_in(port, SCxSR) & ~SCxSR_TEND(port)); } -static void sh_serial_putc(const char c) +static void sh_serial_putc_generic(struct uart_port *port, const char c) { if (c == '\n') - serial_raw_putc('\r'); - serial_raw_putc(c); + serial_raw_putc(port, '\r'); + serial_raw_putc(port, c); } -static int sh_serial_tstc(void) +static int serial_rx_fifo_level(struct uart_port *port) { - if (sci_in(&sh_sci, SCxSR) & SCIF_ERRORS) { - handle_error(); + return scif_rxfill(port); +} + +static int sh_serial_tstc_generic(struct uart_port *port) +{ + if (sci_in(port, SCxSR) & SCIF_ERRORS) { + handle_error(port); return 0; } - return serial_rx_fifo_level() ? 1 : 0; + return serial_rx_fifo_level(port) ? 1 : 0; } - -static int serial_getc_check(void) +static int serial_getc_check(struct uart_port *port) { unsigned short status; - status = sci_in(&sh_sci, SCxSR); + status = sci_in(port, SCxSR); if (status & SCIF_ERRORS) - handle_error(); - if (sci_in(&sh_sci, SCLSR) & SCxSR_ORER(&sh_sci)) - handle_error(); - return status & (SCIF_DR | SCxSR_RDxF(&sh_sci)); + handle_error(port); + if (sci_in(port, SCLSR) & SCxSR_ORER(port)) + handle_error(port); + return status & (SCIF_DR | SCxSR_RDxF(port)); } -static int sh_serial_getc(void) +static int sh_serial_getc_generic(struct uart_port *port) { unsigned short status; char ch; - while (!serial_getc_check()) + while (!serial_getc_check(port)) ; - ch = sci_in(&sh_sci, SCxRDR); - status = sci_in(&sh_sci, SCxSR); + ch = sci_in(port, SCxRDR); + status = sci_in(port, SCxSR); - sci_out(&sh_sci, SCxSR, SCxSR_RDxF_CLEAR(&sh_sci)); + sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port)); if (status & SCIF_ERRORS) - handle_error(); + handle_error(port); + + if (sci_in(port, SCLSR) & SCxSR_ORER(port)) + handle_error(port); - if (sci_in(&sh_sci, SCLSR) & SCxSR_ORER(&sh_sci)) - handle_error(); return ch; } +#ifdef CONFIG_DM_SERIAL + +static int sh_serial_pending(struct udevice *dev, bool input) +{ + struct uart_port *priv = dev_get_priv(dev); + + return sh_serial_tstc_generic(priv); +} + +static int sh_serial_putc(struct udevice *dev, const char ch) +{ + struct uart_port *priv = dev_get_priv(dev); + + sh_serial_putc_generic(priv, ch); + + return 0; +} + +static int sh_serial_getc(struct udevice *dev) +{ + struct uart_port *priv = dev_get_priv(dev); + + return sh_serial_getc_generic(priv); +} + +static int sh_serial_setbrg(struct udevice *dev, int baudrate) +{ + struct sh_serial_platdata *plat = dev_get_platdata(dev); + struct uart_port *priv = dev_get_priv(dev); + + sh_serial_setbrg_generic(priv, plat->clk, baudrate); + + return 0; +} + +static int sh_serial_probe(struct udevice *dev) +{ + struct sh_serial_platdata *plat = dev_get_platdata(dev); + struct uart_port *priv = dev_get_priv(dev); + + priv->membase = (unsigned char *)plat->base; + priv->mapbase = plat->base; + priv->type = plat->type; + priv->clk_mode = plat->clk_mode; + + sh_serial_init_generic(priv); + + return 0; +} + +static const struct dm_serial_ops sh_serial_ops = { + .putc = sh_serial_putc, + .pending = sh_serial_pending, + .getc = sh_serial_getc, + .setbrg = sh_serial_setbrg, +}; + +U_BOOT_DRIVER(serial_sh) = { + .name = "serial_sh", + .id = UCLASS_SERIAL, + .probe = sh_serial_probe, + .ops = &sh_serial_ops, + .flags = DM_FLAG_PRE_RELOC, + .priv_auto_alloc_size = sizeof(struct uart_port), +}; + +#else /* CONFIG_DM_SERIAL */ + +#if defined(CONFIG_CONS_SCIF0) +# define SCIF_BASE SCIF0_BASE +#elif defined(CONFIG_CONS_SCIF1) +# define SCIF_BASE SCIF1_BASE +#elif defined(CONFIG_CONS_SCIF2) +# define SCIF_BASE SCIF2_BASE +#elif defined(CONFIG_CONS_SCIF3) +# define SCIF_BASE SCIF3_BASE +#elif defined(CONFIG_CONS_SCIF4) +# define SCIF_BASE SCIF4_BASE +#elif defined(CONFIG_CONS_SCIF5) +# define SCIF_BASE SCIF5_BASE +#elif defined(CONFIG_CONS_SCIF6) +# define SCIF_BASE SCIF6_BASE +#elif defined(CONFIG_CONS_SCIF7) +# define SCIF_BASE SCIF7_BASE +#else +# error "Default SCIF doesn't set....." +#endif + +#if defined(CONFIG_SCIF_A) + #define SCIF_BASE_PORT PORT_SCIFA +#else + #define SCIF_BASE_PORT PORT_SCIF +#endif + +static struct uart_port sh_sci = { + .membase = (unsigned char *)SCIF_BASE, + .mapbase = SCIF_BASE, + .type = SCIF_BASE_PORT, +#ifdef CONFIG_SCIF_USE_EXT_CLK + .clk_mode = EXT_CLK, +#endif +}; + +static void sh_serial_setbrg(void) +{ + DECLARE_GLOBAL_DATA_PTR; + struct uart_port *port = &sh_sci; + + sh_serial_setbrg_generic(port, CONFIG_SH_SCIF_CLK_FREQ, gd->baudrate); +} + +static int sh_serial_init(void) +{ + struct uart_port *port = &sh_sci; + + sh_serial_init_generic(port); + serial_setbrg(); + + return 0; +} + +static void sh_serial_putc(const char c) +{ + struct uart_port *port = &sh_sci; + + sh_serial_putc_generic(port, c); +} + +static int sh_serial_tstc(void) +{ + struct uart_port *port = &sh_sci; + + return sh_serial_tstc_generic(port); +} + +static int sh_serial_getc(void) +{ + struct uart_port *port = &sh_sci; + + return sh_serial_getc_generic(port); +} + static struct serial_device sh_serial_drv = { .name = "sh_serial", .start = sh_serial_init, @@ -206,3 +314,4 @@ __weak struct serial_device *default_serial_console(void) { return &sh_serial_drv; } +#endif /* CONFIG_DM_SERIAL */ diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index ef88c8f..4b6199a 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -2,18 +2,16 @@ * Copy and modify from linux/drivers/serial/sh-sci.h */ +#include <dm/platform_data/serial_sh.h> + struct uart_port { unsigned long iobase; /* in/out[bwl] */ unsigned char *membase; /* read/write[bwl] */ unsigned long mapbase; /* for ioremap */ - unsigned int type; /* port type */ + enum sh_serial_type type; /* port type */ + enum sh_clk_mode clk_mode; /* clock mode */ }; -#define PORT_SCI 52 -#define PORT_SCIF 53 -#define PORT_SCIFA 83 -#define PORT_SCIFB 93 - #if defined(CONFIG_H83007) || defined(CONFIG_H83068) #include <asm/regs306x.h> #endif diff --git a/include/dm/platform_data/serial_sh.h b/include/dm/platform_data/serial_sh.h new file mode 100644 index 0000000..0271ad6 --- /dev/null +++ b/include/dm/platform_data/serial_sh.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> + * Copyright (c) 2014 Renesas Electronics Corporation + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __serial_sh_h +#define __serial_sh_h + +enum sh_clk_mode { + INT_CLK, + EXT_CLK, +}; + +enum sh_serial_type { + PORT_SCI, + PORT_SCIF, + PORT_SCIFA, + PORT_SCIFB, +}; + +/* + * Information about SCIF port + * + * @base: Register base address + * @clk: Input clock rate, used for calculating the baud rate divisor + * @clk_mode: Clock mode, set internal (INT) or external (EXT) + * @type: Type of SCIF + */ +struct sh_serial_platdata { + unsigned long base; + unsigned int clk; + enum sh_clk_mode clk_mode; + enum sh_serial_type type; +}; +#endif /* __serial_sh_h */ -- 2.1.3

2 2

[U-Boot] Please pull u-boot-fsl-qoriq.git master
by York Sun 12 Dec '14

12 Dec '14

Tom, This replace PR sent earlier today. The following changes since commit 32fdf0e4d82bdca5d64d86330e461e59685f9959: Prepare v2015.01-rc3 (2014-12-08 16:35:08 -0500) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git master for you to fetch changes up to d0419f400af6f4bbe5c4ee5c97f6fbbdedec6cf3: ARM: HYP/non-sec: Fix the ARCH Timer frequency setting for sun7i (2014-12-11 12:37:42 -0800) ---------------------------------------------------------------- Alison Wang (12): ls102xa: pblimage: Add pblimage tool support for LS102xA spl: Use u-boot.img instead of u-boot.bin arm: spl: Add I2C linker list in generic .lds kconfig: ls1021a: add SUPPORT_SPL ls102xa: qixis: Add CONFIG_QIXIS_I2C_ACCESS macro arm: ls102xa: Add SD boot support for LS1021AQDS board arm: ls102xa: Add SD boot support for LS1021ATWR board arm: ls1021a: Add CONFIG_DOS_PARTITION and CONFIG_CMD_FAT support arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support arm: ls102xa: Add QSPI boot support for LS1021AQDS/TWR board arm: ls102xa: Add NAND boot support for LS1021AQDS board kconfig: ls102xa: Change the prompt messages Chenhui Zhao (1): ls1021aqds: set the default I2C channel before DDR init Jaiprakash Singh (1): driver/mtd: Fix IFC compilation warnings Minghuan Lian (1): arm: ls102xa: Update PCIe dts node status Nikhil Badola (3): drivers: usb: Make usb device-tree fixup code architecture independent drivers: usb: fsl: Add USB device-tree errata framework drivers: usb: fsl: Check USB Erratum A007792 applicability Tang Yuantian (2): arm: ls102xa: fixed a bus frequency setting error fsl/sleep: updated the deep sleep framework for QorIQ platforms Xiubo Li (7): ARM: HYP/non-sec: add the pen address BE mode support. ARM: HYP/non-sec: Fix the ARCH Timer frequency setting. ls1021a: adding a secondary core boot address and kick functions ls102xa: changing a few targets' configurations. ARM: ls102xa: allow all the peripheral access permission as R/W. ARM: ls102xa: Setting device's stream id for SMMUs. ARM: HYP/non-sec: Fix the ARCH Timer frequency setting for sun7i Yao Yuan (1): ls1021aqds: add hwconfig setting to do pin mux chenhui zhao (1): arm: ls102xa: clear EPU registers for deep sleep Makefile | 11 +- arch/arm/Kconfig | 6 +- arch/arm/cpu/armv7/ls102xa/Makefile | 2 + arch/arm/cpu/armv7/ls102xa/cpu.c | 34 +++ arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 57 ++++ arch/arm/cpu/armv7/ls102xa/fsl_epu.h | 68 +++++ arch/arm/cpu/armv7/ls102xa/spl.c | 33 +++ arch/arm/cpu/armv7/nonsec_virt.S | 7 +- arch/arm/cpu/u-boot-spl.lds | 3 + arch/arm/include/asm/arch-ls102xa/config.h | 9 + arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 9 + .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 17 ++ arch/arm/include/asm/arch-ls102xa/ns_access.h | 118 ++++++++ arch/arm/include/asm/arch-ls102xa/spl.h | 20 ++ arch/arm/include/asm/pcie_layerscape.h | 13 + arch/powerpc/cpu/mpc8xxx/fdt.c | 104 ------- board/freescale/common/Makefile | 10 + board/freescale/common/arm_sleep.c | 95 +++++++ board/freescale/common/ls102xa_stream_id.c | 18 ++ board/freescale/common/mpc85xx_sleep.c | 88 ++++++ board/freescale/common/ns_access.c | 30 +++ board/freescale/common/qixis.h | 7 + board/freescale/common/sleep.h | 21 ++ board/freescale/ls1021aqds/MAINTAINERS | 3 + board/freescale/ls1021aqds/ddr.c | 5 +- board/freescale/ls1021aqds/ls1021aqds.c | 283 ++++++++++++++++++-- board/freescale/ls1021aqds/ls102xa_pbi.cfg | 12 + board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg | 7 + board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg | 14 + board/freescale/ls1021atwr/MAINTAINERS | 2 + board/freescale/ls1021atwr/ls1021atwr.c | 151 +++++++++++ board/freescale/ls1021atwr/ls102xa_pbi.cfg | 12 + board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg | 14 + configs/ls1021aqds_nand_defconfig | 4 + configs/ls1021aqds_qspi_defconfig | 3 + configs/ls1021aqds_sdcard_defconfig | 4 + configs/ls1021atwr_qspi_defconfig | 3 + configs/ls1021atwr_sdcard_defconfig | 4 + drivers/ddr/fsl/arm_ddr_gen3.c | 45 +++- drivers/ddr/fsl/fsl_ddr_gen4.c | 44 ++- drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 67 ++--- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_spl.c | 10 + drivers/pci/Makefile | 1 + drivers/pci/pcie_layerscape.c | 51 ++++ drivers/usb/host/ehci-fsl.c | 186 +++++++++++++ include/configs/ls1021aqds.h | 175 +++++++++++- include/configs/ls1021atwr.h | 95 ++++++- include/configs/sun7i.h | 1 + include/fsl_ddr_sdram.h | 12 +- include/fsl_usb.h | 23 ++ tools/pblimage.c | 110 +++++--- 53 files changed, 1904 insertions(+), 221 deletions(-) create mode 100644 arch/arm/cpu/armv7/ls102xa/fsl_epu.c create mode 100644 arch/arm/cpu/armv7/ls102xa/fsl_epu.h create mode 100644 arch/arm/cpu/armv7/ls102xa/spl.c create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h create mode 100644 arch/arm/include/asm/arch-ls102xa/ns_access.h create mode 100644 arch/arm/include/asm/arch-ls102xa/spl.h create mode 100644 arch/arm/include/asm/pcie_layerscape.h create mode 100644 board/freescale/common/arm_sleep.c create mode 100644 board/freescale/common/ls102xa_stream_id.c create mode 100644 board/freescale/common/mpc85xx_sleep.c create mode 100644 board/freescale/common/ns_access.c create mode 100644 board/freescale/common/sleep.h create mode 100644 board/freescale/ls1021aqds/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021aqds_nand_defconfig create mode 100644 configs/ls1021aqds_qspi_defconfig create mode 100644 configs/ls1021aqds_sdcard_defconfig create mode 100644 configs/ls1021atwr_qspi_defconfig create mode 100644 configs/ls1021atwr_sdcard_defconfig create mode 100644 drivers/pci/pcie_layerscape.c Thanks. York

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 12 Dec '14

12 Dec '14

Hi Tom, minor USB fixes. The following changes since commit 0d485b9095328cdc81b2ee94ff59b988c69b9127: Merge branch 'master' of git://git.denx.de/u-boot-sunxi (2014-11-13 10:35:13 -0500) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 0c6de8853b2571251fdefe34598e0c344fe1372b: usb: ehci: do not set the LSB of Current qTD pointer (2014-11-19 23:31:54 +0100) ---------------------------------------------------------------- Masahiro Yamada (1): usb: ehci: do not set the LSB of Current qTD pointer Peng Fan (3): usb:ehci-mx6 add phy mode query function imx:mx6slevk add board level support for usb imx:mx6sxsabresd add board level support for usb Łukasz Majewski (2): dfu: thor: fix: Modify dfu_get_alt() function to support absolute paths test: ums: Add sleep before unmount directory arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 5 +++++ board/freescale/mx6slevk/mx6slevk.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/mx6sxsabresd/mx6sxsabresd.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/dfu/dfu.c | 29 +++++++++++++++++++++++++++-- drivers/usb/host/ehci-hcd.c | 1 - drivers/usb/host/ehci-mx6.c | 27 +++++++++++++++++++++++++-- include/configs/mx6slevk.h | 14 ++++++++++++++ include/configs/mx6sxsabresd.h | 14 ++++++++++++++ include/usb/ehci-fsl.h | 2 ++ test/ums/ums_gadget_test.sh | 10 +++++++++- 10 files changed, 194 insertions(+), 6 deletions(-)

2 1

[U-Boot] [PATCHv4 0/6] ls102xa: HYP/non-sec: for ls102xa.
by Xiubo Li 11 Dec '14

11 Dec '14

Change for V4: - Split V3's 3/5 patch in two. - Add a strong version of smp_kick_all_cpus(). Change for V3: - Fixed the language in commit message. Change for V2: - All the registers were defined as a struct, here use it. - Used CONFIG_PEN_ADDR_BIG_ENDIAN instead of CONFIG_SOC_BIG_ENDIAN. Xiubo Li (6): ARM: HYP/non-sec: add the pen address BE mode support. ARM: HYP/non-sec: Fix the ARCH Timer frequency setting. ls1021a: adding a secondary core boot address and kick functions ls102xa: changing a few targets' configurations. ARM: ls102xa: allow all the peripheral access permission as R/W. ARM: ls102xa: Setting device's stream id for SMMUs. arch/arm/cpu/armv7/ls102xa/cpu.c | 18 ++++ arch/arm/cpu/armv7/nonsec_virt.S | 7 +- arch/arm/include/asm/arch-ls102xa/config.h | 3 + arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 3 + .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 17 +++ arch/arm/include/asm/arch-ls102xa/ns_access.h | 118 +++++++++++++++++++++ board/freescale/common/Makefile | 4 + board/freescale/common/ls102xa_stream_id.c | 18 ++++ board/freescale/common/ns_access.c | 30 ++++++ board/freescale/ls1021aqds/ls1021aqds.c | 113 ++++++++++++++++++++ board/freescale/ls1021atwr/ls1021atwr.c | 112 +++++++++++++++++++ include/configs/ls1021aqds.h | 10 ++ include/configs/ls1021atwr.h | 10 ++ include/configs/sun7i.h | 1 + 14 files changed, 462 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h create mode 100644 arch/arm/include/asm/arch-ls102xa/ns_access.h create mode 100644 board/freescale/common/ls102xa_stream_id.c create mode 100644 board/freescale/common/ns_access.c -- 2.1.0.27.g96db324

2 12

[U-Boot] [PATCHv4 respin 2/6] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.
by Xiubo Li 11 Dec '14

11 Dec '14

For some SoCs, the system clock frequency may not equal to the ARCH Timer's frequency. This patch uses the CONFIG_TIMER_CLK_FREQ instead of CONFIG_SYS_CLK_FREQ, then the system clock macro and arch timer macor could be set separately and without interfering each other. Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- Hi Albert, I there is one mistake about the CONFIG_TIMER_CLK_FREQ defination for sun7i platform. So i respin this patch separately. Thanks, BRs Xiubo arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- include/configs/sun7i.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 1ab5d54..30d81db 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -169,11 +169,11 @@ ENTRY(_nonsec_init) * we do this here instead. * But first check if we have the generic timer. */ -#ifdef CONFIG_SYS_CLK_FREQ +#ifdef CONFIG_TIMER_CLK_FREQ mrc p15, 0, r0, c0, c1, 1 @ read ID_PFR1 and r0, r0, #CPUID_ARM_GENTIMER_MASK @ mask arch timer bits cmp r0, #(1 << CPUID_ARM_GENTIMER_SHIFT) - ldreq r1, =CONFIG_SYS_CLK_FREQ + ldreq r1, =CONFIG_TIMER_CLK_FREQ mcreq p15, 0, r1, c14, c0, 0 @ write CNTFRQ #endif diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index ea40790..368d527 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -28,6 +28,7 @@ #define CONFIG_ARMV7_PSCI_NR_CPUS 2 #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE #define CONFIG_SYS_CLK_FREQ 24000000 +#define CONFIG_TIMER_CLK_FREQ CONFIG_SYS_CLK_FREQ /* * Include common sunxi configuration where most the settings are -- 2.1.0.27.g96db324

2 2

Re: [U-Boot] [PATCH v5 3/3] ARM: tegra: Add support for nyan-big board
by Simon Glass 11 Dec '14

11 Dec '14

Hi Tom, On 11 December 2014 at 08:58, Tom Warren <TWarren(a)nvidia.com> wrote: > Simon, > > Feel free to do everything in the DM tree. Once DM makes it to mainline, and hence to ARM and Tegra, we'll be better able to add Tegra things into the Tegra repo. OK, I'll pull in the nyan-big patches to DM then I2C and retest. - Simon > > Tom > >> -----Original Message----- >> From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon Glass >> Sent: Thursday, December 11, 2014 7:22 AM >> To: Tom Warren >> Cc: U-Boot Mailing List; Stephen Warren; Allen Martin; Stephen Warren; >> Albert Aribaud >> Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for nyan-big board >> >> Hi Tom, >> >> On 10 December 2014 at 14:45, Simon Glass <sjg(a)chromium.org> wrote: >> > >> > Hi Tom, >> > >> > On 10 December 2014 at 14:09, Tom Warren <TWarren(a)nvidia.com> >> wrote: >> > > Simon, >> > > >> > >> -----Original Message----- >> > >> From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon >> > >> Glass >> > >> Sent: Wednesday, December 10, 2014 2:04 PM >> > >> To: Tom Warren >> > >> Cc: U-Boot Mailing List; Stephen Warren; Allen Martin; Stephen >> > >> Warren; Albert Aribaud >> > >> Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for nyan-big >> > >> board >> > >> >> > >> Hi Tom, >> > >> >> > >> On 10 December 2014 at 12:36, Simon Glass <sjg(a)chromium.org> >> wrote: >> > >> > Hi Tom, >> > >> > >> > >> > On Dec 10, 2014 12:05 PM, "Tom Warren" <TWarren(a)nvidia.com> >> wrote: >> > >> >> >> > >> >> Simon, >> > >> >> >> > >> >> > -----Original Message----- >> > >> >> > From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of >> > >> >> > Simon Glass >> > >> >> > Sent: Wednesday, December 10, 2014 10:50 AM >> > >> >> > To: Tom Warren >> > >> >> > Cc: U-Boot Mailing List; Allen Martin; Albert Aribaud; Stephen >> > >> >> > Warren; Stephen Warren >> > >> >> > Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for >> > >> >> > nyan-big board >> > >> >> > >> > >> >> > Hi Tom, >> > >> >> > >> > >> >> > >> > >> >> > On 10 December 2014 at 10:39, Tom Warren >> <TWarren(a)nvidia.com> >> > >> wrote: >> > >> >> > > Simon, >> > >> >> > > >> > >> >> > > The v4 PCIE patch series fails to apply to >> > >> >> > > u-boot-tegra/master after >> > >> >> > rebasing my repo against both ARM master and U-Boot 'master' >> > >> >> > master (i.e. >> > >> >> > FETCH_HEAD = >> > >> >> > > 32fdf0e4d82bdca5d64d86330e461e59685f9959 branch >> 'master' of >> > >> >> > git://git.denx.de/u-boot). 3 - 4 patches fail when using git am. >> > >> >> > > >> > >> >> > > I worked thru the conflicts for both branches (my master >> > >> >> > > rebased against >> > >> >> > ARM and U-Boot TOT), and did a MAKEALL -s tegra, and >> > >> >> > jetson-tk1, beaver and cardhu fail to build (jetson err log >> > >> >> > below). Looks like you developed this with your DM I2C series in >> place? >> > >> >> > > >> > >> >> > > To submit a PR from the Tegra repo, I need to either rebase >> > >> >> > > first against >> > >> >> > ARM master (my SOP), or against U-Boot 'master'. So you >> > >> >> > patches, if they're bound for the Tegra repo, need to work in >> > >> >> > one of those scenarios. >> > >> >> > > >> > >> >> > > Tom >> > >> >> > >> > >> >> > Thanks for looking at it. This series depends on the I2C >> > >> >> > driver model series. >> > >> >> > It's available at u-boot-dm/i2c-working if you want to check >> > >> >> > it out. I plan to apply that very soon. >> > >> >> > >> > >> >> > I'm sorry I didn't make that clear in this series. I mentioned >> > >> >> > it on the list at one point but should have added it here. If >> > >> >> > you like, you could ack it and I can apply to u-boot-dm after >> > >> >> > I2C is in there. >> > >> >> I can't ACK something that I can't get to apply to my repo nor >> > >> >> build nor test. So you'll have to wait on that from Stephen, >> > >> >> Thierry (based on code >> > >> >> review) or someone that wants to add DM I2C to Tegra, apply your >> > >> >> PCIe patches, and test. That's not my normal workflow, though, >> > >> >> and I don't have the BW to devote to extra hurdles right now. >> > >> >> >> > >> > >> > >> > You could try applying to u-boot-dm/i2c-working. It only has the >> > >> > DM i2c series in it, plus Tegra stuff. I put a lot of time into >> > >> > cleaning up this Tegra series to save you and Thierry time. >> > >> >> > >> Also Thierry took a look the PCIe series and responded here: >> > >> >> > >> http://patchwork.ozlabs.org/patch/410175/ >> > >> >> > >> There were three nits which I have addressed. >> > >> >> > >> For this Nyan-big patch I really don't need a test credit (would be >> > >> nice, but not necessary). After all it's a new board and if >> > >> problems are found they can be fixed. But I do need to apply it before >> DM I2C. >> > >> Stephen has looked at a few revs. >> > >> >> > >> How about this for a plan: >> > >> >> > >> - Apply Nyan-big to DM >> > >> - Apply DM I2C series to DM >> > >> - Pull request to mainline (final for DM this release unless SPL is >> > >> resolved >> > >> somehow) >> > >> >> > >> Then if you have time: >> > >> - Tom - apply PCIe to Tegra tree >> > >> - Pull request to mainline >> > > The problem there is that I'd need to wait for the PR to mainline to go >> thru before I could rebase Tegra against mainline, and only then apply PCIe >> patches. Time-wise, it's obviously better for you to do this in one fell swoop >> from the DM repo. >> > > >> > > Does the nyan-big patchset apply/build cleanly in u-boot-tegra/master? If >> so, I can apply it and do a Tegra test build and then send a PR to Albert if all is >> clear. >> > >> > OK, true. >> > >> > The Tegra tree is too far behind master, but if you catch it up you >> > can make it work: >> > >> > (try-nyan=9e10b9: b/ common/ doc/ sandbox/) u> pwclient git-am 417781 >> > Applying patch #417781 using 'git am' >> > Description: [U-Boot,v5,1/3] dts: Bring in Chrome OS keyboard device >> > tree definition >> > Applying: dts: Bring in Chrome OS keyboard device tree definition >> > (try-nyan=ddebcc: b/ common/ doc/ sandbox/) u> pwclient git-am 417782 >> > Applying patch #417782 using 'git am' >> > Description: [U-Boot,v5,2/3] tegra: dts: Sync tegra124.dtsi with linux >> > kernel >> > Applying: tegra: dts: Sync tegra124.dtsi with linux kernel >> > ^[[A(try-nyan=9df313: b/ common/ doc/ sandbox/) u> pwclient git-am >> > 417783 Applying patch #417783 using 'git am' >> > Description: [U-Boot,v5,3/3] ARM: tegra: Add support for nyan-big >> > board >> > Applying: ARM: tegra: Add support for nyan-big board >> > error: patch failed: arch/arm/dts/Makefile:31 >> > error: arch/arm/dts/Makefile: patch does not apply Patch failed at >> > 0001 ARM: tegra: Add support for nyan-big board The copy of the patch >> > that failed is found in: >> > /usr/local/google/home/sjg/u/.git/rebase-apply/patch >> > When you have resolved this problem, run "git am --continue". >> > If you prefer to skip this patch, run "git am --skip" instead. >> > To restore the original branch and stop patching, run "git am --abort". >> > (try-nyan=9df313: b/ common/ doc/ sandbox/) u> patch -p1 < >> > /usr/local/google/home/sjg/u/.git/rebase-apply/patch >> > patching file arch/arm/cpu/armv7/tegra124/Kconfig >> > patching file arch/arm/dts/Makefile >> > Hunk #1 succeeded at 29 with fuzz 2 (offset -2 lines). >> > patching file arch/arm/dts/tegra124-nyan-big.dts >> > patching file board/nvidia/nyan-big/Kconfig patching file >> > board/nvidia/nyan-big/MAINTAINERS patching file >> > board/nvidia/nyan-big/Makefile patching file >> > board/nvidia/nyan-big/nyan-big.c patching file >> > board/nvidia/nyan-big/pinmux-config-nyan-big.h >> > patching file board/nvidia/venice2/as3722_init.h >> > patching file configs/nyan-big_defconfig patching file >> > include/configs/nyan-big.h >> > >> > Then: >> > >> > git add arch/arm/cpu/armv7/tegra124/Kconfig arch/arm/dts/Makefile >> > board/nvidia/venice2/as3722_init.h arch/arm/dts/tegra124-nyan-big.dts >> > board/nvidia/nyan-big/ configs/nyan-big_defconfig >> > include/configs/nyan-big.h git am --resolved >> > >> > I've pushed it to u-boot-dm/for-tom. >> > >> > It all builds cleanly for me. >> > >> > Regards, >> > Simon >> >> Further to this, the I2C patches are in u-boot-dm/master now, except for this >> Tegra I2C conversion, which depends on the nyan-big series: >> >> http://patchwork.ozlabs.org/patch/419730/ >> >> So I would like to bring in the nyan-big series to the DM tree, add this Tegra >> I2C patch and then we are ready to sort out the PCIe series. What do you >> think of that plan? Or if you prefer, I can issue a pull request to mainline for >> the DM stuff to date and you can do the rest? >> >> Regards, >> Simon >> >> > >> > > >> > >> >> > >> If you don't have time, I could do this last bit through DM. In any >> > >> case the problem is that it is getting late and we need to resolve this >> soon. >> > >> >> > >> Regards, >> > >> Simon >> > >> >> > >> > >> > >> > Regards, >> > >> > Simon >> > >> > >> > >> >> Tom >> > >> >> > >> > >> >> > Regards, >> > >> >> > Simon >> > >> >> > > >> > >> >> > > drivers/power/as3722.c: In function 'as3722_read': >> > >> >> > > drivers/power/as3722.c:34: warning: passing argument 1 of >> 'i2c_read' >> > >> >> > > makes integer from pointer without a cast >> > >> >> > > include/i2c.h:235: note: expected 'uint8_t' but argument is >> > >> >> > > of type 'struct >> > >> >> > udevice *' >> > >> >> > > drivers/power/as3722.c:34: warning: passing argument 3 of >> 'i2c_read' >> > >> >> > > makes integer from pointer without a cast >> > >> >> > > include/i2c.h:235: note: expected 'int' but argument is of type 'u8 >> *' >> > >> >> > > drivers/power/as3722.c:34: warning: passing argument 4 of >> 'i2c_read' >> > >> >> > > makes pointer from integer without a cast >> > >> >> > > include/i2c.h:235: note: expected 'uint8_t *' but argument >> > >> >> > > is of type 'int' >> > >> >> > > drivers/power/as3722.c:34: error: too few arguments to >> > >> >> > > function 'i2c_read' >> > >> >> > > drivers/power/as3722.c: In function 'as3722_write': >> > >> >> > > drivers/power/as3722.c:45: warning: passing argument 1 of >> 'i2c_write' >> > >> >> > > makes integer from pointer without a cast >> > >> >> > > include/i2c.h:238: note: expected 'uint8_t' but argument is >> > >> >> > > of type 'struct >> > >> >> > udevice *' >> > >> >> > > drivers/power/as3722.c:45: warning: passing argument 3 of >> 'i2c_write' >> > >> >> > > makes integer from pointer without a cast >> > >> >> > > include/i2c.h:238: note: expected 'int' but argument is of type 'u8 >> *' >> > >> >> > > drivers/power/as3722.c:45: warning: passing argument 4 of >> 'i2c_write' >> > >> >> > > makes pointer from integer without a cast >> > >> >> > > include/i2c.h:238: note: expected 'uint8_t *' but argument >> > >> >> > > is of type 'int' >> > >> >> > > drivers/power/as3722.c:45: error: too few arguments to >> > >> >> > > function >> > >> >> > 'i2c_write' >> > >> >> > > drivers/power/as3722.c: In function 'as3722_init': >> > >> >> > > drivers/power/as3722.c:245: warning: implicit declaration of >> > >> >> > > function >> > >> >> > 'i2c_get_chip_for_busnum' >> > >> >> > > make[1]: *** [drivers/power/as3722.o] Error 1 >> > >> >> > > make: *** [drivers/power] Error 2 >> > >> >> > > make: *** Waiting for unfinished jobs.... >> > >> >> > > >> > >> >> > >> -----Original Message----- >> > >> >> > >> From: Tom Warren >> > >> >> > >> Sent: Wednesday, December 10, 2014 8:46 AM >> > >> >> > >> To: Simon Glass; U-Boot Mailing List >> > >> >> > >> Cc: Allen Martin; Albert Aribaud; Stephen Warren; Stephen >> > >> >> > >> Warren >> > >> >> > >> Subject: RE: [PATCH v5 3/3] ARM: tegra: Add support for >> > >> >> > >> nyan-big board >> > >> >> > >> >> > >> >> > >> Simon, >> > >> >> > >> >> > >> >> > >> > -----Original Message----- >> > >> >> > >> > From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of >> > >> >> > >> > Simon Glass >> > >> >> > >> > Sent: Wednesday, December 10, 2014 8:01 AM >> > >> >> > >> > To: U-Boot Mailing List >> > >> >> > >> > Cc: Allen Martin; Simon Glass; Albert Aribaud; Tom >> > >> >> > >> > Warren; Stephen Warren; Stephen Warren >> > >> >> > >> > Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for >> > >> >> > >> > nyan-big board >> > >> >> > >> > >> > >> >> > >> > Hi, >> > >> >> > >> > >> > >> >> > >> > On 4 December 2014 at 06:36, Simon Glass >> > >> >> > >> > <sjg(a)chromium.org> >> > >> wrote: >> > >> >> > >> > > From: Allen Martin <amartin(a)nvidia.com> >> > >> >> > >> > > >> > >> >> > >> > > Nyan-big is a Tegra124 clamshell board that is very >> > >> >> > >> > > similar to venice2, but it has a different panel, the >> > >> >> > >> > > sdcard cd and wp sense are flipped, and it has a >> > >> >> > >> > > different revision of the AS3722 >> > >> PMIC. >> > >> >> > >> > > >> > >> >> > >> > > This is the Acer Chromebook 13 CB5-311-T7NN (13.3-inch >> > >> >> > >> > > HD, NVIDIA Tegra K1, 2GB). The display is not currently >> > >> >> > >> > > supported, so it should boot on other nyan-based >> > >> >> > >> > > Chromebooks also, but only the device tree for nyan-big is >> provided here. >> > >> >> > >> > > >> > >> >> > >> > > The device tree file is from Linux but with features >> > >> >> > >> > > removed which are unlikely to be supported in U-Boot >> > >> >> > >> > > soon (regulators, >> > >> >> > pinmux). >> > >> >> > >> > > Also the addresses are updated to 32-bit. >> > >> >> > >> > > >> > >> >> > >> > > Signed-off-by: Allen Martin <amartin(a)nvidia.com> >> > >> >> > >> > > Signed-off-by: Simon Glass <sjg(a)chromium.org> (rebase, >> > >> >> > >> > > change to 'nyan-big', fix pinmux that resets nyan-big) >> > >> >> > >> > > >> > >> >> > >> > > --- >> > >> >> > >> > > >> > >> >> > >> > > Changes in v5: >> > >> >> > >> > > - Remove call to pinmux_set_tristate_input_clamping() >> > >> >> > >> > > >> > >> >> > >> > >> > >> >> > >> > Any further comments on v5 please? >> > >> >> > >> > >> > >> >> > >> > I would like to apply this patch before the DM I2C >> > >> >> > >> > series, so that I2C works correct for nyan-big also. >> > >> >> > >> > >> > >> >> > >> > Tom are you looking at the rest of the PCI-e series? I >> > >> >> > >> > resent it so would like to get that in soon - the patches >> > >> >> > >> > originally date from August. >> > >> >> > >> I was waiting for Thierry or Stephen to Ack the series, or >> > >> >> > >> provide other feedback. I don't have time/boards to test >> > >> >> > >> this right >> > >> now. >> > >> >> > >> >> > >> >> > >> If someone can say it looks good, or has been tested on X >> board, etc. >> > >> >> > >> I can apply it. >> > >> >> > >> >> > >> >> > >> Tom >> > >> >> > >> > >> > >> >> > >> > Regards, >> > >> >> > >> > Simon >> > >> >> > >> -- >> > >> >> > >> nvpublic

1 1

[U-Boot] [PATCH v5 1/3] dts: Bring in Chrome OS keyboard device tree definition
by Simon Glass 11 Dec '14

11 Dec '14

This will be used by nyan-big, but bring it in in a separate patch since it will be common to other boards. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v5: None Changes in v4: None Changes in v3: - Add patch to bring in cros-ec-keyboard.dtsi Changes in v2: None arch/arm/dts/cros-ec-keyboard.dtsi | 105 +++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 arch/arm/dts/cros-ec-keyboard.dtsi diff --git a/arch/arm/dts/cros-ec-keyboard.dtsi b/arch/arm/dts/cros-ec-keyboard.dtsi new file mode 100644 index 0000000..9c7fb0a --- /dev/null +++ b/arch/arm/dts/cros-ec-keyboard.dtsi @@ -0,0 +1,105 @@ +/* + * Keyboard dts fragment for devices that use cros-ec-keyboard + * + * Copyright (c) 2014 Google, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <dt-bindings/input/input.h> + +&cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb"; + keypad,num-rows = <8>; + keypad,num-columns = <13>; + google,needs-ghost-filter; + + linux,keymap = < + MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA) + MATRIX_KEY(0x00, 0x02, KEY_F1) + MATRIX_KEY(0x00, 0x03, KEY_B) + MATRIX_KEY(0x00, 0x04, KEY_F10) + MATRIX_KEY(0x00, 0x06, KEY_N) + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) + + MATRIX_KEY(0x01, 0x01, KEY_ESC) + MATRIX_KEY(0x01, 0x02, KEY_F4) + MATRIX_KEY(0x01, 0x03, KEY_G) + MATRIX_KEY(0x01, 0x04, KEY_F7) + MATRIX_KEY(0x01, 0x06, KEY_H) + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) + MATRIX_KEY(0x01, 0x09, KEY_F9) + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) + + MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL) + MATRIX_KEY(0x02, 0x01, KEY_TAB) + MATRIX_KEY(0x02, 0x02, KEY_F3) + MATRIX_KEY(0x02, 0x03, KEY_T) + MATRIX_KEY(0x02, 0x04, KEY_F6) + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) + MATRIX_KEY(0x02, 0x06, KEY_Y) + MATRIX_KEY(0x02, 0x07, KEY_102ND) + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) + MATRIX_KEY(0x02, 0x09, KEY_F8) + + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) + MATRIX_KEY(0x03, 0x02, KEY_F2) + MATRIX_KEY(0x03, 0x03, KEY_5) + MATRIX_KEY(0x03, 0x04, KEY_F5) + MATRIX_KEY(0x03, 0x06, KEY_6) + MATRIX_KEY(0x03, 0x08, KEY_MINUS) + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) + + MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL) + MATRIX_KEY(0x04, 0x01, KEY_A) + MATRIX_KEY(0x04, 0x02, KEY_D) + MATRIX_KEY(0x04, 0x03, KEY_F) + MATRIX_KEY(0x04, 0x04, KEY_S) + MATRIX_KEY(0x04, 0x05, KEY_K) + MATRIX_KEY(0x04, 0x06, KEY_J) + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) + MATRIX_KEY(0x04, 0x09, KEY_L) + MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) + + MATRIX_KEY(0x05, 0x01, KEY_Z) + MATRIX_KEY(0x05, 0x02, KEY_C) + MATRIX_KEY(0x05, 0x03, KEY_V) + MATRIX_KEY(0x05, 0x04, KEY_X) + MATRIX_KEY(0x05, 0x05, KEY_COMMA) + MATRIX_KEY(0x05, 0x06, KEY_M) + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) + MATRIX_KEY(0x05, 0x08, KEY_SLASH) + MATRIX_KEY(0x05, 0x09, KEY_DOT) + MATRIX_KEY(0x05, 0x0b, KEY_SPACE) + + MATRIX_KEY(0x06, 0x01, KEY_1) + MATRIX_KEY(0x06, 0x02, KEY_3) + MATRIX_KEY(0x06, 0x03, KEY_4) + MATRIX_KEY(0x06, 0x04, KEY_2) + MATRIX_KEY(0x06, 0x05, KEY_8) + MATRIX_KEY(0x06, 0x06, KEY_7) + MATRIX_KEY(0x06, 0x08, KEY_0) + MATRIX_KEY(0x06, 0x09, KEY_9) + MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT) + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) + + MATRIX_KEY(0x07, 0x01, KEY_Q) + MATRIX_KEY(0x07, 0x02, KEY_E) + MATRIX_KEY(0x07, 0x03, KEY_R) + MATRIX_KEY(0x07, 0x04, KEY_W) + MATRIX_KEY(0x07, 0x05, KEY_I) + MATRIX_KEY(0x07, 0x06, KEY_U) + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) + MATRIX_KEY(0x07, 0x08, KEY_P) + MATRIX_KEY(0x07, 0x09, KEY_O) + MATRIX_KEY(0x07, 0x0b, KEY_UP) + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) + >; + }; +}; -- 2.2.0.rc0.207.ga3a616c

2 7

[U-Boot] [PATCH] kconfig: ls102xa: Change the prompt messages
by Alison Wang 11 Dec '14

11 Dec '14

As NOR/NAND/SD boot are all supported on LS1021AQDS/TWR boards, the prompt message "Support ls1021aqds_nor" in Kconfig is not clear. This patch changes it to "Support ls1021aqds". Signed-off-by: Alison Wang <alison.wang(a)freescale.com> --- arch/arm/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1f00e93..edc8ae2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -728,12 +728,12 @@ config TARGET_LS2085A_SIMU select ARM64 config TARGET_LS1021AQDS - bool "Support ls1021aqds_nor" + bool "Support ls1021aqds" select CPU_V7 select SUPPORT_SPL config TARGET_LS1021ATWR - bool "Support ls1021atwr_nor" + bool "Support ls1021atwr" select CPU_V7 select SUPPORT_SPL -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH 1/1] driver/mtd: Fix IFC compilation warnings
by Jaiprakash Singh 11 Dec '14

11 Dec '14

From: Jaiprakash Singh <b44839(a)freescale.com> 'eccstat' array elements might be used uninitialized Signed-off-by: Jaiprakash Singh <b44839(a)freescale.com> --- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 81b5070..b283eae 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -292,7 +292,7 @@ static int fsl_ifc_run_command(struct mtd_info *mtd) struct fsl_ifc *ifc = ctrl->regs; u32 timeo = (CONFIG_SYS_HZ * 10) / 1000; u32 time_start; - u32 eccstat[4]; + u32 eccstat[4] = {0}; int i; /* set the chip select for NAND Transaction */ -- 1.7.9.5

2 1

[U-Boot] Please pull u-boot-fsl-qoriq.git master
by York Sun 11 Dec '14

11 Dec '14

Tom, The following changes since commit 32fdf0e4d82bdca5d64d86330e461e59685f9959: Prepare v2015.01-rc3 (2014-12-08 16:35:08 -0500) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git master for you to fetch changes up to 0de15707a71ec64dbc1ead2831457f1550179ea7: kconfig: ls102xa: Change the prompt messages (2014-12-11 09:42:41 -0800) ---------------------------------------------------------------- Alison Wang (12): ls102xa: pblimage: Add pblimage tool support for LS102xA spl: Use u-boot.img instead of u-boot.bin arm: spl: Add I2C linker list in generic .lds kconfig: ls1021a: add SUPPORT_SPL ls102xa: qixis: Add CONFIG_QIXIS_I2C_ACCESS macro arm: ls102xa: Add SD boot support for LS1021AQDS board arm: ls102xa: Add SD boot support for LS1021ATWR board arm: ls1021a: Add CONFIG_DOS_PARTITION and CONFIG_CMD_FAT support arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support arm: ls102xa: Add QSPI boot support for LS1021AQDS/TWR board arm: ls102xa: Add NAND boot support for LS1021AQDS board kconfig: ls102xa: Change the prompt messages Chenhui Zhao (1): ls1021aqds: set the default I2C channel before DDR init Jaiprakash Singh (1): driver/mtd: Fix IFC compilation warnings Minghuan Lian (1): arm: ls102xa: Update PCIe dts node status Nikhil Badola (3): drivers: usb: Make usb device-tree fixup code architecture independent drivers: usb: fsl: Add USB device-tree errata framework drivers: usb: fsl: Check USB Erratum A007792 applicability Tang Yuantian (2): arm: ls102xa: fixed a bus frequency setting error fsl/sleep: updated the deep sleep framework for QorIQ platforms Xiubo Li (6): ARM: HYP/non-sec: add the pen address BE mode support. ARM: HYP/non-sec: Fix the ARCH Timer frequency setting. ls1021a: adding a secondary core boot address and kick functions ls102xa: changing a few targets' configurations. ARM: ls102xa: allow all the peripheral access permission as R/W. ARM: ls102xa: Setting device's stream id for SMMUs. Yao Yuan (1): ls1021aqds: add hwconfig setting to do pin mux chenhui zhao (1): arm: ls102xa: clear EPU registers for deep sleep Makefile | 11 +- arch/arm/Kconfig | 6 +- arch/arm/cpu/armv7/ls102xa/Makefile | 2 + arch/arm/cpu/armv7/ls102xa/cpu.c | 34 +++ arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 57 ++++ arch/arm/cpu/armv7/ls102xa/fsl_epu.h | 68 +++++ arch/arm/cpu/armv7/ls102xa/spl.c | 33 +++ arch/arm/cpu/armv7/nonsec_virt.S | 7 +- arch/arm/cpu/u-boot-spl.lds | 3 + arch/arm/include/asm/arch-ls102xa/config.h | 9 + arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 9 + .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 17 ++ arch/arm/include/asm/arch-ls102xa/ns_access.h | 118 ++++++++ arch/arm/include/asm/arch-ls102xa/spl.h | 20 ++ arch/arm/include/asm/pcie_layerscape.h | 13 + arch/powerpc/cpu/mpc8xxx/fdt.c | 104 ------- board/freescale/common/Makefile | 10 + board/freescale/common/arm_sleep.c | 95 +++++++ board/freescale/common/ls102xa_stream_id.c | 18 ++ board/freescale/common/mpc85xx_sleep.c | 88 ++++++ board/freescale/common/ns_access.c | 30 +++ board/freescale/common/qixis.h | 7 + board/freescale/common/sleep.h | 21 ++ board/freescale/ls1021aqds/MAINTAINERS | 3 + board/freescale/ls1021aqds/ddr.c | 5 +- board/freescale/ls1021aqds/ls1021aqds.c | 283 ++++++++++++++++++-- board/freescale/ls1021aqds/ls102xa_pbi.cfg | 12 + board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg | 7 + board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg | 14 + board/freescale/ls1021atwr/MAINTAINERS | 2 + board/freescale/ls1021atwr/ls1021atwr.c | 151 +++++++++++ board/freescale/ls1021atwr/ls102xa_pbi.cfg | 12 + board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg | 14 + configs/ls1021aqds_nand_defconfig | 4 + configs/ls1021aqds_qspi_defconfig | 3 + configs/ls1021aqds_sdcard_defconfig | 4 + configs/ls1021atwr_qspi_defconfig | 3 + configs/ls1021atwr_sdcard_defconfig | 4 + drivers/ddr/fsl/arm_ddr_gen3.c | 45 +++- drivers/ddr/fsl/fsl_ddr_gen4.c | 44 ++- drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 67 ++--- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_spl.c | 10 + drivers/pci/Makefile | 1 + drivers/pci/pcie_layerscape.c | 51 ++++ drivers/usb/host/ehci-fsl.c | 186 +++++++++++++ include/configs/ls1021aqds.h | 175 +++++++++++- include/configs/ls1021atwr.h | 95 ++++++- include/configs/sun7i.h | 1 + include/fsl_ddr_sdram.h | 12 +- include/fsl_usb.h | 23 ++ tools/pblimage.c | 110 +++++--- 53 files changed, 1904 insertions(+), 221 deletions(-) create mode 100644 arch/arm/cpu/armv7/ls102xa/fsl_epu.c create mode 100644 arch/arm/cpu/armv7/ls102xa/fsl_epu.h create mode 100644 arch/arm/cpu/armv7/ls102xa/spl.c create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h create mode 100644 arch/arm/include/asm/arch-ls102xa/ns_access.h create mode 100644 arch/arm/include/asm/arch-ls102xa/spl.h create mode 100644 arch/arm/include/asm/pcie_layerscape.h create mode 100644 board/freescale/common/arm_sleep.c create mode 100644 board/freescale/common/ls102xa_stream_id.c create mode 100644 board/freescale/common/mpc85xx_sleep.c create mode 100644 board/freescale/common/ns_access.c create mode 100644 board/freescale/common/sleep.h create mode 100644 board/freescale/ls1021aqds/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021aqds_nand_defconfig create mode 100644 configs/ls1021aqds_qspi_defconfig create mode 100644 configs/ls1021aqds_sdcard_defconfig create mode 100644 configs/ls1021atwr_qspi_defconfig create mode 100644 configs/ls1021atwr_sdcard_defconfig create mode 100644 drivers/pci/pcie_layerscape.c Thanks. York

1 1