---

yaml
---
r: 149175
b: refs/heads/master
c: 1bc34f7
h: refs/heads/master
i:
  149173: 9badf7b
  149171: 56ad6e8
  149167: 00f4f62
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65b1aa13f2a14e113d1139ecf7cb2507a3cfa8b8
+refs/heads/master: 1bc34f7964b1e8dee8d49d83cba8dad0a010df92

trunk/arch/arm/mach-mx3/Makefile

@@ -8,7 +8,7 @@ obj-y				:= mm.o devices.o
 obj-$(CONFIG_ARCH_MX31)		+= clock.o iomux.o
 obj-$(CONFIG_ARCH_MX35)		+= clock-imx35.o
 obj-$(CONFIG_MACH_MX31ADS)	+= mx31ads.o
-obj-$(CONFIG_MACH_MX31LILLY)	+= mx31lilly.o
+obj-$(CONFIG_MACH_MX31LILLY)	+= mx31lilly.o mx31lilly-db.o
 obj-$(CONFIG_MACH_MX31LITE)	+= mx31lite.o
 obj-$(CONFIG_MACH_PCM037)	+= pcm037.o
 obj-$(CONFIG_MACH_MX31_3DS)	+= mx31pdk.o

trunk/arch/arm/mach-mx3/mx31lilly-db.c

@@ -0,0 +1,68 @@
+/*
+ *  LILLY-1131 development board support
+ *
+ *    Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ *  based on code for other MX31 boards,
+ *
+ *    Copyright 2005-2007 Freescale Semiconductor
+ *    Copyright (c) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
+ *    Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
+ *
+ * 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 <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <mach/hardware.h>
+#include <mach/common.h>
+#include <mach/imx-uart.h>
+#include <mach/iomux-mx3.h>
+#include <mach/board-mx31lilly.h>
+
+#include "devices.h"
+
+/*
+ * This file contains board-specific initialization routines for the
+ * LILLY-1131 development board. If you design an own baseboard for the
+ * module, use this file as base for support code.
+ */
+
+static unsigned int lilly_db_board_pins[] __initdata = {
+	MX31_PIN_CTS1__CTS1,
+	MX31_PIN_RTS1__RTS1,
+	MX31_PIN_TXD1__TXD1,
+	MX31_PIN_RXD1__RXD1,
+};
+
+/* UART */
+static struct imxuart_platform_data uart_pdata __initdata = {
+	.flags = IMXUART_HAVE_RTSCTS,
+};
+
+void __init mx31lilly_db_init(void)
+{
+	mxc_iomux_setup_multiple_pins(lilly_db_board_pins,
+					ARRAY_SIZE(lilly_db_board_pins),
+					"development board pins");
+	mxc_register_device(&mxc_uart_device0, &uart_pdata);
+}
+

trunk/arch/arm/mach-mx3/mx31lilly.c

@@ -54,6 +54,9 @@ static void __init mx31lilly_board_init(void)
 	switch (mx31lilly_baseboard) {
 	case MX31LILLY_NOBOARD:
 		break;
+	case MX31LILLY_DB:
+		mx31lilly_db_init();
+		break;
 	default:
 		printk(KERN_ERR "Illegal mx31lilly_baseboard type %d\n",
 			mx31lilly_baseboard);

trunk/arch/arm/plat-mxc/include/mach/board-mx31lilly.h

@@ -31,13 +31,16 @@
 
 enum mx31lilly_boards {
 	MX31LILLY_NOBOARD	= 0,
+	MX31LILLY_DB		= 1,
 };
 
 /*
  * This CPU module needs a baseboard to work. After basic initializing
  * its own devices, it calls baseboard's init function.
  */
 
+extern void mx31lilly_db_init(void);
+
 #endif
 
 #endif /* __ASM_ARCH_MXC_BOARD_MX31LILLY_H__ */