Skip to contentSkip to conversation

s3c: add support for mini6410

PATCH New Darius Augulis 3 participants 5 messages Sep 16, 2010 – Sep 28, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s3c: add support for mini6410

Add support for mini6410 board from FriendlyARM

---
 arch/arm/mach-s3c64xx/Kconfig         |   10 ++
 arch/arm/mach-s3c64xx/Makefile        |    1 
 arch/arm/mach-s3c64xx/mach-mini6410.c |  154 +++++++++++++++++++++++++++++++++
 3 files changed, 165 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/Kconfig +10 -0
index c05ae12..bbeb4ca 100644
@@ -98,6 +98,16 @@ config MACH_ANW6410
 	help
 	  Machine support for the A&W6410
 
+config MACH_MINI6410
+	bool "MINI6410"
+	select CPU_S3C6410
+	select S3C_DEV_HSMMC
+	select S3C_DEV_HSMMC1
+	select S3C64XX_SETUP_SDHCI
+	select S3C_DEV_USB_HOST
+	help
+	  Machine support for the FriendlyARM MINI6410
+
 config MACH_REAL6410
 	bool "REAL6410"
 	select CPU_S3C6410
arch/arm/mach-s3c64xx/Makefile +1 -0
index 90221a2..4657363 100644
@@ -53,6 +53,7 @@ obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o
 obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o
 obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o
 obj-$(CONFIG_MACH_REAL6410)     += mach-real6410.o
+obj-$(CONFIG_MACH_MINI6410)     += mach-mini6410.o
 obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
 obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o
arch/arm/mach-s3c64xx/mach-mini6410.c new file +154 -0

154 lines not on this page · raw message

#1 lore raw

PATCH 1/1 s3c: add support for mini6410

Quoted 36 lines · Darius Augulis

Add support for mini6410 board from FriendlyARM

arch/arm/mach-s3c64xx/Makefile +1 -0
+obj-$(CONFIG_MACH_MINI6410)     += mach-mini6410.o
 obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
 obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o
arch/arm/mach-s3c64xx/mach-mini6410.c new file +21 -0
new file mode 100644
index 0000000..560e347
@@ -0,0 +1,154 @@
+/* linux/arch/arm/mach-s3c64xx/mach-mini6410.c
+ *
+ * Copyright 2010 Darius Augulis <[email protected]>
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *	http://armlinux.simtec.co.uk/
+ *
+ * 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 <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/dm9000.h>
+#include <linux/serial_core.h>
+#include <linux/types.h>

arch/arm/mach-s3c64xx/mach-mini6410.c line 32

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-srom.h>
+#include <mach/s3c6410.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/regs-serial.h>

My preference is to split up the include blocks with a blank line.

Quoted 24 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +24 -0
+#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
+
+static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {
+	[0] = {
+		.hwport	= 0,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+	[1] = {
+		.hwport	= 1,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+	[2] = {
+		.hwport	= 2,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,

arch/arm/mach-s3c64xx/mach-mini6410.c line 67

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+		.ufcon	= UFCON,
+	},
+	[3] = {
+		.hwport	= 3,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+};

I'm beginging to think we should just have a standard implementation of these.

Otherwise looks good, up to myself and Kukjin to agree on who should merge.

#2 lore raw

PATCH 1/1 s3c: add support for mini6410

Quoted 92 lines · Ben Dooks

arch/arm/mach-

Quoted 9 lines · Darius Augulis

Add support for mini6410 board from FriendlyARM

arch/arm/mach-s3c64xx/Makefile +1 -0
+obj-$(CONFIG_MACH_MINI6410)     += mach-mini6410.o
 obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
 obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o
arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0

s3c64xx/mach-mini6410.c

Quoted 27 lines

new file mode 100644
index 0000000..560e347

arch/arm/mach-s3c64xx/mach-mini6410.c new file +21 -0
@@ -0,0 +1,154 @@
+/* linux/arch/arm/mach-s3c64xx/mach-mini6410.c
+ *
+ * Copyright 2010 Darius Augulis <[email protected]>
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *	http://armlinux.simtec.co.uk/
+ *
+ * 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 <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/dm9000.h>
+#include <linux/serial_core.h>
+#include <linux/types.h>

arch/arm/mach-s3c64xx/mach-mini6410.c line 32

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-srom.h>
+#include <mach/s3c6410.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/regs-serial.h>

My preference is to split up the include blocks with a blank line.

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 2 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +2 -0
+#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE |

S3C2410_LCON_STOPB)

Quoted 22 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +22 -0
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
+
+static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {
+	[0] = {
+		.hwport	= 0,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+	[1] = {
+		.hwport	= 1,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+	[2] = {
+		.hwport	= 2,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,

arch/arm/mach-s3c64xx/mach-mini6410.c line 67

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+		.ufcon	= UFCON,
+	},
+	[3] = {
+		.hwport	= 3,
+		.flags	= 0,
+		.ucon	= UCON,
+		.ulcon	= ULCON,
+		.ufcon	= UFCON,
+	},
+};

I'm beginging to think we should just have a standard implementation of these.

Quoted 2 lines

Otherwise looks good, up to myself and Kukjin to agree on who should merge.

Ben, your tree is more suitable for this.
And if any s3c64xx stuff in my tree, will send to you.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#3 lore raw

PATCH 1/1 s3c: add support for mini6410

Quoted 93 lines · Kukjin Kim
Quoted 92 lines · Ben Dooks

arch/arm/mach-

Quoted 9 lines · Darius Augulis

Add support for mini6410 board from FriendlyARM

+obj-$(CONFIG_MACH_MINI6410) ? ? += mach-mini6410.o ?obj-$(CONFIG_MACH_NCP) ? ? ? ? ? ? += mach-ncp.o ?obj-$(CONFIG_MACH_HMT) ? ? ? ? ? ? += mach-hmt.o ?obj-$(CONFIG_MACH_SMARTQ) ?+= mach-smartq.o

arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0

s3c64xx/mach-mini6410.c

Quoted 27 lines

new file mode 100644
index 0000000..560e347

arch/arm/mach-s3c64xx/mach-mini6410.c new file +21 -0
@@ -0,0 +1,154 @@
+/* linux/arch/arm/mach-s3c64xx/mach-mini6410.c
+ *
+ * Copyright 2010 Darius Augulis <[email protected]>
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ * Ben Dooks <[email protected]>
+ * http://armlinux.simtec.co.uk/
+ *
+ * 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 <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/dm9000.h>
+#include <linux/serial_core.h>
+#include <linux/types.h>

arch/arm/mach-s3c64xx/mach-mini6410.c line 32

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-srom.h>
+#include <mach/s3c6410.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/regs-serial.h>

My preference is to split up the include blocks with a blank line.

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 2 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +2 -0
+#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE |

S3C2410_LCON_STOPB)

Quoted 22 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +22 -0
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
+
+static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {
+ ? [0] = {
+ ? ? ? ? ? .hwport = 0,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [1] = {
+ ? ? ? ? ? .hwport = 1,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [2] = {
+ ? ? ? ? ? .hwport = 2,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [3] = {
+ ? ? ? ? ? .hwport = 3,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+};

I'm beginging to think we should just have a standard implementation of these.

Quoted 5 lines
Quoted 2 lines

Otherwise looks good, up to myself and Kukjin to agree on who should merge.

Ben, your tree is more suitable for this.
And if any s3c64xx stuff in my tree, will send to you.

I will soon resend a bit updated patch together with my other s3c64xx patches for-next. Would be better to merge all them at once because they depends on each other.

Quoted 10 lines

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#4 lore raw

PATCH 1/1 s3c: add support for mini6410

Quoted 15 lines · Darius Augulis
Quoted 13 lines · Kukjin Kim
Quoted 12 lines · Ben Dooks

arch/arm/mach-

Quoted 9 lines · Darius Augulis

Add support for mini6410 board from FriendlyARM

+obj-$(CONFIG_MACH_MINI6410) ? ? += mach-mini6410.o ?obj-$(CONFIG_MACH_NCP) ? ? ? ? ? ? += mach-ncp.o ?obj-$(CONFIG_MACH_HMT) ? ? ? ? ? ? += mach-hmt.o ?obj-$(CONFIG_MACH_SMARTQ) ?+= mach-smartq.o

arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0

s3c64xx/mach-mini6410.c

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

new file mode 100644
index 0000000..560e347

arch/arm/mach-s3c64xx/mach-mini6410.c new file +1 -0
@@ -0,0 +1,154 @@
+/* linux/arch/arm/mach-s3c64xx/mach-mini6410.c
Quoted 8 lines
Quoted 8 lines

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 8 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +8 -0
+ *
+ * Copyright 2010 Darius Augulis <[email protected]>
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ * Ben Dooks <[email protected]>
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or

modify

Quoted 70 lines
Quoted 27 lines
Quoted 27 lines
Quoted 13 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +12 -0
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
 
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/dm9000.h>
+#include <linux/serial_core.h>
+#include <linux/types.h>

arch/arm/mach-s3c64xx/mach-mini6410.c line 32

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-srom.h>
+#include <mach/s3c6410.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/regs-serial.h>

My preference is to split up the include blocks with a blank line.

Quoted 4 lines
Quoted 4 lines

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 2 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +2 -0
+#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE |

S3C2410_LCON_STOPB)

Quoted 1 line

+#define UFCON (S3C2410_UFCON_RXTRIG8 |

S3C2410_UFCON_FIFOMODE)

Quoted 38 lines
Quoted 37 lines
Quoted 21 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +21 -0
+
+static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {
+ ? [0] = {
+ ? ? ? ? ? .hwport = 0,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [1] = {
+ ? ? ? ? ? .hwport = 1,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [2] = {
+ ? ? ? ? ? .hwport = 2,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 10 lines
arch/arm/mach-s3c64xx/mach-mini6410.c new file +10 -0
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+ ? [3] = {
+ ? ? ? ? ? .hwport = 3,
+ ? ? ? ? ? .flags ?= 0,
+ ? ? ? ? ? .ucon ? = UCON,
+ ? ? ? ? ? .ulcon ?= ULCON,
+ ? ? ? ? ? .ufcon ?= UFCON,
+ ? },
+};

I'm beginging to think we should just have a standard implementation of these.

Otherwise looks good, up to myself and Kukjin to agree on who should merge.

Quoted 7 lines
Quoted 2 lines

Ben, your tree is more suitable for this.
And if any s3c64xx stuff in my tree, will send to you.

I will soon resend a bit updated patch together with my other s3c64xx patches for-next. Would be better to merge all them at once because they depends on each other.

As a note, it would be helpful to Ben and me, if you could use similar format in the subject like following.
'ARM: S3C64XX: blah blah...'

You can also get the example with 'git log'.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.