* [PATCH 0/6] common arm clkdev
@ 2010-08-04 1:42 Jean-Christophe PLAGNIOL-VILLARD
2010-08-04 1:43 ` [PATCH 1/6] string: add strlcpy support Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:42 UTC (permalink / raw)
To: barebox; +Cc: Andrea GALLO
Hi,
this patch series add the arm common clkdev support with the support
of the STm8815 soc which use is for the generic ARM amba serial API
Jean-Christophe PLAGNIOL-VILLARD (6):
string: add strlcpy support
arm: add common clkdev
amba: add pl011
arm: add Nomadik 8815 SoC support
nand: driver for Nomadik 8815 SoC
arm: add nhk8815 board support
arch/arm/Kconfig | 11 +
arch/arm/Makefile | 4 +-
arch/arm/boards/nhk8815/Makefile | 1 +
arch/arm/boards/nhk8815/env/bin/_update | 36 +++
arch/arm/boards/nhk8815/env/bin/boot | 38 +++
arch/arm/boards/nhk8815/env/bin/init | 28 +++
.../boards/nhk8815/env/bin/update_barebox_xmodem | 19 ++
arch/arm/boards/nhk8815/env/bin/update_kernel | 8 +
arch/arm/boards/nhk8815/env/bin/update_root | 8 +
arch/arm/boards/nhk8815/env/config | 32 +++
arch/arm/boards/nhk8815/setup.c | 106 +++++++++
arch/arm/common/Kconfig | 2 +
arch/arm/common/Makefile | 5 +
arch/arm/common/clkdev.c | 160 +++++++++++++
arch/arm/configs/nhk8815_defconfig | 232 ++++++++++++++++++
arch/arm/include/asm/clkdev.h | 30 +++
arch/arm/mach-nomadik/8815.c | 76 ++++++
arch/arm/mach-nomadik/Kconfig | 24 ++
arch/arm/mach-nomadik/Makefile | 3 +
arch/arm/mach-nomadik/clock.c | 52 ++++
arch/arm/mach-nomadik/clock.h | 14 ++
arch/arm/mach-nomadik/include/mach/board.h | 28 +++
arch/arm/mach-nomadik/include/mach/clkdev.h | 7 +
arch/arm/mach-nomadik/include/mach/fsmc.h | 28 +++
arch/arm/mach-nomadik/include/mach/hardware.h | 91 +++++++
arch/arm/mach-nomadik/include/mach/mtu.h | 46 ++++
arch/arm/mach-nomadik/include/mach/nand.h | 16 ++
arch/arm/mach-nomadik/include/mach/timex.h | 6 +
arch/arm/mach-nomadik/reset.c | 36 +++
arch/arm/mach-nomadik/timer.c | 81 +++++++
drivers/mtd/nand/Kconfig | 5 +
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/nomadik_nand.c | 248 ++++++++++++++++++++
drivers/serial/Kconfig | 9 +
drivers/serial/Makefile | 1 +
drivers/serial/amba-pl011.c | 192 +++++++++++++++
include/linux/amba/serial.h | 164 +++++++++++++
include/linux/string.h | 3 +
include/stdio.h | 1 +
lib/string.c | 26 ++
lib/vsprintf.c | 25 ++
41 files changed, 1902 insertions(+), 1 deletions(-)
create mode 100644 arch/arm/boards/nhk8815/Makefile
create mode 100644 arch/arm/boards/nhk8815/config.h
create mode 100644 arch/arm/boards/nhk8815/env/bin/_update
create mode 100644 arch/arm/boards/nhk8815/env/bin/boot
create mode 100644 arch/arm/boards/nhk8815/env/bin/init
create mode 100644 arch/arm/boards/nhk8815/env/bin/update_barebox_xmodem
create mode 100644 arch/arm/boards/nhk8815/env/bin/update_kernel
create mode 100644 arch/arm/boards/nhk8815/env/bin/update_root
create mode 100644 arch/arm/boards/nhk8815/env/config
create mode 100644 arch/arm/boards/nhk8815/setup.c
create mode 100644 arch/arm/common/Kconfig
create mode 100644 arch/arm/common/Makefile
create mode 100644 arch/arm/common/clkdev.c
create mode 100644 arch/arm/configs/nhk8815_defconfig
create mode 100644 arch/arm/include/asm/clkdev.h
create mode 100644 arch/arm/mach-nomadik/8815.c
create mode 100644 arch/arm/mach-nomadik/Kconfig
create mode 100644 arch/arm/mach-nomadik/Makefile
create mode 100644 arch/arm/mach-nomadik/clock.c
create mode 100644 arch/arm/mach-nomadik/clock.h
create mode 100644 arch/arm/mach-nomadik/include/mach/board.h
create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h
create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h
create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h
create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h
create mode 100644 arch/arm/mach-nomadik/reset.c
create mode 100644 arch/arm/mach-nomadik/timer.c
create mode 100644 drivers/mtd/nand/nomadik_nand.c
create mode 100644 drivers/serial/amba-pl011.c
create mode 100644 include/linux/amba/serial.h
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/6] string: add strlcpy support 2010-08-04 1:42 [PATCH 0/6] common arm clkdev Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 2/6] arm: add common clkdev Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- include/linux/string.h | 3 +++ include/stdio.h | 1 + lib/string.c | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/linux/string.h b/include/linux/string.h index 20b0829..62d743e 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -38,6 +38,9 @@ extern char * strcpy(char *,const char *); #ifndef __HAVE_ARCH_STRNCPY extern char * strncpy(char *,const char *, __kernel_size_t); #endif +#ifndef __HAVE_ARCH_STRLCPY +size_t strlcpy(char *, const char *, size_t); +#endif #ifndef __HAVE_ARCH_STRCAT extern char * strcat(char *, const char *); #endif diff --git a/include/stdio.h b/include/stdio.h index d591b6a..8bc45fa 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -36,6 +36,7 @@ int vsprintf(char *buf, const char *fmt, va_list args); char *asprintf(const char *fmt, ...); char *vasprintf(const char *fmt, va_list ap); int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); +int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); /* stderr */ #define eputc(c) console_putc(CONSOLE_STDERR, c) diff --git a/lib/string.c b/lib/string.c index cbb13d3..77435aa 100644 --- a/lib/string.c +++ b/lib/string.c @@ -62,6 +62,32 @@ char * strncpy(char * dest,const char *src,size_t count) #endif EXPORT_SYMBOL(strncpy); +#ifndef __HAVE_ARCH_STRLCPY +/** + * strlcpy - Copy a %NUL terminated string into a sized buffer + * @dest: Where to copy the string to + * @src: Where to copy the string from + * @size: size of destination buffer + * + * Compatible with *BSD: the result is always a valid + * NUL-terminated string that fits in the buffer (unless, + * of course, the buffer size is zero). It does not pad + * out the result like strncpy() does. + */ +size_t strlcpy(char *dest, const char *src, size_t size) +{ + size_t ret = strlen(src); + + if (size) { + size_t len = (ret >= size) ? size - 1 : ret; + memcpy(dest, src, len); + dest[len] = '\0'; + } + return ret; +} +EXPORT_SYMBOL(strlcpy); +#endif + #ifndef __HAVE_ARCH_STRCAT /** * strcat - Append one %NUL-terminated string to another -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/6] arm: add common clkdev 2010-08-04 1:43 ` [PATCH 1/6] string: add strlcpy support Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 3/6] amba: add pl011 Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- arch/arm/Kconfig | 1 + arch/arm/Makefile | 2 +- arch/arm/common/Kconfig | 2 + arch/arm/common/Makefile | 5 ++ arch/arm/common/clkdev.c | 160 +++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/clkdev.h | 30 ++++++++ lib/vsprintf.c | 25 +++++++ 7 files changed, 224 insertions(+), 1 deletions(-) create mode 100644 arch/arm/common/Kconfig create mode 100644 arch/arm/common/Makefile create mode 100644 arch/arm/common/clkdev.c create mode 100644 arch/arm/include/asm/clkdev.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 92ec417..ed05a89 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -53,6 +53,7 @@ config ARCH_S3C24xx endchoice +source arch/arm/common/Kconfig source arch/arm/cpu/Kconfig source arch/arm/mach-at91/Kconfig source arch/arm/mach-at91rm9200/Kconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8b4d64c..bd78259 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -130,7 +130,7 @@ MACH := endif common-y += $(BOARD) $(MACH) -common-y += arch/arm/lib/ arch/arm/cpu/ +common-y += arch/arm/lib/ arch/arm/cpu/ arch/arm/common/ lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/barebox.lds lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig new file mode 100644 index 0000000..e749e45 --- /dev/null +++ b/arch/arm/common/Kconfig @@ -0,0 +1,2 @@ +config COMMON_CLKDEV + bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile new file mode 100644 index 0000000..9cc8834 --- /dev/null +++ b/arch/arm/common/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the linux kernel. +# + +obj-$(CONFIG_COMMON_CLKDEV) += clkdev.o diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c new file mode 100644 index 0000000..4d25356 --- /dev/null +++ b/arch/arm/common/clkdev.c @@ -0,0 +1,160 @@ +/* + * arch/arm/common/clkdev.c + * + * Copyright (C) 2008 Russell King. + * + * 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. + * + * Helper for the clk API to assist looking up a struct clk. + */ + +#include <common.h> +#include <linux/list.h> +#include <errno.h> +#include <linux/err.h> +#include <linux/clk.h> +#include <init.h> +#include <malloc.h> +#include <stdio.h> + +#include <asm/clkdev.h> +#include <mach/clkdev.h> + +static LIST_HEAD(clocks); + +/* + * Find the correct struct clk for the device and connection ID. + * We do slightly fuzzy matching here: + * An entry with a NULL ID is assumed to be a wildcard. + * If an entry has a device ID, it must match + * If an entry has a connection ID, it must match + * Then we take the most specific entry - with the following + * order of precidence: dev+con > dev only > con only. + */ +static struct clk *clk_find(const char *dev_id, const char *con_id) +{ + struct clk_lookup *p; + struct clk *clk = NULL; + int match, best = 0; + + list_for_each_entry(p, &clocks, node) { + match = 0; + if (p->dev_id) { + if (!dev_id || strcmp(p->dev_id, dev_id)) + continue; + match += 2; + } + if (p->con_id) { + if (!con_id || strcmp(p->con_id, con_id)) + continue; + match += 1; + } + if (match == 0) + continue; + + if (match > best) { + clk = p->clk; + best = match; + } + } + return clk; +} + +struct clk *clk_get_sys(const char *dev_id, const char *con_id) +{ + struct clk *clk; + + clk = clk_find(dev_id, con_id); + if (clk && !__clk_get(clk)) + clk = NULL; + + return clk ? clk : ERR_PTR(-ENOENT); +} +EXPORT_SYMBOL(clk_get_sys); + +struct clk *clk_get(struct device_d *dev, const char *con_id) +{ + const char *dev_id = dev ? dev_name(dev) : NULL; + + return clk_get_sys(dev_id, con_id); +} +EXPORT_SYMBOL(clk_get); + +void clk_put(struct clk *clk) +{ + __clk_put(clk); +} +EXPORT_SYMBOL(clk_put); + +void clkdev_add(struct clk_lookup *cl) +{ + list_add_tail(&cl->node, &clocks); +} +EXPORT_SYMBOL(clkdev_add); + +#define MAX_DEV_ID 20 +#define MAX_CON_ID 16 + +struct clk_lookup_alloc { + struct clk_lookup cl; + char dev_id[MAX_DEV_ID]; + char con_id[MAX_CON_ID]; +}; + +struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, + const char *dev_fmt, ...) +{ + struct clk_lookup_alloc *cla; + + cla = kzalloc(sizeof(*cla), GFP_KERNEL); + if (!cla) + return NULL; + + cla->cl.clk = clk; + if (con_id) { + strlcpy(cla->con_id, con_id, sizeof(cla->con_id)); + cla->cl.con_id = cla->con_id; + } + + if (dev_fmt) { + va_list ap; + + va_start(ap, dev_fmt); + vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap); + cla->cl.dev_id = cla->dev_id; + va_end(ap); + } + + return &cla->cl; +} +EXPORT_SYMBOL(clkdev_alloc); + +int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, + struct device_d *dev) +{ + struct clk *r = clk_get(dev, id); + struct clk_lookup *l; + + if (IS_ERR(r)) + return PTR_ERR(r); + + l = clkdev_alloc(r, alias, alias_dev_name); + clk_put(r); + if (!l) + return -ENODEV; + clkdev_add(l); + return 0; +} +EXPORT_SYMBOL(clk_add_alias); + +/* + * clkdev_drop - remove a clock dynamically allocated + */ +void clkdev_drop(struct clk_lookup *cl) +{ + list_del(&cl->node); + kfree(cl); +} +EXPORT_SYMBOL(clkdev_drop); diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h new file mode 100644 index 0000000..b6ec7c6 --- /dev/null +++ b/arch/arm/include/asm/clkdev.h @@ -0,0 +1,30 @@ +/* + * arch/arm/include/asm/clkdev.h + * + * Copyright (C) 2008 Russell King. + * + * 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. + * + * Helper for the clk API to assist looking up a struct clk. + */ +#ifndef __ASM_CLKDEV_H +#define __ASM_CLKDEV_H + +struct clk; + +struct clk_lookup { + struct list_head node; + const char *dev_id; + const char *con_id; + struct clk *clk; +}; + +struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, + const char *dev_fmt, ...); + +void clkdev_add(struct clk_lookup *cl); +void clkdev_drop(struct clk_lookup *cl); + +#endif diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 91ad613..6066845 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -515,6 +515,31 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) EXPORT_SYMBOL(vsnprintf); /** + * vscnprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @args: Arguments for the format string + * + * The return value is the number of characters which have been written into + * the @buf not including the trailing '\0'. If @size is <= 0 the function + * returns 0. + * + * Call this function if you are already dealing with a va_list. + * You probably want scnprintf() instead. + * + * See the vsnprintf() documentation for format string extensions over C99. + */ +int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) +{ + int i; + + i=vsnprintf(buf,size,fmt,args); + return (i >= size) ? (size - 1) : i; +} +EXPORT_SYMBOL(vscnprintf); + +/** * vsprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into * @fmt: The format string to use -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/6] amba: add pl011 2010-08-04 1:43 ` [PATCH 2/6] arm: add common clkdev Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 4/6] arm: add Nomadik 8815 SoC support Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 6:46 ` [PATCH 3/6] amba: add pl011 Sascha Hauer 0 siblings, 2 replies; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- arch/arm/Kconfig | 3 + drivers/serial/Kconfig | 9 ++ drivers/serial/Makefile | 1 + drivers/serial/amba-pl011.c | 192 +++++++++++++++++++++++++++++++++++++++++++ include/linux/amba/serial.h | 164 ++++++++++++++++++++++++++++++++++++ 5 files changed, 369 insertions(+), 0 deletions(-) create mode 100644 drivers/serial/amba-pl011.c create mode 100644 include/linux/amba/serial.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ed05a89..53b7783 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -18,6 +18,9 @@ config ARM select HAVE_CONFIGURABLE_TEXT_BASE default y +config ARM_AMBA + bool + menu "System Type" choice diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8a5056b..c7ea2d9 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -4,6 +4,15 @@ config DRIVER_SERIAL_ARM_DCC depends on ARM bool "ARM Debug Communications Channel (DCC) serial driver" +config SERIAL_AMBA_PL011 + bool "ARM AMBA PL011 serial port support" + depends on ARM_AMBA + help + This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have + an Integrator/PP2, Integrator/CP or Versatile platform, say Y here. + + If unsure, say N. + config DRIVER_SERIAL_IMX depends on ARCH_IMX default y diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 9f203bb..959290e 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -5,6 +5,7 @@ # serial_pl010.o # serial_xuartlite.o obj-$(CONFIG_DRIVER_SERIAL_ARM_DCC) += arm_dcc.o +obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_DRIVER_SERIAL_IMX) += serial_imx.o obj-$(CONFIG_DRIVER_SERIAL_ATMEL) += atmel.o obj-$(CONFIG_DRIVER_SERIAL_NETX) += serial_netx.o diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c new file mode 100644 index 0000000..07508d0 --- /dev/null +++ b/drivers/serial/amba-pl011.c @@ -0,0 +1,192 @@ +/* + * (C) Copyright 2000 + * Rob Taylor, Flying Pig Systems. robt@flyingpig.com. + * + * (C) Copyright 2004 + * ARM Ltd. + * Philippe Robin, <philippe.robin@arm.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */ + +#include <common.h> +#include <driver.h> +#include <init.h> +#include <malloc.h> +#include <asm/io.h> +#include <linux/amba/serial.h> +#include <linux/clk.h> + +/* + * We wrap our port structure around the generic console_device. + */ +struct amba_uart_port { + struct console_device uart; /* uart */ + struct clk *clk; /* uart clock */ + u32 uartclk; +}; + +static inline struct amba_uart_port * +to_amba_uart_port(struct console_device *uart) +{ + return container_of(uart, struct amba_uart_port, uart); +} + +static int pl011_setbaudrate(struct console_device *cdev, int baudrate) +{ + struct device_d *dev = cdev->dev; + struct amba_uart_port *uart = to_amba_uart_port(cdev); + unsigned int temp; + unsigned int divider; + unsigned int remainder; + unsigned int fraction; + + /* + ** Set baud rate + ** + ** IBRD = UART_CLK / (16 * BAUD_RATE) + ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE)) + */ + temp = 16 * baudrate; + divider = uart->uartclk / temp; + remainder = uart->uartclk % temp; + temp = (8 * remainder) / baudrate; + fraction = (temp >> 1) + (temp & 1); + + writel(divider, dev->map_base + UART011_IBRD); + writel(fraction, dev->map_base + UART011_FBRD); + + return 0; +} + +static void pl011_putc(struct console_device *cdev, char c) +{ + struct device_d *dev = cdev->dev; + + /* Wait until there is space in the FIFO */ + while (readl(dev->map_base + UART01x_FR) & UART01x_FR_TXFF); + + /* Send the character */ + writel(c, dev->map_base + UART01x_DR); +} + +static int pl011_getc(struct console_device *cdev) +{ + struct device_d *dev = cdev->dev; + unsigned int data; + + /* Wait until there is data in the FIFO */ + while (readl(dev->map_base + UART01x_FR) & UART01x_FR_RXFE); + + data = readl(dev->map_base + UART01x_DR); + + /* Check for an error flag */ + if (data & 0xffffff00) { + /* Clear the error */ + writel(0xffffffff, dev->map_base + UART01x_ECR); + return -1; + } + + return (int)data; +} + +static int pl011_tstc(struct console_device *cdev) +{ + struct device_d *dev = cdev->dev; + + return !(readl(dev->map_base + UART01x_FR) & UART01x_FR_RXFE); +} + +int pl011_init_port (struct console_device *cdev) +{ + struct device_d *dev = cdev->dev; + struct amba_uart_port *uart = to_amba_uart_port(cdev); + + /* + ** First, disable everything. + */ + writel(0x0, dev->map_base + UART011_CR); + + /* + * Try to enable the clock producer. + */ + clk_enable(uart->clk); + + uart->uartclk = clk_get_rate(uart->clk); + + /* + * set baud rate + */ + pl011_setbaudrate(cdev, 115200); + /* + ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled. + */ + writel((UART01x_LCRH_WLEN_8 | UART01x_LCRH_FEN), + dev->map_base + UART011_LCRH); + + /* + ** Finally, enable the UART + */ + writel((UART01x_CR_UARTEN | UART011_CR_TXE | UART011_CR_RXE), + dev->map_base + UART011_CR); + + return 0; +} + +static int pl011_probe(struct device_d *dev) +{ + struct amba_uart_port *uart; + struct console_device *cdev; + + uart = malloc(sizeof(struct amba_uart_port)); + + uart->clk = clk_get(dev, NULL); + + cdev = &uart->uart; + dev->type_data = cdev; + cdev->dev = dev; + cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; + cdev->tstc = pl011_tstc; + cdev->putc = pl011_putc; + cdev->getc = pl011_getc; + cdev->setbrg = pl011_setbaudrate; + + pl011_init_port(cdev); + + /* Enable UART */ + + console_register(cdev); + + return 0; +} + +static struct driver_d pl011_driver = { + .name = "uart-pl011", + .probe = pl011_probe, +}; + +static int pl011_init(void) +{ + register_driver(&pl011_driver); + return 0; +} + +console_initcall(pl011_init); diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h new file mode 100644 index 0000000..f4d7bf8 --- /dev/null +++ b/include/linux/amba/serial.h @@ -0,0 +1,164 @@ +/* + * linux/include/linux/amba/serial.h + * + * Internal header file for AMBA serial ports + * + * Copyright (C) ARM Limited + * Copyright (C) 2000 Deep Blue Solutions Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef ASM_ARM_HARDWARE_SERIAL_AMBA_H +#define ASM_ARM_HARDWARE_SERIAL_AMBA_H + +/* ------------------------------------------------------------------------------- + * From AMBA UART (PL010) Block Specification + * ------------------------------------------------------------------------------- + * UART Register Offsets. + */ +#define UART01x_DR 0x00 /* Data read or written from the interface. */ +#define UART01x_RSR 0x04 /* Receive status register (Read). */ +#define UART01x_ECR 0x04 /* Error clear register (Write). */ +#define UART010_LCRH 0x08 /* Line control register, high byte. */ +#define UART010_LCRM 0x0C /* Line control register, middle byte. */ +#define UART010_LCRL 0x10 /* Line control register, low byte. */ +#define UART010_CR 0x14 /* Control register. */ +#define UART01x_FR 0x18 /* Flag register (Read only). */ +#define UART010_IIR 0x1C /* Interrupt indentification register (Read). */ +#define UART010_ICR 0x1C /* Interrupt clear register (Write). */ +#define UART01x_ILPR 0x20 /* IrDA low power counter register. */ +#define UART011_IBRD 0x24 /* Integer baud rate divisor register. */ +#define UART011_FBRD 0x28 /* Fractional baud rate divisor register. */ +#define UART011_LCRH 0x2c /* Line control register. */ +#define UART011_CR 0x30 /* Control register. */ +#define UART011_IFLS 0x34 /* Interrupt fifo level select. */ +#define UART011_IMSC 0x38 /* Interrupt mask. */ +#define UART011_RIS 0x3c /* Raw interrupt status. */ +#define UART011_MIS 0x40 /* Masked interrupt status. */ +#define UART011_ICR 0x44 /* Interrupt clear register. */ +#define UART011_DMACR 0x48 /* DMA control register. */ + +#define UART011_DR_OE (1 << 11) +#define UART011_DR_BE (1 << 10) +#define UART011_DR_PE (1 << 9) +#define UART011_DR_FE (1 << 8) + +#define UART01x_RSR_OE 0x08 +#define UART01x_RSR_BE 0x04 +#define UART01x_RSR_PE 0x02 +#define UART01x_RSR_FE 0x01 + +#define UART011_FR_RI 0x100 +#define UART011_FR_TXFE 0x080 +#define UART011_FR_RXFF 0x040 +#define UART01x_FR_TXFF 0x020 +#define UART01x_FR_RXFE 0x010 +#define UART01x_FR_BUSY 0x008 +#define UART01x_FR_DCD 0x004 +#define UART01x_FR_DSR 0x002 +#define UART01x_FR_CTS 0x001 +#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) + +#define UART011_CR_CTSEN 0x8000 /* CTS hardware flow control */ +#define UART011_CR_RTSEN 0x4000 /* RTS hardware flow control */ +#define UART011_CR_OUT2 0x2000 /* OUT2 */ +#define UART011_CR_OUT1 0x1000 /* OUT1 */ +#define UART011_CR_RTS 0x0800 /* RTS */ +#define UART011_CR_DTR 0x0400 /* DTR */ +#define UART011_CR_RXE 0x0200 /* receive enable */ +#define UART011_CR_TXE 0x0100 /* transmit enable */ +#define UART011_CR_LBE 0x0080 /* loopback enable */ +#define UART010_CR_RTIE 0x0040 +#define UART010_CR_TIE 0x0020 +#define UART010_CR_RIE 0x0010 +#define UART010_CR_MSIE 0x0008 +#define UART01x_CR_IIRLP 0x0004 /* SIR low power mode */ +#define UART01x_CR_SIREN 0x0002 /* SIR enable */ +#define UART01x_CR_UARTEN 0x0001 /* UART enable */ + +#define UART011_LCRH_SPS 0x80 +#define UART01x_LCRH_WLEN_8 0x60 +#define UART01x_LCRH_WLEN_7 0x40 +#define UART01x_LCRH_WLEN_6 0x20 +#define UART01x_LCRH_WLEN_5 0x00 +#define UART01x_LCRH_FEN 0x10 +#define UART01x_LCRH_STP2 0x08 +#define UART01x_LCRH_EPS 0x04 +#define UART01x_LCRH_PEN 0x02 +#define UART01x_LCRH_BRK 0x01 + +#define UART010_IIR_RTIS 0x08 +#define UART010_IIR_TIS 0x04 +#define UART010_IIR_RIS 0x02 +#define UART010_IIR_MIS 0x01 + +#define UART011_IFLS_RX1_8 (0 << 3) +#define UART011_IFLS_RX2_8 (1 << 3) +#define UART011_IFLS_RX4_8 (2 << 3) +#define UART011_IFLS_RX6_8 (3 << 3) +#define UART011_IFLS_RX7_8 (4 << 3) +#define UART011_IFLS_TX1_8 (0 << 0) +#define UART011_IFLS_TX2_8 (1 << 0) +#define UART011_IFLS_TX4_8 (2 << 0) +#define UART011_IFLS_TX6_8 (3 << 0) +#define UART011_IFLS_TX7_8 (4 << 0) +/* special values for ST vendor with deeper fifo */ +#define UART011_IFLS_RX_HALF (5 << 3) +#define UART011_IFLS_TX_HALF (5 << 0) + +#define UART011_OEIM (1 << 10) /* overrun error interrupt mask */ +#define UART011_BEIM (1 << 9) /* break error interrupt mask */ +#define UART011_PEIM (1 << 8) /* parity error interrupt mask */ +#define UART011_FEIM (1 << 7) /* framing error interrupt mask */ +#define UART011_RTIM (1 << 6) /* receive timeout interrupt mask */ +#define UART011_TXIM (1 << 5) /* transmit interrupt mask */ +#define UART011_RXIM (1 << 4) /* receive interrupt mask */ +#define UART011_DSRMIM (1 << 3) /* DSR interrupt mask */ +#define UART011_DCDMIM (1 << 2) /* DCD interrupt mask */ +#define UART011_CTSMIM (1 << 1) /* CTS interrupt mask */ +#define UART011_RIMIM (1 << 0) /* RI interrupt mask */ + +#define UART011_OEIS (1 << 10) /* overrun error interrupt status */ +#define UART011_BEIS (1 << 9) /* break error interrupt status */ +#define UART011_PEIS (1 << 8) /* parity error interrupt status */ +#define UART011_FEIS (1 << 7) /* framing error interrupt status */ +#define UART011_RTIS (1 << 6) /* receive timeout interrupt status */ +#define UART011_TXIS (1 << 5) /* transmit interrupt status */ +#define UART011_RXIS (1 << 4) /* receive interrupt status */ +#define UART011_DSRMIS (1 << 3) /* DSR interrupt status */ +#define UART011_DCDMIS (1 << 2) /* DCD interrupt status */ +#define UART011_CTSMIS (1 << 1) /* CTS interrupt status */ +#define UART011_RIMIS (1 << 0) /* RI interrupt status */ + +#define UART011_OEIC (1 << 10) /* overrun error interrupt clear */ +#define UART011_BEIC (1 << 9) /* break error interrupt clear */ +#define UART011_PEIC (1 << 8) /* parity error interrupt clear */ +#define UART011_FEIC (1 << 7) /* framing error interrupt clear */ +#define UART011_RTIC (1 << 6) /* receive timeout interrupt clear */ +#define UART011_TXIC (1 << 5) /* transmit interrupt clear */ +#define UART011_RXIC (1 << 4) /* receive interrupt clear */ +#define UART011_DSRMIC (1 << 3) /* DSR interrupt clear */ +#define UART011_DCDMIC (1 << 2) /* DCD interrupt clear */ +#define UART011_CTSMIC (1 << 1) /* CTS interrupt clear */ +#define UART011_RIMIC (1 << 0) /* RI interrupt clear */ + +#define UART011_DMAONERR (1 << 2) /* disable dma on error */ +#define UART011_TXDMAE (1 << 1) /* enable transmit dma */ +#define UART011_RXDMAE (1 << 0) /* enable receive dma */ + +#define UART01x_RSR_ANY (UART01x_RSR_OE|UART01x_RSR_BE|UART01x_RSR_PE|UART01x_RSR_FE) +#define UART01x_FR_MODEM_ANY (UART01x_FR_DCD|UART01x_FR_DSR|UART01x_FR_CTS) + +#endif -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/6] arm: add Nomadik 8815 SoC support 2010-08-04 1:43 ` [PATCH 3/6] amba: add pl011 Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 5/6] nand: driver for Nomadik 8815 SoC Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 6:46 ` [PATCH 3/6] amba: add pl011 Sascha Hauer 1 sibling, 1 reply; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- arch/arm/Kconfig | 7 ++ arch/arm/Makefile | 1 + arch/arm/mach-nomadik/8815.c | 76 +++++++++++++++++++++ arch/arm/mach-nomadik/Kconfig | 11 +++ arch/arm/mach-nomadik/Makefile | 3 + arch/arm/mach-nomadik/clock.c | 52 ++++++++++++++ arch/arm/mach-nomadik/clock.h | 14 ++++ arch/arm/mach-nomadik/include/mach/board.h | 28 ++++++++ arch/arm/mach-nomadik/include/mach/clkdev.h | 7 ++ arch/arm/mach-nomadik/include/mach/fsmc.h | 28 ++++++++ arch/arm/mach-nomadik/include/mach/hardware.h | 91 +++++++++++++++++++++++++ arch/arm/mach-nomadik/include/mach/mtu.h | 46 +++++++++++++ arch/arm/mach-nomadik/include/mach/timex.h | 6 ++ arch/arm/mach-nomadik/reset.c | 36 ++++++++++ arch/arm/mach-nomadik/timer.c | 81 ++++++++++++++++++++++ 15 files changed, 487 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-nomadik/8815.c create mode 100644 arch/arm/mach-nomadik/Kconfig create mode 100644 arch/arm/mach-nomadik/Makefile create mode 100644 arch/arm/mach-nomadik/clock.c create mode 100644 arch/arm/mach-nomadik/clock.h create mode 100644 arch/arm/mach-nomadik/include/mach/board.h create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h create mode 100644 arch/arm/mach-nomadik/reset.c create mode 100644 arch/arm/mach-nomadik/timer.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 53b7783..82dbfda 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -47,6 +47,12 @@ config ARCH_NETX bool "Hilscher NetX based" select CPU_ARM926T +config ARCH_NOMADIK + bool "STMicroelectronics Nomadik" + select CPU_ARM926T + help + Support for the Nomadik platform by ST-Ericsson + config ARCH_OMAP bool "TI OMAP" @@ -63,6 +69,7 @@ source arch/arm/mach-at91rm9200/Kconfig source arch/arm/mach-ep93xx/Kconfig source arch/arm/mach-imx/Kconfig source arch/arm/mach-netx/Kconfig +source arch/arm/mach-nomadik/Kconfig source arch/arm/mach-omap/Kconfig source arch/arm/mach-s3c24xx/Kconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bd78259..4d6a76d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -42,6 +42,7 @@ machine-$(CONFIG_ARCH_AT91) := at91 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200 machine-$(CONFIG_ARCH_EP93XX) := ep93xx machine-$(CONFIG_ARCH_IMX) := imx +machine-$(CONFIG_ARCH_NOMADIK) := nomadik machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_S3C24xx) := s3c24xx diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c new file mode 100644 index 0000000..8598f14 --- /dev/null +++ b/arch/arm/mach-nomadik/8815.c @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#include <common.h> +#include <init.h> +#include <asm/hardware.h> +#include <mach/hardware.h> +#include <asm/armlinux.h> +#include <asm/mach-types.h> + +#include "clock.h" + +static struct clk st8815_clk_48 = { + .rate = 48 * 1000 * 1000, +}; + +static struct memory_platform_data ram_pdata = { + .name = "ram0", + .flags = DEVFS_RDWR, +}; + +static struct device_d sdram_dev = { + .name = "mem", + .map_base = 0x00000000, + .platform_data = &ram_pdata, +}; + +void st8815_add_device_sdram(u32 size) +{ + sdram_dev.size = size; + register_device(&sdram_dev); + armlinux_add_dram(&sdram_dev); +} + +static struct device_d uart0_serial_device = { + .name = "uart-pl011", + .map_base = NOMADIK_UART0_BASE, + .size = 4096, +}; + +static struct device_d uart1_serial_device = { + .name = "uart-pl011", + .map_base = NOMADIK_UART1_BASE, + .size = 4096, +}; + +void st8815_register_uart(unsigned id) +{ + switch (id) { + case 0: + nmdk_clk_create(&st8815_clk_48, uart0_serial_device.name); + register_device(&uart0_serial_device); + break; + case 1: + nmdk_clk_create(&st8815_clk_48, uart1_serial_device.name); + register_device(&uart1_serial_device); + break; + } +} diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig new file mode 100644 index 0000000..4cf3f7b --- /dev/null +++ b/arch/arm/mach-nomadik/Kconfig @@ -0,0 +1,11 @@ +if ARCH_NOMADIK + +choice + prompt "Nomadik boards" + +endchoice + +config NOMADIK_8815 + bool + +endif diff --git a/arch/arm/mach-nomadik/Makefile b/arch/arm/mach-nomadik/Makefile new file mode 100644 index 0000000..1d77c4c --- /dev/null +++ b/arch/arm/mach-nomadik/Makefile @@ -0,0 +1,3 @@ + +obj-y += clock.o reset.o timer.o +obj-y += 8815.o diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c new file mode 100644 index 0000000..c74e0c1 --- /dev/null +++ b/arch/arm/mach-nomadik/clock.c @@ -0,0 +1,52 @@ +/* + * linux/arch/arm/mach-nomadik/clock.c + * + * Copyright (C) 2009 Alessandro Rubini + */ +#include <common.h> +#include <errno.h> +#include <linux/err.h> +#include <linux/clk.h> +#include <init.h> +#include <asm/clkdev.h> + +#include "clock.h" + +/* + * The nomadik board uses generic clocks, but the serial pl011 file + * calls clk_enable(), clk_disable(), clk_get_rate(), so we provide them + */ +unsigned long clk_get_rate(struct clk *clk) +{ + return clk->rate; +} +EXPORT_SYMBOL(clk_get_rate); + +/* enable and disable do nothing */ +int clk_enable(struct clk *clk) +{ + return 0; +} +EXPORT_SYMBOL(clk_enable); + +void clk_disable(struct clk *clk) +{ +} +EXPORT_SYMBOL(clk_disable); + +int __clk_get(struct clk *clk) +{ + return 1; +} + +/* Create a clock structure with the given name */ +int nmdk_clk_create(struct clk *clk, const char *dev_id) +{ + struct clk_lookup *clkdev; + + clkdev = clkdev_alloc(clk, NULL, dev_id); + if (!clkdev) + return -ENOMEM; + clkdev_add(clkdev); + return 0; +} diff --git a/arch/arm/mach-nomadik/clock.h b/arch/arm/mach-nomadik/clock.h new file mode 100644 index 0000000..eade4a6 --- /dev/null +++ b/arch/arm/mach-nomadik/clock.h @@ -0,0 +1,14 @@ +/* + * linux/arch/arm/mach-nomadik/clock.h + * + * Copyright (C) 2009 Alessandro Rubini + * + * 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. + */ +struct clk { + unsigned long rate; +}; + +int nmdk_clk_create(struct clk *clk, const char *dev_id); diff --git a/arch/arm/mach-nomadik/include/mach/board.h b/arch/arm/mach-nomadik/include/mach/board.h new file mode 100644 index 0000000..b4979fe --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/board.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#ifndef __ASM_ARCH_BOARD_H +#define __ASM_ARCH_BOARD_H + +void st8815_add_device_sdram(u32 size); + +void st8815_register_uart(unsigned id); + +#endif diff --git a/arch/arm/mach-nomadik/include/mach/clkdev.h b/arch/arm/mach-nomadik/include/mach/clkdev.h new file mode 100644 index 0000000..04b37a8 --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/clkdev.h @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H + +#define __clk_get(clk) ({ 1; }) +#define __clk_put(clk) do { } while (0) + +#endif diff --git a/arch/arm/mach-nomadik/include/mach/fsmc.h b/arch/arm/mach-nomadik/include/mach/fsmc.h new file mode 100644 index 0000000..e010c72 --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/fsmc.h @@ -0,0 +1,28 @@ +/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */ + +#ifndef __ASM_ARCH_FSMC_H +#define __ASM_ARCH_FSMC_H + +#include <mach/hardware.h> +/* + * Register list + */ + +/* bus control reg. and bus timing reg. for CS0..CS3 */ +#define FSMC_BCR(x) (NOMADIK_FSMC_VA + (x << 3)) +#define FSMC_BTR(x) (NOMADIK_FSMC_VA + (x << 3) + 0x04) + +/* PC-card and NAND: + * PCR = control register + * PMEM = memory timing + * PATT = attribute timing + * PIO = I/O timing + * PECCR = ECC result + */ +#define FSMC_PCR(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00) +#define FSMC_PMEM(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08) +#define FSMC_PATT(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c) +#define FSMC_PIO(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10) +#define FSMC_PECCR(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14) + +#endif /* __ASM_ARCH_FSMC_H */ diff --git a/arch/arm/mach-nomadik/include/mach/hardware.h b/arch/arm/mach-nomadik/include/mach/hardware.h new file mode 100644 index 0000000..0f9bd95 --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/hardware.h @@ -0,0 +1,91 @@ +/* + * This file contains the hardware definitions of the Nomadik. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __ASM_ARCH_HARDWARE_H +#define __ASM_ARCH_HARDWARE_H + +/* Nomadik registers live from 0x1000.0000 to 0x1023.0000 -- currently */ +#define NOMADIK_IO_VIRTUAL 0xF0000000 /* VA of IO */ +#define NOMADIK_IO_PHYSICAL 0x10000000 /* PA of IO */ +#define NOMADIK_IO_SIZE 0x00300000 /* 3MB for all regs */ + +#ifndef CONFIG_MMU +#define io_p2v(x) (x) +#define io_v2p(x) (x) +#else +#define io_p2v(x) ((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL) +#define io_v2p(x) ((x) - NOMADIK_IO_VIRTUAL + NOMADIK_IO_PHYSICAL) +#endif + +#define IO_ADDRESS(x) (io_p2v(x)) /* used in asm and more */ + +/* + * Base address defination for Nomadik Onchip Logic Block + */ +#define NOMADIK_FSMC_BASE 0x10100000 /* FSMC registers */ +#define NOMADIK_SDRAMC_BASE 0x10110000 /* SDRAM Controller */ +#define NOMADIK_CLCDC_BASE 0x10120000 /* CLCD Controller */ +#define NOMADIK_MDIF_BASE 0x10120000 /* MDIF */ +#define NOMADIK_DMA0_BASE 0x10130000 /* DMA0 Controller */ +#define NOMADIK_IC_BASE 0x10140000 /* Vectored Irq Controller */ +#define NOMADIK_DMA1_BASE 0x10150000 /* DMA1 Controller */ +#define NOMADIK_USB_BASE 0x10170000 /* USB-OTG conf reg base */ +#define NOMADIK_CRYP_BASE 0x10180000 /* Crypto processor */ +#define NOMADIK_SHA1_BASE 0x10190000 /* SHA-1 Processor */ +#define NOMADIK_XTI_BASE 0x101A0000 /* XTI */ +#define NOMADIK_RNG_BASE 0x101B0000 /* Random number generator */ +#define NOMADIK_SRC_BASE 0x101E0000 /* SRC base */ +#define NOMADIK_WDOG_BASE 0x101E1000 /* Watchdog */ +#define NOMADIK_MTU0_BASE 0x101E2000 /* Multiple Timer 0 */ +#define NOMADIK_MTU1_BASE 0x101E3000 /* Multiple Timer 1 */ +#define NOMADIK_GPIO0_BASE 0x101E4000 /* GPIO0 */ +#define NOMADIK_GPIO1_BASE 0x101E5000 /* GPIO1 */ +#define NOMADIK_GPIO2_BASE 0x101E6000 /* GPIO2 */ +#define NOMADIK_GPIO3_BASE 0x101E7000 /* GPIO3 */ +#define NOMADIK_RTC_BASE 0x101E8000 /* Real Time Clock base */ +#define NOMADIK_PMU_BASE 0x101E9000 /* Power Management Unit */ +#define NOMADIK_OWM_BASE 0x101EA000 /* One wire master */ +#define NOMADIK_SCR_BASE 0x101EF000 /* Secure Control registers */ +#define NOMADIK_MSP2_BASE 0x101F0000 /* MSP 2 interface */ +#define NOMADIK_MSP1_BASE 0x101F1000 /* MSP 1 interface */ +#define NOMADIK_UART2_BASE 0x101F2000 /* UART 2 interface */ +#define NOMADIK_SSIRx_BASE 0x101F3000 /* SSI 8-ch rx interface */ +#define NOMADIK_SSITx_BASE 0x101F4000 /* SSI 8-ch tx interface */ +#define NOMADIK_MSHC_BASE 0x101F5000 /* Memory Stick(Pro) Host */ +#define NOMADIK_SDI_BASE 0x101F6000 /* SD-card/MM-Card */ +#define NOMADIK_I2C1_BASE 0x101F7000 /* I2C1 interface */ +#define NOMADIK_I2C0_BASE 0x101F8000 /* I2C0 interface */ +#define NOMADIK_MSP0_BASE 0x101F9000 /* MSP 0 interface */ +#define NOMADIK_FIRDA_BASE 0x101FA000 /* FIrDA interface */ +#define NOMADIK_UART1_BASE 0x101FB000 /* UART 1 interface */ +#define NOMADIK_SSP_BASE 0x101FC000 /* SSP interface */ +#define NOMADIK_UART0_BASE 0x101FD000 /* UART 0 interface */ +#define NOMADIK_SGA_BASE 0x101FE000 /* SGA interface */ +#define NOMADIK_L2CC_BASE 0x10210000 /* L2 Cache controller */ + +/* Other ranges, not for p2v/v2p */ +#define NOMADIK_BACKUP_RAM 0x80010000 +#define NOMADIK_EBROM 0x80000000 /* Embedded boot ROM */ +#define NOMADIK_HAMACV_DMEM_BASE 0xA0100000 /* HAMACV Data Memory Start */ +#define NOMADIK_HAMACV_DMEM_END 0xA01FFFFF /* HAMACV Data Memory End */ +#define NOMADIK_HAMACA_DMEM 0xA0200000 /* HAMACA Data Memory Space */ + +#define NOMADIK_FSMC_VA IO_ADDRESS(NOMADIK_FSMC_BASE) +#define NOMADIK_MTU0_VA IO_ADDRESS(NOMADIK_MTU0_BASE) +#define NOMADIK_MTU1_VA IO_ADDRESS(NOMADIK_MTU1_BASE) + +#endif /* __ASM_ARCH_HARDWARE_H */ diff --git a/arch/arm/mach-nomadik/include/mach/mtu.h b/arch/arm/mach-nomadik/include/mach/mtu.h new file mode 100644 index 0000000..9095d86 --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/mtu.h @@ -0,0 +1,46 @@ +#ifndef __ASM_ARCH_MTU_H +#define __ASM_ARCH_MTU_H + +/* + * The MTU device hosts four different counters, with 4 set of + * registers. These are register names. + */ + +#define MTU_IMSC 0x00 /* Interrupt mask set/clear */ +#define MTU_RIS 0x04 /* Raw interrupt status */ +#define MTU_MIS 0x08 /* Masked interrupt status */ +#define MTU_ICR 0x0C /* Interrupt clear register */ + +/* per-timer registers take 0..3 as argument */ +#define MTU_LR(x) (0x10 + 0x10 * (x) + 0x00) /* Load value */ +#define MTU_VAL(x) (0x10 + 0x10 * (x) + 0x04) /* Current value */ + +#define MTU_CR(x) (0x10 + 0x10 * (x) + 0x08) /* Control reg */ +#define MTU_BGLR(x) (0x10 + 0x10 * (x) + 0x0c) /* At next overflow */ + + +/* bits for the control register */ +#define MTU_CRn_ENA 0x80 +#define MTU_CRn_PERIODIC 0x40 /* if 0 = free-running */ +#define MTU_CRn_PRESCALE_MASK 0x0c +#define MTU_CRn_PRESCALE_1 0x00 +#define MTU_CRn_PRESCALE_16 0x04 +#define MTU_CRn_PRESCALE_256 0x08 +#define MTU_CRn_32BITS 0x02 +#define MTU_CRn_ONESHOT 0x01 /* if 0 = wraps reloading from BGLR*/ + +/* Other registers are usual amba/primecell registers, currently not used */ +#define MTU_ITCR 0xff0 +#define MTU_ITOP 0xff4 + +#define MTU_PERIPH_ID0 0xfe0 +#define MTU_PERIPH_ID1 0xfe4 +#define MTU_PERIPH_ID2 0xfe8 +#define MTU_PERIPH_ID3 0xfeC + +#define MTU_PCELL0 0xff0 +#define MTU_PCELL1 0xff4 +#define MTU_PCELL2 0xff8 +#define MTU_PCELL3 0xffC + +#endif /* __ASM_ARCH_MTU_H */ diff --git a/arch/arm/mach-nomadik/include/mach/timex.h b/arch/arm/mach-nomadik/include/mach/timex.h new file mode 100644 index 0000000..b2b41fa --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/timex.h @@ -0,0 +1,6 @@ +#ifndef __ASM_ARCH_TIMEX_H +#define __ASM_ARCH_TIMEX_H + +#define CLOCK_TICK_RATE 2400000 + +#endif diff --git a/arch/arm/mach-nomadik/reset.c b/arch/arm/mach-nomadik/reset.c new file mode 100644 index 0000000..d55f278 --- /dev/null +++ b/arch/arm/mach-nomadik/reset.c @@ -0,0 +1,36 @@ +/* + * mach-nomadik/include/mach/system.h + * + * Copyright (C) 2008 STMicroelectronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <mach/hardware.h> + +void __noreturn reset_cpu(unsigned long addr) +{ + void __iomem *src_rstsr = (void *)(NOMADIK_SRC_BASE + 0x18); + + /* FIXME: use egpio when implemented */ + + /* Write anything to Reset status register */ + writel(1, src_rstsr); + + /* Not reached */ + while (1); +} +EXPORT_SYMBOL(reset_cpu); diff --git a/arch/arm/mach-nomadik/timer.c b/arch/arm/mach-nomadik/timer.c new file mode 100644 index 0000000..12e56f0 --- /dev/null +++ b/arch/arm/mach-nomadik/timer.c @@ -0,0 +1,81 @@ +/* + * linux/arch/arm/mach-nomadik/timer.c + * + * Copyright (C) 2008 STMicroelectronics + * Copyright (C) 2009 Alessandro Rubini, somewhat based on at91sam926x + * + * 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 <common.h> +#include <init.h> +#include <clock.h> +#include <asm/io.h> +#include <mach/hardware.h> +#include <mach/mtu.h> +#include <mach/timex.h> + +/* Initial value for SRC control register: all timers use MXTAL/8 source */ +#define SRC_CR_INIT_MASK 0x00007fff +#define SRC_CR_INIT_VAL 0x2aaa8000 + +static u32 nmdk_cycle; /* write-once */ +static __iomem void *mtu_base; + +/* + * clocksource: the MTU device is a decrementing counters, so we negate + * the value being read. + */ +static uint64_t nmdk_read_timer(void) +{ + return nmdk_cycle - readl(mtu_base + MTU_VAL(0)); +} + +static struct clocksource nmdk_clksrc = { + .read = nmdk_read_timer, + .shift = 20, + .mask = 0xffffffff, +}; + +static void nmdk_timer_reset(void) +{ + u32 cr; + + writel(0, mtu_base + MTU_CR(0)); /* off */ + + /* configure load and background-load, and fire it up */ + writel(nmdk_cycle, mtu_base + MTU_LR(0)); + writel(nmdk_cycle, mtu_base + MTU_BGLR(0)); + cr = MTU_CRn_PRESCALE_1 | MTU_CRn_32BITS; + writel(cr, mtu_base + MTU_CR(0)); + writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0)); +} + +static int nmdk_timer_init(void) +{ + u32 src_cr; + unsigned long rate; + + rate = CLOCK_TICK_RATE; /* 2.4MHz */ + nmdk_cycle = (rate + 1000 / 2) / 1000; + + /* Configure timer sources in "system reset controller" ctrl reg */ + src_cr = readl(NOMADIK_SRC_BASE); + src_cr &= SRC_CR_INIT_MASK; + src_cr |= SRC_CR_INIT_VAL; + writel(src_cr, NOMADIK_SRC_BASE); + + /* Save global pointer to mtu, used by functions above */ + mtu_base = (void *)NOMADIK_MTU0_BASE; + + /* Init the timer and register clocksource */ + nmdk_timer_reset(); + + nmdk_clksrc.mult = clocksource_hz2mult(rate, nmdk_clksrc.shift); + + init_clock(&nmdk_clksrc); + + return 0; +} +core_initcall(nmdk_timer_init); -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 5/6] nand: driver for Nomadik 8815 SoC 2010-08-04 1:43 ` [PATCH 4/6] arm: add Nomadik 8815 SoC support Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 6/6] arm: add nhk8815 board support Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- arch/arm/mach-nomadik/include/mach/nand.h | 16 ++ drivers/mtd/nand/Kconfig | 5 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/nomadik_nand.c | 248 +++++++++++++++++++++++++++++ 4 files changed, 270 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h create mode 100644 drivers/mtd/nand/nomadik_nand.c diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/arch/arm/mach-nomadik/include/mach/nand.h new file mode 100644 index 0000000..265fe53 --- /dev/null +++ b/arch/arm/mach-nomadik/include/mach/nand.h @@ -0,0 +1,16 @@ +#ifndef __ASM_ARCH_NAND_H +#define __ASM_ARCH_NAND_H + +struct nomadik_nand_platform_data { + unsigned long data_va; + unsigned long cmd_va; + unsigned long addr_va; + int options; + int (*init) (void); +}; + +#define NAND_IO_DATA 0x40000000 +#define NAND_IO_CMD 0x40800000 +#define NAND_IO_ADDR 0x41000000 + +#endif /* __ASM_ARCH_NAND_H */ diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index ddc0c34..475499a 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -97,5 +97,10 @@ config MTD_NAND_DISKONCHIP_BBTWRITE load time (assuming you build diskonchip as a module) with the module parameter "inftl_bbt_write=1". +config MTD_NAND_NOMADIK + tristate "ST Nomadik 8815 NAND support" + depends on ARCH_NOMADIK + help + Driver for the NAND flash controller on the Nomadik, with ECC. endif diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 73f7346..bac39e7 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o obj-$(CONFIG_NAND) += nand_base.o nand_bbt.o obj-$(CONFIG_MTD_NAND_DISKONCHIP) += diskonchip.o +obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o obj-$(CONFIG_NAND_IMX) += nand_imx.o obj-$(CONFIG_NAND_OMAP_GPMC) += nand_omap_gpmc.o obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c new file mode 100644 index 0000000..673fd88 --- /dev/null +++ b/drivers/mtd/nand/nomadik_nand.c @@ -0,0 +1,248 @@ +/* + * drivers/mtd/nand/nomadik_nand.c + * + * Overview: + * Driver for on-board NAND flash on Nomadik Platforms + * + * Copyright (C) 2007 STMicroelectronics Pvt. Ltd. + * Author: Sachin Verma <sachin.verma@st.com> + * + * Copyright (C) 2009 Alessandro Rubini + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that 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. + * + */ + +#include <common.h> +#include <driver.h> +#include <malloc.h> +#include <init.h> + +#include <linux/types.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/nand.h> + +#include <asm/io.h> +#include <mach/nand.h> +#include <mach/fsmc.h> + +#include <errno.h> + +struct nomadik_nand_host { + struct mtd_info mtd; + struct nand_chip nand; + void __iomem *cmd_va; + void __iomem *addr_va; + struct nand_bbt_descr *bbt_desc; +}; + +static inline int parity(int b) /* uses low 8 bits: returns 0 or all-1 */ +{ + b = b ^ (b >> 4); + b = b ^ (b >> 2); + return (b ^ (b >> 1)) & 1 + ? ~0 : 0; +} + +/* + * This is the ECC routine used in hardware, according to the manual. + * HW claims to make the calculation but not the correction. However, + * I haven't managed to get the desired data out of it; so do it in sw. + * There is problably some errata involved, but currently miss the info. + */ +static int nomadik_ecc512_calc(struct mtd_info *mtd, const u_char *data, + u_char *ecc) +{ + int gpar = 0; + int i, val, par; + int pbits = 0; /* P8, P16, ... P2048 */ + int pprime = 0; /* P8', P16', ... P2048' */ + int lowbits; /* P1, P2, P4 and primes */ + + for (i = 0; i < 512; i++) { + par = parity((val = data[i])); + gpar ^= val; + pbits ^= (i & par); + } + /* + * Ok, now gpar is global parity (xor of all bytes) + * pbits are all the parity bits (non-prime ones) + */ + par = parity(gpar); + pprime = pbits ^ par; + /* Put low bits in the right position for ecc[2] (bits 7..2) */ + lowbits = 0 + | (parity(gpar & 0xf0) & 0x80) /* P4 */ + | (parity(gpar & 0x0f) & 0x40) /* P4' */ + | (parity(gpar & 0xcc) & 0x20) /* P2 */ + | (parity(gpar & 0x33) & 0x10) /* P2' */ + | (parity(gpar & 0xaa) & 0x08) /* P1 */ + | (parity(gpar & 0x55) & 0x04); /* P1' */ + + ecc[2] = ~(lowbits | ((pbits & 0x100) >> 7) | ((pprime & 0x100) >> 8)); + /* now intermix bits for ecc[1] (P1024..P128') and ecc[0] (P64..P8') */ + ecc[1] = ~( (pbits & 0x80) >> 0 | ((pprime & 0x80) >> 1) + | ((pbits & 0x40) >> 1) | ((pprime & 0x40) >> 2) + | ((pbits & 0x20) >> 2) | ((pprime & 0x20) >> 3) + | ((pbits & 0x10) >> 3) | ((pprime & 0x10) >> 4)); + + ecc[0] = ~( (pbits & 0x8) << 4 | ((pprime & 0x8) << 3) + | ((pbits & 0x4) << 3) | ((pprime & 0x4) << 2) + | ((pbits & 0x2) << 2) | ((pprime & 0x2) << 1) + | ((pbits & 0x1) << 1) | ((pprime & 0x1) << 0)); + return 0; +} + +static int nomadik_ecc512_correct(struct mtd_info *mtd, uint8_t *dat, + uint8_t *r_ecc, uint8_t *c_ecc) +{ + struct nand_chip *chip = mtd->priv; + uint32_t r, c, d, diff; /*read, calculated, xor of them */ + + if (!memcmp(r_ecc, c_ecc, chip->ecc.bytes)) + return 0; + + /* Reorder the bytes into ascending-order 24 bits -- see manual */ + r = r_ecc[2] << 22 | r_ecc[1] << 14 | r_ecc[0] << 6 | r_ecc[2] >> 2; + c = c_ecc[2] << 22 | c_ecc[1] << 14 | c_ecc[0] << 6 | c_ecc[2] >> 2; + diff = (r ^ c) & ((1 << 24) - 1); /* use 24 bits only */ + + /* If 12 bits are different, one per pair, it's correctable */ + if (((diff | (diff>>1)) & 0x555555) == 0x555555) { + int bit = ((diff & 2) >> 1) + | ((diff & 0x8) >> 2) | ((diff & 0x20) >> 3); + int byte; + + d = diff >> 6; /* remove bit-order info */ + byte = ((d & 2) >> 1) + | ((d & 0x8) >> 2) | ((d & 0x20) >> 3) + | ((d & 0x80) >> 4) | ((d & 0x200) >> 5) + | ((d & 0x800) >> 6) | ((d & 0x2000) >> 7) + | ((d & 0x8000) >> 8) | ((d & 0x20000) >> 9); + /* correct the single bit */ + dat[byte] ^= 1 << bit; + return 0; + } + /* If 1 bit only differs, it's one bit error in ECC, ignore */ + if ((diff ^ (1 << (ffs(diff) - 1))) == 0) + return 0; + /* Otherwise, uncorrectable */ + return -1; +} + +static struct nand_ecclayout nomadik_ecc_layout = { + .eccbytes = 3 * 4, + .eccpos = { /* each subpage has 16 bytes: pos 2,3,4 hosts ECC */ + 0x02, 0x03, 0x04, + 0x12, 0x13, 0x14, + 0x22, 0x23, 0x24, + 0x32, 0x33, 0x34}, + /* let's keep bytes 5,6,7 for us, just in case we change ECC algo */ + .oobfree = { {0x08, 0x08}, {0x18, 0x08}, {0x28, 0x08}, {0x38, 0x08} }, +}; + +static void nomadik_ecc_control(struct mtd_info *mtd, int mode) +{ + /* No need to enable hw ecc, it's on by default */ +} + +static void nomadik_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) +{ + struct nand_chip *nand = mtd->priv; + struct nomadik_nand_host *host = nand->priv; + + if (cmd == NAND_CMD_NONE) + return; + + if (ctrl & NAND_CLE) + writeb(cmd, host->cmd_va); + else + writeb(cmd, host->addr_va); +} + +static int nomadik_nand_probe(struct device_d *dev) +{ + struct nomadik_nand_platform_data *pdata = dev->platform_data; + struct nomadik_nand_host *host; + struct mtd_info *mtd; + struct nand_chip *nand; + int ret = 0; + + /* Allocate memory for the device structure (and zero it) */ + host = kzalloc(sizeof(struct nomadik_nand_host), GFP_KERNEL); + if (!host) { + dev_err(dev, "Failed to allocate device structure.\n"); + return -ENOMEM; + } + + /* Call the client's init function, if any */ + if (pdata->init && (ret = pdata->init()) < 0) { + dev_err(dev, "Init function failed\n"); + goto err; + } + + host->cmd_va = (void __iomem*)pdata->cmd_va; + host->addr_va = (void __iomem*)pdata->addr_va; + + /* Link all private pointers */ + mtd = &host->mtd; + nand = &host->nand; + mtd->priv = nand; + nand->priv = host; + + nand->IO_ADDR_R = (void __iomem*)pdata->data_va; + nand->IO_ADDR_W = (void __iomem*)pdata->data_va; + nand->cmd_ctrl = nomadik_cmd_ctrl; + + nand->ecc.mode = NAND_ECC_HW; + nand->ecc.layout = &nomadik_ecc_layout; + nand->ecc.calculate = nomadik_ecc512_calc; + nand->ecc.correct = nomadik_ecc512_correct; + nand->ecc.hwctl = nomadik_ecc_control; + nand->ecc.size = 512; + nand->ecc.bytes = 3; + + nand->options = pdata->options; + + /* + * Scan to find existance of the device + */ + if (nand_scan(&host->mtd, 1)) { + ret = -ENXIO; + goto err; + } + + pr_info("Registering %s as whole device\n", mtd->name); + add_mtd_device(mtd); + + return 0; + +err: + kfree(host); + return ret; +} + +static struct driver_d nomadik_nand_driver = { + .probe = nomadik_nand_probe, + .name = "nomadik_nand", +}; + +static int __init nand_nomadik_init(void) +{ + pr_info("Nomadik NAND driver\n"); + return register_driver(&nomadik_nand_driver); +} + +device_initcall(nand_nomadik_init); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("ST Microelectronics (sachin.verma@st.com)"); +MODULE_DESCRIPTION("NAND driver for Nomadik Platform"); -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 6/6] arm: add nhk8815 board support 2010-08-04 1:43 ` [PATCH 5/6] nand: driver for Nomadik 8815 SoC Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 1:43 UTC (permalink / raw) To: barebox; +Cc: Andrea GALLO with the following support uart 0 & 1 network nand Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Andrea GALLO <andrea.gallo@stericsson.com> Cc: Gael SALLES <gael.salles@stericsson.com> --- arch/arm/Makefile | 1 + arch/arm/boards/nhk8815/Makefile | 1 + arch/arm/boards/nhk8815/env/bin/_update | 36 +++ arch/arm/boards/nhk8815/env/bin/boot | 38 ++++ arch/arm/boards/nhk8815/env/bin/init | 28 +++ .../boards/nhk8815/env/bin/update_barebox_xmodem | 19 ++ arch/arm/boards/nhk8815/env/bin/update_kernel | 8 + arch/arm/boards/nhk8815/env/bin/update_root | 8 + arch/arm/boards/nhk8815/env/config | 32 +++ arch/arm/boards/nhk8815/setup.c | 106 +++++++++ arch/arm/configs/nhk8815_defconfig | 232 ++++++++++++++++++++ arch/arm/mach-nomadik/Kconfig | 13 + 12 files changed, 522 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boards/nhk8815/Makefile create mode 100644 arch/arm/boards/nhk8815/config.h create mode 100644 arch/arm/boards/nhk8815/env/bin/_update create mode 100644 arch/arm/boards/nhk8815/env/bin/boot create mode 100644 arch/arm/boards/nhk8815/env/bin/init create mode 100644 arch/arm/boards/nhk8815/env/bin/update_barebox_xmodem create mode 100644 arch/arm/boards/nhk8815/env/bin/update_kernel create mode 100644 arch/arm/boards/nhk8815/env/bin/update_root create mode 100644 arch/arm/boards/nhk8815/env/config create mode 100644 arch/arm/boards/nhk8815/setup.c create mode 100644 arch/arm/configs/nhk8815_defconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4d6a76d..4827fe9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -70,6 +70,7 @@ board-$(CONFIG_MACH_IMX21ADS) := imx21ads board-$(CONFIG_MACH_IMX27ADS) := imx27ads board-$(CONFIG_MACH_MMCCPU) := mmccpu board-$(CONFIG_MACH_MX1ADS) := mx1ads +board-$(CONFIG_MACH_NOMADIK_8815NHK) := nhk8815 board-$(CONFIG_MACH_NXDB500) := netx board-$(CONFIG_ARCH_OMAP) := omap board-$(CONFIG_MACH_PCA100) := phycard-i.MX27 diff --git a/arch/arm/boards/nhk8815/Makefile b/arch/arm/boards/nhk8815/Makefile new file mode 100644 index 0000000..2b9dba4 --- /dev/null +++ b/arch/arm/boards/nhk8815/Makefile @@ -0,0 +1 @@ +obj-y += setup.o diff --git a/arch/arm/boards/nhk8815/config.h b/arch/arm/boards/nhk8815/config.h new file mode 100644 index 0000000..e69de29 diff --git a/arch/arm/boards/nhk8815/env/bin/_update b/arch/arm/boards/nhk8815/env/bin/_update new file mode 100644 index 0000000..fb7cbe8 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/_update @@ -0,0 +1,36 @@ +#!/bin/sh + +if [ -z "$part" -o -z "$image" ]; then + echo "define \$part and \$image" + exit 1 +fi + +if [ \! -e "$part" ]; then + echo "Partition $part does not exist" + exit 1 +fi + +if [ $# = 1 ]; then + image=$1 +fi + +if [ x$ip = xdhcp ]; then + dhcp +fi + +ping $eth0.serverip +if [ $? -ne 0 ] ; then + echo "update aborted" + exit 1 +fi + +unprotect $part + +echo +echo "erasing partition $part" +erase $part + +echo +echo "flashing $image to $part" +echo +tftp $image $part diff --git a/arch/arm/boards/nhk8815/env/bin/boot b/arch/arm/boards/nhk8815/env/bin/boot new file mode 100644 index 0000000..fd8d957 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/boot @@ -0,0 +1,38 @@ +#!/bin/sh + +. /env/config + +if [ x$1 = xflash ]; then + root=flash + kernel=flash +fi + +if [ x$1 = xnet ]; then + root=net + kernel=net +fi + +if [ x$ip = xdhcp ]; then + bootargs="$bootargs ip=dhcp" +else + bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" +fi + +if [ x$root = xflash ]; then + bootargs="$bootargs root=$rootpart rootfstype=jffs2" +else + bootargs="$bootargs root=/dev/nfs nfsroot=192.168.23.111:$nfsroot" +fi + +bootargs="$bootargs" + +if [ $kernel = net ]; then + if [ x$ip = xdhcp ]; then + dhcp + fi + tftp $uimage uImage + bootm uImage +else + bootm /dev/nor0.kernel +fi + diff --git a/arch/arm/boards/nhk8815/env/bin/init b/arch/arm/boards/nhk8815/env/bin/init new file mode 100644 index 0000000..5b45a70 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/init @@ -0,0 +1,28 @@ +#!/bin/sh + +PATH=/env/bin +export PATH + +. /env/config + +if [ -e /dev/nand0 ]; then + addpart /dev/nand0 $nand_parts + + # Uh, oh, hush first expands wildcards and then starts executing + # commands. What a bug! + source /env/bin/hush_hack +fi + +echo +echo -n "Hit any key to stop autoboot: " +timeout -a $autoboot_timeout +if [ $? != 0 ]; then + echo + echo "type update_kernel [<imagename>] to update kernel into flash" + echo "type udate_root [<imagename>] to update rootfs into flash" + echo "type update_barebox_xmodem nor to update barebox into flash" + echo + exit +fi + +boot diff --git a/arch/arm/boards/nhk8815/env/bin/update_barebox_xmodem b/arch/arm/boards/nhk8815/env/bin/update_barebox_xmodem new file mode 100644 index 0000000..40f4ad3 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/update_barebox_xmodem @@ -0,0 +1,19 @@ +#!/bin/sh + +. /env/config + +part=/dev/nand0.barebox + +loadb -f barebox.bin -c + +unprotect $part +echo +echo "erasing partition $part" +erase $part + +echo +echo "flashing barebox.bin to $part" +echo +cp barebox.bin $part +crc32 -f barebox.bin +crc32 -f $part diff --git a/arch/arm/boards/nhk8815/env/bin/update_kernel b/arch/arm/boards/nhk8815/env/bin/update_kernel new file mode 100644 index 0000000..db0f4c2 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/update_kernel @@ -0,0 +1,8 @@ +#!/bin/sh + +. /env/config + +image=$uimage +part=/dev/nand0.kernel + +. /env/bin/_update $1 diff --git a/arch/arm/boards/nhk8815/env/bin/update_root b/arch/arm/boards/nhk8815/env/bin/update_root new file mode 100644 index 0000000..9530e84 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/bin/update_root @@ -0,0 +1,8 @@ +#!/bin/sh + +. /env/config + +image=$jffs2 +part=/dev/nand0.rootfs + +. /env/bin/_update $1 diff --git a/arch/arm/boards/nhk8815/env/config b/arch/arm/boards/nhk8815/env/config new file mode 100644 index 0000000..2b50b25 --- /dev/null +++ b/arch/arm/boards/nhk8815/env/config @@ -0,0 +1,32 @@ +#!/bin/sh + +# can be either 'net' or 'flash' +kernel=net +root=net + +# use 'dhcp' todo dhcp in uboot and in kernel +ip=dhcp + +# +# setup default ethernet address +# +#eth0.serverip=192.168.23.108 + +# Partition Size Start +# XloaderTOC + X-Loader 256KB 0x00000000 +# Memory init function 256KB 0x00040000 +# Barebox + env 2MB 0x00080000 +# Kernel Image 3MB 0x00280000 +# JFFS2 Root filesystem 22MB 0x00580000 +# JFFS2 User Data 100MB 0x01b80000 + +nand_parts="256k(xloader)ro,256k(meminit),2M(uboot),3M(kernel),22M(rootfs),100M(userfs),384k(free),128k(ubootenv)" + +uimage=uImage-nhk15 + +# use 'dhcp' to do dhcp in uboot and in kernel +ip=dhcp + +autoboot_timeout=3 + +bootargs="root=/dev/ram0 console=ttyAMA1,115200n8 init=linuxrc" diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c new file mode 100644 index 0000000..e9295f6 --- /dev/null +++ b/arch/arm/boards/nhk8815/setup.c @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#include <common.h> +#include <init.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/nand.h> +#include <partition.h> +#include <nand.h> +#include <asm/armlinux.h> +#include <asm/mach-types.h> +#include <asm/io.h> + +#include <mach/hardware.h> +#include <mach/board.h> +#include <mach/nand.h> +#include <mach/fsmc.h> + +static struct device_d nhk8815_network_dev = { + .name = "smc91c111", + .map_base = 0x34000300, + .size = 16, +}; + +static int nhk8815_nand_init(void) +{ + /* FSMC setup for nand chip select (8-bit nand in 8815NHK) */ + writel(0x0000000E, FSMC_PCR(0)); + writel(0x000D0A00, FSMC_PMEM(0)); + writel(0x00100A00, FSMC_PATT(0)); + + /* enable access to the chip select area */ + writel(readl(FSMC_PCR(0)) | 0x04, FSMC_PCR(0)); + + return 0; +} + +static struct nomadik_nand_platform_data nhk8815_nand_data = { + .addr_va = NAND_IO_ADDR, + .cmd_va = NAND_IO_CMD, + .data_va = NAND_IO_DATA, + .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \ + | NAND_NO_READRDY | NAND_NO_AUTOINCR, + .init = nhk8815_nand_init, +}; + +static struct device_d nhk8815_nand_device = { + .name = "nomadik_nand", + .platform_data = &nhk8815_nand_data, +}; + +static int nhk8815_devices_init(void) +{ + st8815_add_device_sdram(64 * 1024 *1024); + + writel(0xC37800F0, NOMADIK_GPIO1_BASE + 0x20); + writel(0x00000000, NOMADIK_GPIO1_BASE + 0x24); + writel(0x00000000, NOMADIK_GPIO1_BASE + 0x28); + writel(readl(NOMADIK_SRC_BASE) | 0x8000, NOMADIK_SRC_BASE); + + /* Set up SMCS1 for Ethernet: sram-like, enabled, timing values */ + writel(0x0000305b, FSMC_BCR(1)); + writel(0x00033f33, FSMC_BTR(1)); + + register_device(&nhk8815_network_dev); + + register_device(&nhk8815_nand_device); + + armlinux_set_architecture(MACH_TYPE_NOMADIK); + armlinux_set_bootparams((void *)(0x00000100)); + + devfs_add_partition("nand0", 0x0000000, 0x040000, PARTITION_FIXED, "xloader_raw"); + devfs_add_partition("nand0", 0x0040000, 0x080000, PARTITION_FIXED, "meminit_raw"); + devfs_add_partition("nand0", 0x0080000, 0x200000, PARTITION_FIXED, "self_raw"); + dev_add_bb_dev("self_raw", "self0"); + devfs_add_partition("nand0", 0x7FE0000, 0x020000, PARTITION_FIXED, "env_raw"); + dev_add_bb_dev("env_raw", "env0"); + + return 0; +} +device_initcall(nhk8815_devices_init); + +static int nhk8815_console_init(void) +{ + st8815_register_uart(1); + return 0; +} + +console_initcall(nhk8815_console_init); diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig new file mode 100644 index 0000000..3c9126f --- /dev/null +++ b/arch/arm/configs/nhk8815_defconfig @@ -0,0 +1,232 @@ +# +# Automatically generated make config: don't edit +# U-Boot version: 2.0.0-rc10 +# Mon Oct 12 18:36:24 2009 +# +# CONFIG_BOARD_LINKER_SCRIPT is not set +CONFIG_GENERIC_LINKER_SCRIPT=y +CONFIG_ARM=y +CONFIG_ARM_AMBA=y + +# +# System Type +# +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_AT91RM9200 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_NETX is not set +CONFIG_ARCH_NOMADIK=y +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_S3C24xx is not set +CONFIG_COMMON_CLKDEV=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y + +# +# processor features +# +CONFIG_ARCH_TEXT_BASE=0x03c00000 +CONFIG_BOARDINFO="NHK8815" +CONFIG_MACH_NOMADIK_8815NHK=y +CONFIG_NOMADIK_8815=y +# CONFIG_AEABI is not set + +# +# Arm specific settings +# +CONFIG_CMD_ARM_CPUINFO=y +CONFIG_CMDLINE_TAG=y +CONFIG_SETUP_MEMORY_TAGS=y +# CONFIG_INITRD_TAG is not set +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_GREGORIAN_CALENDER=y +CONFIG_HAS_KALLSYMS=y +CONFIG_HAS_MODULES=y +CONFIG_CMD_MEMORY=y +CONFIG_ENV_HANDLING=y + +# +# General Settings +# +CONFIG_LOCALVERSION_AUTO=y + +# +# memory layout +# +CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y +CONFIG_TEXT_BASE=0x03F80000 +CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y +CONFIG_MEMORY_LAYOUT_DEFAULT=y +# CONFIG_MEMORY_LAYOUT_FIXED is not set +CONFIG_STACK_SIZE=0x8000 +CONFIG_MALLOC_SIZE=0x400000 +# CONFIG_BROKEN is not set +# CONFIG_EXPERIMENTAL is not set +CONFIG_PROMPT="Nomadik:" +CONFIG_BAUDRATE=115200 +CONFIG_LONGHELP=y +CONFIG_CBSIZE=1024 +CONFIG_MAXARGS=16 +CONFIG_SHELL_HUSH=y +# CONFIG_SHELL_SIMPLE is not set +CONFIG_GLOB=y +CONFIG_PROMPT_HUSH_PS2="> " +# CONFIG_HUSH_FANCY_PROMPT is not set +CONFIG_CMDLINE_EDITING=y +CONFIG_AUTO_COMPLETE=y +CONFIG_DYNAMIC_CRC_TABLE=y +CONFIG_ERRNO_MESSAGES=y +CONFIG_TIMESTAMP=y +CONFIG_CONSOLE_FULL=y +CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_OF_FLAT_TREE is not set +CONFIG_PARTITION=y +CONFIG_DEFAULT_ENVIRONMENT=y +CONFIG_DEFAULT_ENVIRONMENT_PATH="board/nhk8815/env" + +# +# Debugging +# +# CONFIG_DEBUG_INFO is not set +# CONFIG_ENABLE_FLASH_NOISE is not set +# CONFIG_ENABLE_PARTITION_NOISE is not set +# CONFIG_ENABLE_DEVICE_NOISE is not set + +# +# Commands +# + +# +# scripting +# +CONFIG_CMD_EDIT=y +CONFIG_CMD_SLEEP=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_LOADENV=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_PRINTENV=y +CONFIG_CMD_READLINE=y +CONFIG_CMD_TRUE=y +CONFIG_CMD_FALSE=y + +# +# file commands +# +CONFIG_CMD_LS=y +CONFIG_CMD_RM=y +CONFIG_CMD_CAT=y +CONFIG_CMD_MKDIR=y +CONFIG_CMD_RMDIR=y +CONFIG_CMD_CP=y +CONFIG_CMD_PWD=y +CONFIG_CMD_CD=y +CONFIG_CMD_MOUNT=y +CONFIG_CMD_UMOUNT=y + +# +# console +# +CONFIG_CMD_CLEAR=y +CONFIG_CMD_ECHO=y +# CONFIG_CMD_ECHO_E is not set + +# +# memory +# +# CONFIG_CMD_LOADB is not set +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_CRC=y +CONFIG_CMD_MTEST=y +# CONFIG_CMD_MTEST_ALTERNATIVE is not set + +# +# flash +# +CONFIG_CMD_FLASH=y +# CONFIG_CMD_UBI is not set + +# +# booting +# +CONFIG_CMD_BOOTM=y +CONFIG_CMD_BOOTM_ZLIB=y +CONFIG_CMD_BOOTM_BZLIB=y +CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_BOOTU=y +# CONFIG_CMD_LINUX16 is not set +CONFIG_CMD_RESET=y +CONFIG_CMD_GO=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_PARTITION=y +CONFIG_CMD_TEST=y +CONFIG_CMD_VERSION=y +CONFIG_CMD_HELP=y +CONFIG_CMD_DEVINFO=y +# CONFIG_CMD_UNLZO is not set +CONFIG_NET=y +CONFIG_NET_DHCP=y +CONFIG_NET_NFS=y +CONFIG_NET_PING=y +CONFIG_NET_TFTP=y +# CONFIG_NET_TFTP_PUSH is not set +# CONFIG_NET_NETCONSOLE is not set +# CONFIG_NET_RESOLV is not set + +# +# Drivers +# + +# +# serial drivers +# +# CONFIG_DRIVER_SERIAL_ARM_DCC is not set +CONFIG_SERIAL_AMBA_PL011=y +# CONFIG_DRIVER_SERIAL_NS16550 is not set +CONFIG_MIIPHY=y + +# +# Network drivers +# +# CONFIG_DRIVER_NET_SMC911X is not set +CONFIG_DRIVER_NET_SMC91111=y + +# +# SPI drivers +# +# CONFIG_SPI is not set +# CONFIG_I2C is not set + +# +# flash drivers +# +# CONFIG_DRIVER_CFI is not set +CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_NOMADIK=y +# CONFIG_UBI is not set +# CONFIG_ATA is not set +# CONFIG_USB is not set +# CONFIG_USB_GADGET is not set +# CONFIG_VIDEO is not set + +# +# Filesystem support +# +# CONFIG_FS_CRAMFS is not set +CONFIG_FS_RAMFS=y +CONFIG_FS_DEVFS=y +CONFIG_ZLIB=y +CONFIG_BZLIB=y +CONFIG_CRC32=y +# CONFIG_GENERIC_FIND_NEXT_BIT is not set +# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 4cf3f7b..64894c8 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig @@ -1,11 +1,24 @@ if ARCH_NOMADIK +config ARCH_TEXT_BASE + hex + default 0x03c00000 if MACH_NOMADIK_8815NHK + +config BOARDINFO + default "NHK8815" if MACH_NOMADIK_8815NHK + choice prompt "Nomadik boards" +config MACH_NOMADIK_8815NHK + bool "ST 8815 Nomadik Hardware Kit (evaluation board)" + select NOMADIK_8815 + select COMMON_CLKDEV + endchoice config NOMADIK_8815 bool + select ARM_AMBA endif -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/6] amba: add pl011 2010-08-04 1:43 ` [PATCH 3/6] amba: add pl011 Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 4/6] arm: add Nomadik 8815 SoC support Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 6:46 ` Sascha Hauer 2010-08-04 13:51 ` Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 1 reply; 9+ messages in thread From: Sascha Hauer @ 2010-08-04 6:46 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox, Andrea GALLO On Wed, Aug 04, 2010 at 03:43:56AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > +++ b/drivers/serial/amba-pl011.c > @@ -0,0 +1,192 @@ > +/* > + * (C) Copyright 2000 > + * Rob Taylor, Flying Pig Systems. robt@flyingpig.com. > + * > + * (C) Copyright 2004 > + * ARM Ltd. > + * Philippe Robin, <philippe.robin@arm.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that 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, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +/* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */ We already have a driver for the pl010 in the tree, so I would expect arguments like 'this one is much more flexible, drop the old one', or 'the pl011 is totally different' (which doesn't seem to be the case). Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/6] amba: add pl011 2010-08-04 6:46 ` [PATCH 3/6] amba: add pl011 Sascha Hauer @ 2010-08-04 13:51 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 9+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-04 13:51 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox, Andrea GALLO On 08:46 Wed 04 Aug , Sascha Hauer wrote: > On Wed, Aug 04, 2010 at 03:43:56AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > +++ b/drivers/serial/amba-pl011.c > > @@ -0,0 +1,192 @@ > > +/* > > + * (C) Copyright 2000 > > + * Rob Taylor, Flying Pig Systems. robt@flyingpig.com. > > + * > > + * (C) Copyright 2004 > > + * ARM Ltd. > > + * Philippe Robin, <philippe.robin@arm.com> > > + * > > + * See file CREDITS for list of people who contributed to this > > + * project. > > + * > > + * This program is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU General Public License as > > + * published by the Free Software Foundation; either version 2 of > > + * the License, or (at your option) any later version. > > + * > > + * This program is distributed in the hope that 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, write to the Free Software > > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > > + * MA 02111-1307 USA > > + */ > > + > > +/* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */ > > We already have a driver for the pl010 in the tree, so I would expect > arguments like 'this one is much more flexible, drop the old one', or > 'the pl011 is totally different' (which doesn't seem to be the case). Yes this new driver is flexible and multi instance yes I'm working a new path to add the PL010 on it too and one of the issue of the current one is that you can not calculate the baudrate based on the uart base clock on contrary on the new one who use the clk framework. So yes I plan to add the PL010 on it too but after I've put the clock framework on the sock that use it and drop the old one Best Regards, J. > > Sascha > > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-08-04 13:55 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-08-04 1:42 [PATCH 0/6] common arm clkdev Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 1/6] string: add strlcpy support Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 2/6] arm: add common clkdev Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 3/6] amba: add pl011 Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 4/6] arm: add Nomadik 8815 SoC support Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 5/6] nand: driver for Nomadik 8815 SoC Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 1:43 ` [PATCH 6/6] arm: add nhk8815 board support Jean-Christophe PLAGNIOL-VILLARD 2010-08-04 6:46 ` [PATCH 3/6] amba: add pl011 Sascha Hauer 2010-08-04 13:51 ` Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox