Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:46:51 +0000 (20:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:46:51 +0000 (20:46 -0800)
* '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

12 files changed:
MAINTAINERS
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/Makefile
arch/arm/mach-msm/board-dream.c [new file with mode: 0644]
arch/arm/mach-msm/board-dream.h [new file with mode: 0644]
arch/arm/mach-msm/include/mach/debug-macro.S
arch/arm/mach-msm/include/mach/mmc.h [new file with mode: 0644]
arch/arm/mach-msm/include/mach/msm_iomap.h
arch/arm/mach-msm/include/mach/uncompress.h
arch/arm/mach-msm/io.c
drivers/mmc/host/msm_sdcc.c
drivers/video/Kconfig

index 520a3b3fd82ceec6b40a8cf77449bc3c2faee30f..14eab97a86aac782ee0b472939db96672f84f732 100644 (file)
@@ -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>
index d140abca690afdee1a0c78a0a288ec545312f3f2..f780086befd78697d16da2654758270dd75bd1d6 100644 (file)
@@ -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
index 1aa47001aa3b065b1b0d4f3a5387a0447bda5cb0..91e6f5c95dc161806e7a6199ef38727c5b0a4563 100644 (file)
@@ -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 (file)
index 0000000..21afa85
--- /dev/null
@@ -0,0 +1,93 @@
+/* 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
diff --git a/arch/arm/mach-msm/board-dream.h b/arch/arm/mach-msm/board-dream.h
new file mode 100644 (file)
index 0000000..4f345a5
--- /dev/null
@@ -0,0 +1,5 @@
+
+#define TROUT_CPLD_BASE   0xE8100000
+#define TROUT_CPLD_START  0x98000000
+#define TROUT_CPLD_SIZE   SZ_4K
+
index 1db3c97dbc49e4738d386396a5db3e6169cb7785..d48747ebcd3dc64be6df5bbd0409a5e6705f43bf 100644 (file)
  *
  */
 
+
+
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
+#ifdef CONFIG_MSM_DEBUG_UART
        .macro  addruart,rx
        @ see if the MMU is enabled and select appropriate base address
        mrc     p15, 0, \rx, c1, c0
        tst     \rx, #1
-       ldreq   \rx, =MSM_UART1_PHYS
-       movne   \rx, #0
+       ldreq   \rx, =MSM_DEBUG_UART_PHYS
+       ldrne   \rx, =MSM_DEBUG_UART_BASE
        .endm
 
        .macro  senduart,rd,rx
 
        .macro  waituart,rd,rx
        @ wait for TX_READY
-       teq     \rx, #0
-       bne     2f
-1:     ldr     \rd, [\rx, #0x08]
+1001:  ldr     \rd, [\rx, #0x08]
        tst     \rd, #0x04
-       beq     1b
-2:
+       beq     1001b
+       .endm
+#else
+       .macro  addruart,rx
+       .endm
+
+       .macro  senduart,rd,rx
+       .endm
+
+       .macro  waituart,rd,rx
        .endm
+#endif
 
        .macro  busyuart,rd,rx
        .endm
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
new file mode 100644 (file)
index 0000000..0ecf254
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ *  arch/arm/include/asm/mach/mmc.h
+ */
+#ifndef ASMARM_MACH_MMC_H
+#define ASMARM_MACH_MMC_H
+
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/sdio_func.h>
+
+struct embedded_sdio_data {
+       struct sdio_cis cis;
+       struct sdio_cccr cccr;
+       struct sdio_embedded_func *funcs;
+       int num_funcs;
+};
+
+struct mmc_platform_data {
+       unsigned int ocr_mask;                  /* available voltages */
+       u32 (*translate_vdd)(struct device *, unsigned int);
+       unsigned int (*status)(struct device *);
+       struct embedded_sdio_data *embedded_sdio;
+       int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
+};
+
+#endif
index 2f7b4c8620d95f257e6c845f541ce4a42a4abea7..9dae1a98c77afdf8acf105e96828dda14b13fca9 100644 (file)
 #define MSM_UART3_PHYS        0xA9C00000
 #define MSM_UART3_SIZE        SZ_4K
 
+#ifdef CONFIG_MSM_DEBUG_UART
+#define MSM_DEBUG_UART_BASE   0xE1000000
+#if CONFIG_MSM_DEBUG_UART == 1
+#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS
+#elif CONFIG_MSM_DEBUG_UART == 2
+#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS
+#elif CONFIG_MSM_DEBUG_UART == 3
+#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS
+#endif
+#define MSM_DEBUG_UART_SIZE   SZ_4K
+#endif
+
 #define MSM_SDC1_PHYS         0xA0400000
 #define MSM_SDC1_SIZE         SZ_4K
 
index 026e8955ace9d4c47cc53bf1118d54ba862a3bc6..d94292c29d8e27ed6a736a8bb24b7d8f640d3dd0 100644 (file)
 #ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
 
 #include "hardware.h"
+#include "linux/io.h"
+#include "mach/msm_iomap.h"
 
 static void putc(int c)
 {
+#if defined(MSM_DEBUG_UART_PHYS)
+       unsigned base = MSM_DEBUG_UART_PHYS;
+       while (!(readl(base + 0x08) & 0x04)) ;
+       writel(c, base + 0x0c);
+#endif
 }
 
 static inline void flush(void)
index 6e7692ff6f2cb1a7416a8b12c44d0aed0748f3ae..1c5e7dac086f1892d9a6c831f8d5cf99dee90453 100644 (file)
@@ -42,6 +42,9 @@ static struct map_desc msm_io_desc[] __initdata = {
        MSM_DEVICE(GPIO1),
        MSM_DEVICE(GPIO2),
        MSM_DEVICE(CLK_CTL),
+#ifdef CONFIG_MSM_DEBUG_UART
+       MSM_DEVICE(DEBUG_UART),
+#endif
        {
                .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
                .pfn =      __phys_to_pfn(MSM_SHARED_RAM_PHYS),
index dba4600bcdb458e6bd115ef0b1bc30a03a8e6ac7..b31946e0b4ca7ee72224f7e1f880384279d83914 100644 (file)
 #include <asm/div64.h>
 #include <asm/sizes.h>
 
-#include <asm/mach/mmc.h>
+#include <mach/mmc.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
-#include <mach/htc_pwrsink.h>
 
 #include "msm_sdcc.h"
 
@@ -775,13 +774,11 @@ msmsdcc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
        switch (ios->power_mode) {
        case MMC_POWER_OFF:
-               htc_pwrsink_set(PWRSINK_SDCARD, 0);
                break;
        case MMC_POWER_UP:
                pwr |= MCI_PWR_UP;
                break;
        case MMC_POWER_ON:
-               htc_pwrsink_set(PWRSINK_SDCARD, 100);
                pwr |= MCI_PWR_ON;
                break;
        }
index bb5fbed89e7f6c324513ec2039391b60ce96f1d7..99c0df1c7ebf5ec9f4fed97d7bfdd2de241b488b 100644 (file)
@@ -2131,7 +2131,7 @@ config FB_PRE_INIT_FB
          the bootloader.
 
 config FB_MSM
-       tristate
+       tristate "MSM Framebuffer support"
        depends on FB && ARCH_MSM
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA