Commit c4e194e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 

* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  HTC Dream: mmc compilation fixes
  video: Allow selecting MSM framebuffer in Kconfig
  Add arm msm maintainer entry
  msm: Add memory map for HTC Dream
  msm: add minimal board file for HTC Dream device
  msm: make debugging UART (for DEBUG_LL) configurable
parents 2fe77b81 3989d178

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -801,6 +801,19 @@ L: openmoko-kernel@lists.openmoko.org (subscribers-only) 
W:	http://wiki.openmoko.org/wiki/Neo_FreeRunner

S:	Supported



ARM/QUALCOMM MSM MACHINE SUPPORT

M:	David Brown <davidb@codeaurora.org>

M:	Daniel Walker <dwalker@codeaurora.org>

M:	Bryan Huntsman <bryanh@codeaurora.org>

F:	arch/arm/mach-msm/

F:	drivers/video/msm/

F:	drivers/mmc/host/msm_sdcc.c

F:	drivers/mmc/host/msm_sdcc.h

F:	drivers/serial/msm_serial.h

F:	drivers/serial/msm_serial.c

T:	git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git

S:	Maintained



ARM/TOSA MACHINE SUPPORT

M:	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

M:	Dirk Opfer <dirk@opfer-online.de>

arch/arm/mach-msm/Kconfig

+30 −0
Original line number Diff line number Diff line
@@ -3,6 +3,30 @@ if ARCH_MSM 
comment "MSM Board Type"

	depends on ARCH_MSM



config MSM_DEBUG_UART

	int

	default 1 if MSM_DEBUG_UART1

	default 2 if MSM_DEBUG_UART2

	default 3 if MSM_DEBUG_UART3



choice

	prompt "Debug UART"



	default MSM_DEBUG_UART_NONE



	config MSM_DEBUG_UART_NONE

		bool "None"



	config MSM_DEBUG_UART1

		bool "UART1"



	config MSM_DEBUG_UART2

		bool "UART2"



	config MSM_DEBUG_UART3

		bool "UART3"

endchoice



config MACH_HALIBUT

	depends on ARCH_MSM

	default y
@@ -10,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

arch/arm/mach-msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-msm/board-dream.c

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/* 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 <asm/setup.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_fixup(struct machine_desc *desc, struct tag *tags,

				char **cmdline, struct meminfo *mi)

{

	mi->nr_banks = 1;

	mi->bank[0].start = PHYS_OFFSET;

	mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);

	mi->bank[0].size = (101*1024*1024);

}



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,

	.fixup		= trout_fixup,

	.map_io		= trout_map_io,

	.init_irq	= trout_init_irq,

	.init_machine	= trout_init,

	.timer		= &msm_timer,

MACHINE_END

arch/arm/mach-msm/board-dream.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 


#define TROUT_CPLD_BASE   0xE8100000

#define TROUT_CPLD_START  0x98000000

#define TROUT_CPLD_SIZE   SZ_4K

CRA Git | Maintained and supported by SUSTech CRA and CCSE