* [PATCH 1/8] clocksource: add dummy software-only clocksource
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-12 20:50 ` Sascha Hauer
2014-03-10 21:34 ` [PATCH 2/8] import _AC and UL macros from linux kernel Antony Pavlov
` (6 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
This driver is very handy for initial barebox porting.
It was used for running barebox on DiGiC2-based camera
and initial porting barebox to Loongson-1 and ar9331.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: Alexander Aring <alex.aring@gmail.com>
Reported-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/clocksource/Kconfig | 9 +++++++
drivers/clocksource/Makefile | 1 +
drivers/clocksource/dummy.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 4ef25ec..f9e00ff 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -14,6 +14,15 @@ config CLOCKSOURCE_CLPS711X
bool
depends on ARCH_CLPS711X
+config CLOCKSOURCE_DUMMY
+ bool "Enable dummy software-only clocksource"
+ default n
+
+config CLOCKSOURCE_DUMMY_RATE
+ int "compile loglevel"
+ depends on CLOCKSOURCE_DUMMY
+ default 1000
+
config CLOCKSOURCE_MVEBU
bool
depends on ARCH_MVEBU
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 25b7f46..834a15d 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_AMBA_SP804) += amba-sp804.o
obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o
obj-$(CONFIG_CLOCKSOURCE_BCM2835) += bcm2835.o
obj-$(CONFIG_CLOCKSOURCE_CLPS711X) += clps711x.o
+obj-$(CONFIG_CLOCKSOURCE_DUMMY) += dummy.o
obj-$(CONFIG_CLOCKSOURCE_MVEBU) += mvebu.o
obj-$(CONFIG_CLOCKSOURCE_NOMADIK) += nomadik.o
obj-$(CONFIG_CLOCKSOURCE_ORION) += orion.o
diff --git a/drivers/clocksource/dummy.c b/drivers/clocksource/dummy.c
new file mode 100644
index 0000000..154a8cd
--- /dev/null
+++ b/drivers/clocksource/dummy.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * This file is part of barebox.
+ * 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 version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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 <init.h>
+#include <clock.h>
+
+static uint64_t dummy_counter;
+
+static uint64_t dummy_cs_read(void)
+{
+ static int first;
+
+ if (!first) {
+ pr_warn("Warning: Using dummy clocksource\n");
+ first = 1;
+ }
+
+ dummy_counter += CONFIG_CLOCKSOURCE_DUMMY_RATE;
+
+ return dummy_counter;
+}
+
+static struct clocksource dummy_cs = {
+ .read = dummy_cs_read,
+ .mask = CLOCKSOURCE_MASK(32),
+};
+
+static int clocksource_init(void)
+{
+ dummy_counter = 0;
+
+ clocks_calc_mult_shift(&dummy_cs.mult, &dummy_cs.shift,
+ 100000000, NSEC_PER_SEC, 10);
+
+ pr_debug("clocksource_init: mult=%08x, shift=%08x\n",
+ dummy_cs.mult, dummy_cs.shift);
+ init_clock(&dummy_cs);
+
+ return 0;
+}
+pure_initcall(clocksource_init);
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/8] clocksource: add dummy software-only clocksource
2014-03-10 21:34 ` [PATCH 1/8] clocksource: add dummy software-only clocksource Antony Pavlov
@ 2014-03-12 20:50 ` Sascha Hauer
2014-03-13 5:09 ` Antony Pavlov
0 siblings, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2014-03-12 20:50 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox
On Tue, Mar 11, 2014 at 01:34:34AM +0400, Antony Pavlov wrote:
> This driver is very handy for initial barebox porting.
> It was used for running barebox on DiGiC2-based camera
> and initial porting barebox to Loongson-1 and ar9331.
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Reported-by: Alexander Aring <alex.aring@gmail.com>
> Reported-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/clocksource/Kconfig | 9 +++++++
> drivers/clocksource/Makefile | 1 +
> drivers/clocksource/dummy.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 66 insertions(+)
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 4ef25ec..f9e00ff 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -14,6 +14,15 @@ config CLOCKSOURCE_CLPS711X
> bool
> depends on ARCH_CLPS711X
>
> +config CLOCKSOURCE_DUMMY
> + bool "Enable dummy software-only clocksource"
> + default n
You can drop the default n, no is the default already. Could you add
some help text mentioning that this clocksource is for early bringup
only and doesn't provide correct timing?
> +
> +config CLOCKSOURCE_DUMMY_RATE
> + int "compile loglevel"
copy/paste ;) ?
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] 12+ messages in thread
* Re: [PATCH 1/8] clocksource: add dummy software-only clocksource
2014-03-12 20:50 ` Sascha Hauer
@ 2014-03-13 5:09 ` Antony Pavlov
2014-03-13 6:35 ` Sascha Hauer
0 siblings, 1 reply; 12+ messages in thread
From: Antony Pavlov @ 2014-03-13 5:09 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On Wed, 12 Mar 2014 21:50:41 +0100
Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Tue, Mar 11, 2014 at 01:34:34AM +0400, Antony Pavlov wrote:
> > This driver is very handy for initial barebox porting.
> > It was used for running barebox on DiGiC2-based camera
> > and initial porting barebox to Loongson-1 and ar9331.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > Reported-by: Alexander Aring <alex.aring@gmail.com>
> > Reported-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> > drivers/clocksource/Kconfig | 9 +++++++
> > drivers/clocksource/Makefile | 1 +
> > drivers/clocksource/dummy.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 66 insertions(+)
> >
> > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> > index 4ef25ec..f9e00ff 100644
> > --- a/drivers/clocksource/Kconfig
> > +++ b/drivers/clocksource/Kconfig
> > @@ -14,6 +14,15 @@ config CLOCKSOURCE_CLPS711X
> > bool
> > depends on ARCH_CLPS711X
> >
> > +config CLOCKSOURCE_DUMMY
> > + bool "Enable dummy software-only clocksource"
> > + default n
>
> You can drop the default n, no is the default already. Could you add
> some help text mentioning that this clocksource is for early bringup
> only and doesn't provide correct timing?
Ok, I'll write a help text.
Yesterday I got working davinci hardware clocksource :)
So I have no dependency on dummy clocksource for Davinci.
What is about the rest of davinci patches?
> > +
> > +config CLOCKSOURCE_DUMMY_RATE
> > + int "compile loglevel"
>
> copy/paste ;) ?
:)
--
Best regards,
Antony Pavlov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/8] clocksource: add dummy software-only clocksource
2014-03-13 5:09 ` Antony Pavlov
@ 2014-03-13 6:35 ` Sascha Hauer
0 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2014-03-13 6:35 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox
On Thu, Mar 13, 2014 at 09:09:28AM +0400, Antony Pavlov wrote:
> On Wed, 12 Mar 2014 21:50:41 +0100
> Sascha Hauer <s.hauer@pengutronix.de> wrote:
>
> > On Tue, Mar 11, 2014 at 01:34:34AM +0400, Antony Pavlov wrote:
> > > This driver is very handy for initial barebox porting.
> > > It was used for running barebox on DiGiC2-based camera
> > > and initial porting barebox to Loongson-1 and ar9331.
> > >
> > > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > Reported-by: Alexander Aring <alex.aring@gmail.com>
> > > Reported-by: Alexander Shiyan <shc_work@mail.ru>
> > > ---
> > > drivers/clocksource/Kconfig | 9 +++++++
> > > drivers/clocksource/Makefile | 1 +
> > > drivers/clocksource/dummy.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
> > > 3 files changed, 66 insertions(+)
> > >
> > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> > > index 4ef25ec..f9e00ff 100644
> > > --- a/drivers/clocksource/Kconfig
> > > +++ b/drivers/clocksource/Kconfig
> > > @@ -14,6 +14,15 @@ config CLOCKSOURCE_CLPS711X
> > > bool
> > > depends on ARCH_CLPS711X
> > >
> > > +config CLOCKSOURCE_DUMMY
> > > + bool "Enable dummy software-only clocksource"
> > > + default n
> >
> > You can drop the default n, no is the default already. Could you add
> > some help text mentioning that this clocksource is for early bringup
> > only and doesn't provide correct timing?
>
> Ok, I'll write a help text.
>
> Yesterday I got working davinci hardware clocksource :)
> So I have no dependency on dummy clocksource for Davinci.
>
> What is about the rest of davinci patches?
The rest looks fine, although I would prefer of cause if you used
devicetree for probing devices.
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] 12+ messages in thread
* [PATCH 2/8] import _AC and UL macros from linux kernel
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
2014-03-10 21:34 ` [PATCH 1/8] clocksource: add dummy software-only clocksource Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 3/8] ARM: initial support for TI DaVinci SoCs Antony Pavlov
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
This macros are used in exported from linux TI DaVinci code.
Also this macros are used in MIPS cache support code.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/include/asm/memory.h | 7 +++++++
include/linux/const.h | 27 +++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 28afaa3..52114d0 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -3,6 +3,13 @@
#include <memory.h>
+#include <linux/const.h>
+/*
+ * Allow for constants defined here to be used from assembly code
+ * by prepending the UL suffix only with actual C code compilation.
+ */
+#define UL(x) _AC(x, UL)
+
static inline void arm_add_mem_device(const char* name, resource_size_t start,
resource_size_t size)
{
diff --git a/include/linux/const.h b/include/linux/const.h
new file mode 100644
index 0000000..c872bfd
--- /dev/null
+++ b/include/linux/const.h
@@ -0,0 +1,27 @@
+/* const.h: Macros for dealing with constants. */
+
+#ifndef _LINUX_CONST_H
+#define _LINUX_CONST_H
+
+/* Some constant macros are used in both assembler and
+ * C code. Therefore we cannot annotate them always with
+ * 'UL' and other type specifiers unilaterally. We
+ * use the following macros to deal with this.
+ *
+ * Similarly, _AT() will cast an expression with a type in C, but
+ * leave it unchanged in asm.
+ */
+
+#ifdef __ASSEMBLY__
+#define _AC(X,Y) X
+#define _AT(T,X) X
+#else
+#define __AC(X,Y) (X##Y)
+#define _AC(X,Y) __AC(X,Y)
+#define _AT(T,X) ((T)(X))
+#endif
+
+#define _BITUL(x) (_AC(1,UL) << (x))
+#define _BITULL(x) (_AC(1,ULL) << (x))
+
+#endif /* !(_LINUX_CONST_H) */
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 3/8] ARM: initial support for TI DaVinci SoCs
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
2014-03-10 21:34 ` [PATCH 1/8] clocksource: add dummy software-only clocksource Antony Pavlov
2014-03-10 21:34 ` [PATCH 2/8] import _AC and UL macros from linux kernel Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 4/8] ARM: davinci: add DEBUG_LL support Antony Pavlov
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
This commit adds minimal support for the DaVinci DM365 SoCs
from Texas Instruments.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/Kconfig | 5 ++
arch/arm/Makefile | 1 +
arch/arm/mach-davinci/Kconfig | 7 ++
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/include/mach/hardware.h | 29 ++++++++
arch/arm/mach-davinci/include/mach/serial.h | 20 ++++++
arch/arm/mach-davinci/include/mach/time.h | 18 +++++
arch/arm/mach-davinci/time.c | 95 +++++++++++++++++++++++++++
8 files changed, 176 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 21f9012..42ff01b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -54,6 +54,10 @@ config ARCH_CLPS711X
select GPIOLIB
select MFD_SYSCON
+config ARCH_DAVINCI
+ bool "TI Davinci"
+ select CPU_ARM926T
+
config ARCH_EP93XX
bool "Cirrus Logic EP93xx"
select CPU_ARM920T
@@ -188,6 +192,7 @@ source arch/arm/cpu/Kconfig
source arch/arm/mach-at91/Kconfig
source arch/arm/mach-bcm2835/Kconfig
source arch/arm/mach-clps711x/Kconfig
+source arch/arm/mach-davinci/Kconfig
source arch/arm/mach-ep93xx/Kconfig
source arch/arm/mach-highbank/Kconfig
source arch/arm/mach-imx/Kconfig
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2bbba35..c1bd836 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -54,6 +54,7 @@ AFLAGS += -include asm/unified.h -msoft-float $(AFLAGS_THUMB2)
machine-$(CONFIG_ARCH_AT91) := at91
machine-$(CONFIG_ARCH_BCM2835) := bcm2835
machine-$(CONFIG_ARCH_CLPS711X) := clps711x
+machine-$(CONFIG_ARCH_DAVINCI) := davinci
machine-$(CONFIG_ARCH_EP93XX) := ep93xx
machine-$(CONFIG_ARCH_HIGHBANK) := highbank
machine-$(CONFIG_ARCH_IMX) := imx
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
new file mode 100644
index 0000000..5677f8d
--- /dev/null
+++ b/arch/arm/mach-davinci/Kconfig
@@ -0,0 +1,7 @@
+if ARCH_DAVINCI
+
+config ARCH_TEXT_BASE
+ hex
+ default 0x82000000
+
+endif
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
new file mode 100644
index 0000000..b96d414
--- /dev/null
+++ b/arch/arm/mach-davinci/Makefile
@@ -0,0 +1 @@
+obj-y += time.o
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h
new file mode 100644
index 0000000..ea9f481
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/hardware.h
@@ -0,0 +1,29 @@
+/*
+ * Hardware definitions common to all DaVinci family processors
+ *
+ * Author: Kevin Hilman, Deep Root Systems, LLC
+ *
+ * 2007 (c) Deep Root Systems, LLC. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
+
+#include <asm/memory.h>
+
+/*
+ * Before you add anything to this file:
+ *
+ * This header is for defines common to ALL DaVinci family chips.
+ * Anything that is chip specific should go in <chipname>.h,
+ * and the chip/board init code should then explicitly include
+ * <chipname>.h
+ */
+/*
+ * I/O mapping
+ */
+#define IO_PHYS UL(0x01c00000)
+
+#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
new file mode 100644
index 0000000..bc7449f
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -0,0 +1,20 @@
+/*
+ * DaVinci serial device definitions
+ *
+ * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#ifndef __ASM_ARCH_SERIAL_H
+#define __ASM_ARCH_SERIAL_H
+
+#include <mach/hardware.h>
+
+#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
+#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
+#define DAVINCI_UART2_BASE (IO_PHYS + 0x20800)
+
+#endif /* __ASM_ARCH_SERIAL_H */
diff --git a/arch/arm/mach-davinci/include/mach/time.h b/arch/arm/mach-davinci/include/mach/time.h
new file mode 100644
index 0000000..741e90c
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/time.h
@@ -0,0 +1,18 @@
+/*
+ * Local header file for DaVinci time code.
+ *
+ * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H
+#define __ARCH_ARM_MACH_DAVINCI_TIME_H
+
+#include <mach/hardware.h>
+
+#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00)
+
+#endif /* __ARCH_ARM_MACH_DAVINCI_TIME_H */
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
new file mode 100644
index 0000000..1e00719
--- /dev/null
+++ b/arch/arm/mach-davinci/time.c
@@ -0,0 +1,95 @@
+/*
+ * DaVinci timer subsystem
+ *
+ * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <common.h>
+#include <io.h>
+
+#include <mach/time.h>
+
+/* Timer register offsets */
+#define PID12 0x0
+#define TIM12 0x10
+#define TIM34 0x14
+#define PRD12 0x18
+#define PRD34 0x1c
+#define TCR 0x20
+#define TGCR 0x24
+#define WDTCR 0x28
+
+/* Timer register bitfields */
+#define TCR_ENAMODE_DISABLE 0x0
+#define TCR_ENAMODE_ONESHOT 0x1
+#define TCR_ENAMODE_PERIODIC 0x2
+#define TCR_ENAMODE_MASK 0x3
+
+#define TGCR_TIMMODE_SHIFT 2
+#define TGCR_TIMMODE_64BIT_GP 0x0
+#define TGCR_TIMMODE_32BIT_UNCHAINED 0x1
+#define TGCR_TIMMODE_64BIT_WDOG 0x2
+#define TGCR_TIMMODE_32BIT_CHAINED 0x3
+
+#define TGCR_TIM12RS_SHIFT 0
+#define TGCR_TIM34RS_SHIFT 1
+#define TGCR_RESET 0x0
+#define TGCR_UNRESET 0x1
+#define TGCR_RESET_MASK 0x3
+
+#define WDTCR_WDEN_SHIFT 14
+#define WDTCR_WDEN_DISABLE 0x0
+#define WDTCR_WDEN_ENABLE 0x1
+#define WDTCR_WDKEY_SHIFT 16
+#define WDTCR_WDKEY_SEQ0 0xa5c6
+#define WDTCR_WDKEY_SEQ1 0xda7e
+
+/* reset board using watchdog timer */
+void __noreturn reset_cpu(ulong addr)
+{
+ u32 tgcr, wdtcr;
+ void __iomem *base;
+
+ base = IOMEM(DAVINCI_WDOG_BASE);
+
+ /* disable, internal clock source */
+ __raw_writel(0, base + TCR);
+
+ /* reset timer, set mode to 64-bit watchdog, and unreset */
+ tgcr = 0;
+ __raw_writel(tgcr, base + TGCR);
+ tgcr = TGCR_TIMMODE_64BIT_WDOG << TGCR_TIMMODE_SHIFT;
+ tgcr |= (TGCR_UNRESET << TGCR_TIM12RS_SHIFT) |
+ (TGCR_UNRESET << TGCR_TIM34RS_SHIFT);
+ __raw_writel(tgcr, base + TGCR);
+
+ /* clear counter and period regs */
+ __raw_writel(0, base + TIM12);
+ __raw_writel(0, base + TIM34);
+ __raw_writel(0, base + PRD12);
+ __raw_writel(0, base + PRD34);
+
+ /* put watchdog in pre-active state */
+ wdtcr = __raw_readl(base + WDTCR);
+ wdtcr = (WDTCR_WDKEY_SEQ0 << WDTCR_WDKEY_SHIFT) |
+ (WDTCR_WDEN_ENABLE << WDTCR_WDEN_SHIFT);
+ __raw_writel(wdtcr, base + WDTCR);
+
+ /* put watchdog in active state */
+ wdtcr = (WDTCR_WDKEY_SEQ1 << WDTCR_WDKEY_SHIFT) |
+ (WDTCR_WDEN_ENABLE << WDTCR_WDEN_SHIFT);
+ __raw_writel(wdtcr, base + WDTCR);
+
+ /* write an invalid value to the WDKEY field to trigger
+ * a watchdog reset */
+ wdtcr = 0x00004000;
+ __raw_writel(wdtcr, base + WDTCR);
+
+ unreachable();
+}
+EXPORT_SYMBOL(reset_cpu);
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 4/8] ARM: davinci: add DEBUG_LL support
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
` (2 preceding siblings ...)
2014-03-10 21:34 ` [PATCH 3/8] ARM: initial support for TI DaVinci SoCs Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 5/8] ARM: davinci: add documentation Antony Pavlov
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-davinci/include/mach/debug_ll.h | 42 +++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 42ff01b..407f27d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -57,6 +57,7 @@ config ARCH_CLPS711X
config ARCH_DAVINCI
bool "TI Davinci"
select CPU_ARM926T
+ select HAS_DEBUG_LL
config ARCH_EP93XX
bool "Cirrus Logic EP93xx"
diff --git a/arch/arm/mach-davinci/include/mach/debug_ll.h b/arch/arm/mach-davinci/include/mach/debug_ll.h
new file mode 100644
index 0000000..587f408
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/debug_ll.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * This file is part of barebox.
+ * 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 version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+/** @file
+ * This File contains declaration for early output support
+ */
+#ifndef __INCLUDE_ARCH_DEBUG_LL_H__
+#define __INCLUDE_ARCH_DEBUG_LL_H__
+
+#include <asm/io.h>
+#include <mach/serial.h>
+
+#define DEBUG_LL_UART_ADDR DAVINCI_UART0_BASE
+#define DEBUG_LL_UART_RSHFT 2
+
+#define rbr (0 << DEBUG_LL_UART_RSHFT)
+#define lsr (5 << DEBUG_LL_UART_RSHFT)
+#define LSR_THRE 0x20 /* Xmit holding register empty */
+
+static inline void PUTC_LL(char ch)
+{
+ while (!(__raw_readb(DEBUG_LL_UART_ADDR + lsr) & LSR_THRE))
+ ;
+
+ __raw_writeb(ch, DEBUG_LL_UART_ADDR + rbr);
+}
+
+#endif /* __INCLUDE_ARCH_DEBUG_LL_H__ */
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 5/8] ARM: davinci: add documentation
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
` (3 preceding siblings ...)
2014-03-10 21:34 ` [PATCH 4/8] ARM: davinci: add DEBUG_LL support Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 6/8] ARM: davinci: add virt2real board support Antony Pavlov
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/mach-arm.dox | 2 ++
arch/arm/mach-davinci/mach-davinci.dox | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/mach-arm.dox b/arch/arm/mach-arm.dox
index 758df3f..1d2de48 100644
--- a/arch/arm/mach-arm.dox
+++ b/arch/arm/mach-arm.dox
@@ -54,6 +54,8 @@ For details on specific architectures:
@subsection mach_arm_omap_info OMAP CPUs
+@li @subpage dev_davinci_arch
+
@li @subpage dev_omap_arch
@subsection mach_arm_s3c24xx_info S3C24XX CPUs
diff --git a/arch/arm/mach-davinci/mach-davinci.dox b/arch/arm/mach-davinci/mach-davinci.dox
new file mode 100644
index 0000000..f0f3a92
--- /dev/null
+++ b/arch/arm/mach-davinci/mach-davinci.dox
@@ -0,0 +1,5 @@
+/** @page dev_davinci_arch TI DaVinci in barebox
+
+@section davinci_boards DaVinci-based boards
+
+*/
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 6/8] ARM: davinci: add virt2real board support
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
` (4 preceding siblings ...)
2014-03-10 21:34 ` [PATCH 5/8] ARM: davinci: add documentation Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 7/8] ARM: virt2real: add documentation Antony Pavlov
2014-03-10 21:34 ` [PATCH 8/8] ARM: davinci: add virt2real_defconfig Antony Pavlov
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
The virt2real microcontroller, or virturilka,
is a miniature board for creation of WiFi
or internet controllable smart devices.
See http://virt2real.com for details.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/boards/Makefile | 1 +
arch/arm/boards/virt2real/Makefile | 1 +
arch/arm/boards/virt2real/board.c | 49 ++++++++++++++++++++++++++++++++++++
arch/arm/boards/virt2real/lowlevel.c | 34 +++++++++++++++++++++++++
arch/arm/mach-davinci/Kconfig | 9 +++++++
5 files changed, 94 insertions(+)
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index ffd6bb3..fdad359 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -98,4 +98,5 @@ obj-$(CONFIG_MACH_USB_A9263) += usb-a926x/
obj-$(CONFIG_MACH_USB_A9G20) += usb-a926x/
obj-$(CONFIG_MACH_VERSATILEPB) += versatile/
obj-$(CONFIG_MACH_VEXPRESS) += vexpress/
+obj-$(CONFIG_MACH_VIRT2REAL) += virt2real/
obj-$(CONFIG_MACH_ZEDBOARD) += avnet-zedboard/
diff --git a/arch/arm/boards/virt2real/Makefile b/arch/arm/boards/virt2real/Makefile
new file mode 100644
index 0000000..b2f44bb
--- /dev/null
+++ b/arch/arm/boards/virt2real/Makefile
@@ -0,0 +1 @@
+obj-y += lowlevel.o board.o
diff --git a/arch/arm/boards/virt2real/board.c b/arch/arm/boards/virt2real/board.c
new file mode 100644
index 0000000..da4b2fb
--- /dev/null
+++ b/arch/arm/boards/virt2real/board.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * This file is part of barebox.
+ * 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 version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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 <init.h>
+#include <sizes.h>
+#include <asm/memory.h>
+#include <ns16550.h>
+
+#include <mach/serial.h>
+
+static int davinci_init(void)
+{
+ arm_add_mem_device("ram0", 0x82000000, SZ_16M);
+
+ return 0;
+}
+mem_initcall(davinci_init);
+
+static struct NS16550_plat serial_plat = {
+ .clock = 24000000,
+ .shift = 2,
+};
+
+static int console_init(void)
+{
+ barebox_set_model("virt2real");
+ barebox_set_hostname("virt2real");
+
+ add_ns16550_device(DEVICE_ID_DYNAMIC, DAVINCI_UART0_BASE,
+ 8 << serial_plat.shift, IORESOURCE_MEM_8BIT, &serial_plat);
+
+ return 0;
+}
+console_initcall(console_init);
diff --git a/arch/arm/boards/virt2real/lowlevel.c b/arch/arm/boards/virt2real/lowlevel.c
new file mode 100644
index 0000000..3c90d78
--- /dev/null
+++ b/arch/arm/boards/virt2real/lowlevel.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * This file is part of barebox.
+ * 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 version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+#define __LOWLEVEL_INIT__
+
+#include <common.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <init.h>
+#include <sizes.h>
+
+#define VIRT2REAL_SRAM_BASE 0x82000000
+#define VIRT2REAL_SRAM_SIZE SZ_16M
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ barebox_arm_entry(VIRT2REAL_SRAM_BASE, VIRT2REAL_SRAM_SIZE, 0);
+}
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 5677f8d..3165d50 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -4,4 +4,13 @@ config ARCH_TEXT_BASE
hex
default 0x82000000
+choice
+ prompt "Davinci Board type"
+
+config MACH_VIRT2REAL
+ bool "Virt2Real"
+ select HAVE_DEFAULT_ENVIRONMENT_NEW
+
+endchoice
+
endif
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 7/8] ARM: virt2real: add documentation
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
` (5 preceding siblings ...)
2014-03-10 21:34 ` [PATCH 6/8] ARM: davinci: add virt2real board support Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
2014-03-10 21:34 ` [PATCH 8/8] ARM: davinci: add virt2real_defconfig Antony Pavlov
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
Documentation/boards.dox | 1 +
arch/arm/boards/virt2real/virt2real.dox | 41 +++++++++++++++++++++++++++++++++
arch/arm/mach-davinci/mach-davinci.dox | 2 ++
3 files changed, 44 insertions(+)
diff --git a/Documentation/boards.dox b/Documentation/boards.dox
index 6bcc14f..9a14aee 100644
--- a/Documentation/boards.dox
+++ b/Documentation/boards.dox
@@ -43,6 +43,7 @@ ARM type:
@li @subpage tny-a9263
@li @subpage usb-a9g20-lpw
@li @subpage usb-a9263
+@li @subpage virt2real
Blackfin type:
diff --git a/arch/arm/boards/virt2real/virt2real.dox b/arch/arm/boards/virt2real/virt2real.dox
new file mode 100644
index 0000000..fc38321
--- /dev/null
+++ b/arch/arm/boards/virt2real/virt2real.dox
@@ -0,0 +1,41 @@
+/** @page virt2real virt2real board
+
+virt2real is a is a miniature board for creation of WiFi
+or internet controllable smart devices.
+
+The board has
+@li TI DaVinchi DM365 running at 300 MHz
+@li 128 MiB DDR2 SDRAM;
+@li 256 MiB NAND Flash Memory;
+@li 2 x UART serial interfaces;
+@li 2 x Ethernet interfaces;
+@li 1 x USB interface;
+@li microSD card slot.
+
+The board uses U-Boot as bootloader.
+
+Barebox mini-howto:
+
+1. Connect to the boards's UART0 (115200 8N1);
+Use J2.2 (GND), J2.4 (UART0_TXD), J2.6(UART0_RXD) pins.
+
+2. Turn board's power on;
+
+3. Wait 'Hit any key to stop autoboot' prompt and press the space key.
+
+4. Upload barebox.bin via Ymodem
+@verbatim
+ virt2real ># loady
+@endverbatim
+
+5. Run barebox
+@verbatim
+ virt2real ># go 0x82000000
+@endverbatim
+
+virt2real links:
+@li http://virt2real.com/
+@li http://wiki.virt2real.ru/
+@li https://github.com/virt2real
+
+*/
diff --git a/arch/arm/mach-davinci/mach-davinci.dox b/arch/arm/mach-davinci/mach-davinci.dox
index f0f3a92..789eacc 100644
--- a/arch/arm/mach-davinci/mach-davinci.dox
+++ b/arch/arm/mach-davinci/mach-davinci.dox
@@ -2,4 +2,6 @@
@section davinci_boards DaVinci-based boards
+@li @subpage virt2real
+
*/
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 8/8] ARM: davinci: add virt2real_defconfig
2014-03-10 21:34 [PATCH 0/8] ARM: initial support for TI DaVinci SoCs and virt2real board Antony Pavlov
` (6 preceding siblings ...)
2014-03-10 21:34 ` [PATCH 7/8] ARM: virt2real: add documentation Antony Pavlov
@ 2014-03-10 21:34 ` Antony Pavlov
7 siblings, 0 replies; 12+ messages in thread
From: Antony Pavlov @ 2014-03-10 21:34 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/arm/configs/virt2real_defconfig | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/arch/arm/configs/virt2real_defconfig b/arch/arm/configs/virt2real_defconfig
new file mode 100644
index 0000000..3c3fce1
--- /dev/null
+++ b/arch/arm/configs/virt2real_defconfig
@@ -0,0 +1,39 @@
+CONFIG_ARCH_DAVINCI=y
+CONFIG_AEABI=y
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
+CONFIG_TEXT_BASE=0x82300000
+CONFIG_MALLOC_SIZE=0x200000
+CONFIG_MALLOC_TLSF=y
+CONFIG_PROMPT="virt2real: "
+CONFIG_LONGHELP=y
+CONFIG_GLOB=y
+CONFIG_HUSH_FANCY_PROMPT=y
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
+CONFIG_MENU=y
+CONFIG_PASSWORD=y
+CONFIG_PARTITION=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_LOADB=y
+CONFIG_CMD_LOADY=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_IOMEM=y
+CONFIG_CMD_MM=y
+# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_BOOTU is not set
+CONFIG_CMD_RESET=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_PARTITION=y
+CONFIG_CMD_UNCOMPRESS=y
+CONFIG_DRIVER_SERIAL_NS16550=y
+# CONFIG_SPI is not set
+CONFIG_CLOCKSOURCE_DUMMY=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 12+ messages in thread