Status of Dream series

Status of Dream series

[Pavel Machek]

Russell, what is the status of the "Dream" series? 

 [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
 [PATCH 2/3] msm: add minimal board file for HTC Dream device
 [PATCH 3/3] msm: Add memory map for HTC Dream

Daniel Walker offered to maintain arch-msm tree, would that help? 

San would like to port google kernel to newer mainline, so it would be
nice to invent something that works.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Status of Dream series

[Daniel Walker]

On Wed, 2009-11-11 at 11:47 +0100, Pavel Machek wrote:
> Russell, what is the status of the "Dream" series? 
> 
>  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
>  [PATCH 2/3] msm: add minimal board file for HTC Dream device
>  [PATCH 3/3] msm: Add memory map for HTC Dream
> 
> Daniel Walker offered to maintain arch-msm tree, would that help? 

Yeah, I can do it for now, but I can't accept patches for it via this
email address.. I'm in the processes of setting up the right address for
it .. Might take till next week tho.

Daniel

Status of Dream series

[Russell King - ARM Linux]

On Wed, Nov 11, 2009 at 11:47:48AM +0100, Pavel Machek wrote:
> 
> Russell, what is the status of the "Dream" series? 
> 
>  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
>  [PATCH 2/3] msm: add minimal board file for HTC Dream device
>  [PATCH 3/3] msm: Add memory map for HTC Dream

See my reply today on patch 2/3; that is my only comment.

> Daniel Walker offered to maintain arch-msm tree, would that help? 

I thought from Daniel's private email to me on the 2/11 that this was
his intention; I didn't see a question in it requiring an answer.

Status of Dream series

[Daniel Walker]

On Wed, 2009-11-18 at 18:08 +0100, Pavel Machek wrote:
> Hi!
> 
> > > Russell, what is the status of the "Dream" series? 
> > > 
> > >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> > >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> > >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > > 
> > > Daniel Walker offered to maintain arch-msm tree, would that help? 
> > 
> > Yeah, I can do it for now, but I can't accept patches for it via this
> > email address.. I'm in the processes of setting up the right address for
> > it .. Might take till next week tho.
> 
> Ok, can I just add your acked-by, and send them to akpm/rmk? These
> three are simple enough...

Didn't Russell have some pending comments? Anyway, I have them already
in my korg git tree. So I can move them forward from there , but it's
temporary ..

Daniel

Status of Dream series

[Daniel Walker]

On Wed, 2009-11-18 at 19:18 +0100, Pavel Machek wrote:
> Hi!
> 
> > > > > Russell, what is the status of the "Dream" series? 
> > > > > 
> > > > >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> > > > >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> > > > >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > > > > 
> > > > > Daniel Walker offered to maintain arch-msm tree, would that help? 
> > > > 
> > > > Yeah, I can do it for now, but I can't accept patches for it via this
> > > > email address.. I'm in the processes of setting up the right address for
> > > > it .. Might take till next week tho.
> > > 
> > > Ok, can I just add your acked-by, and send them to akpm/rmk? These
> > > three are simple enough...
> > 
> > Didn't Russell have some pending comments? Anyway, I have them already
> > in my korg git tree. So I can move them forward from there , but it's
> > temporary ..
> 
> Here's fixed #2. I guess we can add rmk's reviewed-by (and yours?) and
> send them forward?

I'll add my sign off, put them into my git tree (which is included in
linux-next) , the eventually push them to Linus when the merge window
opens ..

Daniel

Status of Dream series

[Pavel Machek]

Hi!

> > Russell, what is the status of the "Dream" series? 
> > 
> >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > 
> > Daniel Walker offered to maintain arch-msm tree, would that help? 
> 
> Yeah, I can do it for now, but I can't accept patches for it via this
> email address.. I'm in the processes of setting up the right address for
> it .. Might take till next week tho.

Ok, can I just add your acked-by, and send them to akpm/rmk? These
three are simple enough...
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Status of Dream series

[Pavel Machek]

On Wed 2009-11-18 09:38:42, Daniel Walker wrote:
> On Wed, 2009-11-18 at 18:08 +0100, Pavel Machek wrote:
> > Hi!
> > 
> > > > Russell, what is the status of the "Dream" series? 
> > > > 
> > > >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> > > >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> > > >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > > > 
> > > > Daniel Walker offered to maintain arch-msm tree, would that help? 
> > > 
> > > Yeah, I can do it for now, but I can't accept patches for it via this
> > > email address.. I'm in the processes of setting up the right address for
> > > it .. Might take till next week tho.
> > 
> > Ok, can I just add your acked-by, and send them to akpm/rmk? These
> > three are simple enough...
> 
> Didn't Russell have some pending comments? Anyway, I have them already
> in my korg git tree. So I can move them forward from there , but it's
> temporary ..

He wants two lines deleted, and I agree; so that should be easy.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Status of Dream series

[Pavel Machek]

Hi!

> > > > Russell, what is the status of the "Dream" series? 
> > > > 
> > > >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> > > >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> > > >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > > > 
> > > > Daniel Walker offered to maintain arch-msm tree, would that help? 
> > > 
> > > Yeah, I can do it for now, but I can't accept patches for it via this
> > > email address.. I'm in the processes of setting up the right address for
> > > it .. Might take till next week tho.
> > 
> > Ok, can I just add your acked-by, and send them to akpm/rmk? These
> > three are simple enough...
> 
> Didn't Russell have some pending comments? Anyway, I have them already
> in my korg git tree. So I can move them forward from there , but it's
> temporary ..

Here's fixed #2. I guess we can add rmk's reviewed-by (and yours?) and
send them forward?
								Pavel

---

This is just enough to get the device booting and serial console
working.  Sufficient for debugging further MSM7k/Dream Support.
This will support HTC Dream / T-Mobile G1 / Android ADP1 (which
are all the same hardware, known as "trout" to the ARM machine
database).

Signed-off-by: Brian Swetland <swetland@google.com>
Reviewed-by: GeunSik Lim <geunsik.lim@samsung.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

---
arch/arm/mach-msm/Kconfig       |    6 +++
 arch/arm/mach-msm/Makefile      |    1 +
 arch/arm/mach-msm/board-dream.c |   84 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-msm/board-dream.h |    5 ++
 4 files changed, 96 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-msm/board-dream.c
 create mode 100644 arch/arm/mach-msm/board-dream.h

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 35f2a90..f780086 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -34,4 +34,10 @@ config MACH_HALIBUT
 	help
 	  Support for the Qualcomm SURF7201A eval board.
 
+config MACH_TROUT
+	default y
+	bool "HTC Dream (aka trout)"
+	help
+	  Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
+
 endif
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 1aa4700..91e6f5c 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -6,3 +6,4 @@ obj-y += clock.o clock-7x01a.o
 
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
 
+obj-$(CONFIG_MACH_TROUT) += board-dream.o
diff --git a/arch/arm/mach-msm/board-dream.c b/arch/arm/mach-msm/board-dream.c
new file mode 100644
index 0000000..6eae7e3
--- /dev/null
+++ b/arch/arm/mach-msm/board-dream.c
@@ -0,0 +1,82 @@
+/* linux/arch/arm/mach-msm/board-dream.c
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Brian Swetland <swetland@google.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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 <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <mach/board.h>
+#include <mach/hardware.h>
+#include <mach/msm_iomap.h>
+
+#include "devices.h"
+#include "board-dream.h"
+
+static struct platform_device *devices[] __initdata = {
+	&msm_device_uart3,
+	&msm_device_smd,
+	&msm_device_nand,
+	&msm_device_hsusb,
+	&msm_device_i2c,
+};
+
+extern struct sys_timer msm_timer;
+
+static void __init trout_init_irq(void)
+{
+	msm_init_irq();
+}
+
+static void __init trout_init(void)
+{
+	platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+static struct map_desc trout_io_desc[] __initdata = {
+	{
+		.virtual = TROUT_CPLD_BASE,
+		.pfn     = __phys_to_pfn(TROUT_CPLD_START),
+		.length  = TROUT_CPLD_SIZE,
+		.type    = MT_DEVICE_NONSHARED
+	}
+};
+
+static void __init trout_map_io(void)
+{
+	msm_map_common_io();
+	iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc));
+
+#ifdef CONFIG_MSM_DEBUG_UART3
+	/* route UART3 to the "H2W" extended usb connector */
+	writeb(0x80, TROUT_CPLD_BASE + 0x00);
+#endif
+
+	msm_clock_init();
+}
+
+MACHINE_START(TROUT, "HTC Dream")
+	.phys_io	= MSM_DEBUG_UART_PHYS,
+	.io_pg_offst	= ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
+	.boot_params	= 0x10000100,
+	.map_io		= trout_map_io,
+	.init_irq	= trout_init_irq,
+	.init_machine	= trout_init,
+	.timer		= &msm_timer,
+MACHINE_END
diff --git a/arch/arm/mach-msm/board-dream.h b/arch/arm/mach-msm/board-dream.h
new file mode 100644
index 0000000..4f345a5
--- /dev/null
+++ b/arch/arm/mach-msm/board-dream.h
@@ -0,0 +1,5 @@
+
+#define TROUT_CPLD_BASE   0xE8100000
+#define TROUT_CPLD_START  0x98000000
+#define TROUT_CPLD_SIZE   SZ_4K
+

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Status of Dream series

[Pavel Machek]

On Mon 2009-11-16 16:39:46, Russell King - ARM Linux wrote:
> On Wed, Nov 11, 2009 at 11:47:48AM +0100, Pavel Machek wrote:
> > 
> > Russell, what is the status of the "Dream" series? 
> > 
> >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> >  [PATCH 3/3] msm: Add memory map for HTC Dream
> 
> See my reply today on patch 2/3; that is my only comment.

Good, so it is ok to add reviewed-by: tags on the fixed versions?

> > Daniel Walker offered to maintain arch-msm tree, would that help? 
> 
> I thought from Daniel's private email to me on the 2/11 that this was
> his intention; I didn't see a question in it requiring an answer.

So... Daniel is now the new arch-msm maintainer? Good.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Status of Dream series

[Pavel Machek]

On Wed 2009-11-18 10:42:35, Daniel Walker wrote:
> On Wed, 2009-11-18 at 19:18 +0100, Pavel Machek wrote:
> > Hi!
> > 
> > > > > > Russell, what is the status of the "Dream" series? 
> > > > > > 
> > > > > >  [PATCH 1/3] msm: make debugging UART (for DEBUG_LL) configurable
> > > > > >  [PATCH 2/3] msm: add minimal board file for HTC Dream device
> > > > > >  [PATCH 3/3] msm: Add memory map for HTC Dream
> > > > > > 
> > > > > > Daniel Walker offered to maintain arch-msm tree, would that help? 
> > > > > 
> > > > > Yeah, I can do it for now, but I can't accept patches for it via this
> > > > > email address.. I'm in the processes of setting up the right address for
> > > > > it .. Might take till next week tho.
> > > > 
> > > > Ok, can I just add your acked-by, and send them to akpm/rmk? These
> > > > three are simple enough...
> > > 
> > > Didn't Russell have some pending comments? Anyway, I have them already
> > > in my korg git tree. So I can move them forward from there , but it's
> > > temporary ..
> > 
> > Here's fixed #2. I guess we can add rmk's reviewed-by (and yours?) and
> > send them forward?
> 
> I'll add my sign off, put them into my git tree (which is included in
> linux-next) , the eventually push them to Linus when the merge window
> opens ..

Thanks! You should probably add yourself into the MAINTAINER file, too...

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html