Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  davinci: dm646x EVM: Specify reserved EDMA channel/slots
  davinci: da8xx/omapl EVM: Specify reserved channels/slots
  davinci: support for EDMA resource sharing
  davinci: edma: provide ability to detect insufficient CC info data
  davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities
  davinci: DM365: fixed second serial port
  Davinci: tnetv107x evm board initial support
  Davinci: tnetv107x initial gpio support
  Davinci: tnetv107x soc support
  Davinci: tnetv107x decompresser uart definitions
  Davinci: generalized debug macros

8 files changed, 210 insertions, 40 deletions

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 1b31a9aa8fba..3c07059f526e 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -67,7 +67,8 @@ extern void __iomem *da8xx_syscfg1_base;
 void __init da830_init(void);
 void __init da850_init(void);
 
-int da8xx_register_edma(void);
+int da830_register_edma(struct edma_rsv_info *rsv);
+int da850_register_edma(struct edma_rsv_info *rsv[2]);
 int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata);
 int da8xx_register_watchdog(void);
 int da8xx_register_usb20(unsigned mA, unsigned potpgt);
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S
index 3cd93a801d9b..f761dfdb8689 100644
--- a/arch/arm/mach-davinci/include/mach/debug-macro.S
+++ b/arch/arm/mach-davinci/include/mach/debug-macro.S
@@ -17,22 +17,50 @@
  */
 
 #include <linux/serial_reg.h>
+
+#include <asm/memory.h>
+
+#include <mach/serial.h>
+
 #define UART_SHIFT      2
 
+                .pushsection .data
+davinci_uart_phys:      .word   0
+davinci_uart_virt:      .word   0
+                .popsection
+
                 .macro addruart, rx, tmp
+
+                /* Use davinci_uart_phys/virt if already configured */
+10:             mrc     p15, 0, \rx, c1, c0
+                tst     \rx, #1                 @ MMU enabled?
+                ldreq   \rx, =__virt_to_phys(davinci_uart_phys)
+                ldrne   \rx, =davinci_uart_virt
+                ldr     \rx, [\rx]
+                cmp     \rx, #0                 @ is port configured?
+                bne     99f                     @ already configured
+
                 mrc     p15, 0, \rx, c1, c0
                 tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x01000000        @ physical base address
-                movne   \rx, #0xfe000000        @ virtual base
-#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
-#error Cannot enable DaVinci and DA8XX platforms concurrently
-#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM) || \
-        defined(CONFIG_MACH_DAVINCI_DA850_EVM)
-                orr     \rx, \rx, #0x00d00000   @ physical base address
-                orr     \rx, \rx, #0x0000d000   @ of UART 2
-#else
-                orr     \rx, \rx, #0x00c20000   @ UART 0
-#endif
+
+                /* Copy uart phys address from decompressor uart info */
+                ldreq   \tmp, =__virt_to_phys(davinci_uart_phys)
+                ldrne   \tmp, =davinci_uart_phys
+                ldreq   \rx, =DAVINCI_UART_INFO
+                ldrne   \rx, =__phys_to_virt(DAVINCI_UART_INFO)
+                ldr     \rx, [\rx, #0]
+                str     \rx, [\tmp]
+
+                /* Copy uart virt address from decompressor uart info */
+                ldreq   \tmp, =__virt_to_phys(davinci_uart_virt)
+                ldrne   \tmp, =davinci_uart_virt
+                ldreq   \rx, =DAVINCI_UART_INFO
+                ldrne   \rx, =__phys_to_virt(DAVINCI_UART_INFO)
+                ldr     \rx, [\rx, #4]
+                str     \rx, [\tmp]
+
+                b       10b
+99:
                 .endm
 
                 .macro  senduart,rd,rx
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index add6f794a362..0a27ee9a70e1 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -32,6 +32,7 @@ void __init dm646x_init(void);
 void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
 void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
 void __init dm646x_board_setup_refclk(struct clk *clk);
+int __init dm646x_init_edma(struct edma_rsv_info *rsv);
 
 void dm646x_video_init(void);
 
diff --git a/arch/arm/mach-davinci/include/mach/edma.h b/arch/arm/mach-davinci/include/mach/edma.h
index ced3092af5ba..dc10ef6cf572 100644
--- a/arch/arm/mach-davinci/include/mach/edma.h
+++ b/arch/arm/mach-davinci/include/mach/edma.h
@@ -230,6 +230,8 @@ enum sync_dimension {
 #define EDMA_CONT_PARAMS_FIXED_EXACT     1002
 #define EDMA_CONT_PARAMS_FIXED_NOT_EXACT 1003
 
+#define EDMA_MAX_CC               2
+
 /* alloc/free DMA channels and their dedicated parameter RAM slots */
 int edma_alloc_channel(int channel,
         void (*callback)(unsigned channel, u16 ch_status, void *data),
@@ -269,6 +271,12 @@ void edma_clear_event(unsigned channel);
 void edma_pause(unsigned channel);
 void edma_resume(unsigned channel);
 
+struct edma_rsv_info {
+
+        const s16       (*rsv_chans)[2];
+        const s16       (*rsv_slots)[2];
+};
+
 /* platform_data for EDMA driver */
 struct edma_soc_info {
 
@@ -280,6 +288,9 @@ struct edma_soc_info {
         unsigned        n_cc;
         enum dma_event_q        default_queue;
 
+        /* Resource reservation for other cores */
+        struct edma_rsv_info    *rsv;
+
         const s8        (*queue_tc_mapping)[2];
         const s8        (*queue_priority_mapping)[2];
 };
diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h
index 504cc180a60b..fbece126c2bf 100644
--- a/arch/arm/mach-davinci/include/mach/gpio.h
+++ b/arch/arm/mach-davinci/include/mach/gpio.h
@@ -25,6 +25,7 @@
 
 enum davinci_gpio_type {
         GPIO_TYPE_DAVINCI = 0,
+        GPIO_TYPE_TNETV107X,
 };
 
 /*
@@ -87,9 +88,13 @@ static inline u32 __gpio_mask(unsigned gpio)
         return 1 << (gpio % 32);
 }
 
-/* The get/set/clear functions will inline when called with constant
+/*
+ * The get/set/clear functions will inline when called with constant
  * parameters referencing built-in GPIOs, for low-overhead bitbanging.
  *
+ * gpio_set_value() will inline only on traditional Davinci style controllers
+ * with distinct set/clear registers.
+ *
  * Otherwise, calls with variable parameters or referencing external
  * GPIOs (e.g. on GPIO expander chips) use outlined functions.
  */
@@ -100,12 +105,15 @@ static inline void gpio_set_value(unsigned gpio, int value)
                 u32                             mask;
 
                 ctlr = __gpio_to_controller(gpio);
-                mask = __gpio_mask(gpio);
-                if (value)
-                        __raw_writel(mask, ctlr->set_data);
-                else
-                        __raw_writel(mask, ctlr->clr_data);
-                return;
+
+                if (ctlr->set_data != ctlr->clr_data) {
+                        mask = __gpio_mask(gpio);
+                        if (value)
+                                __raw_writel(mask, ctlr->set_data);
+                        else
+                                __raw_writel(mask, ctlr->clr_data);
+                        return;
+                }
         }
 
         __gpio_set_value(gpio, value);
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
index f6c4f34909a2..8051110b8ac3 100644
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -11,8 +11,19 @@
 #ifndef __ASM_ARCH_SERIAL_H
 #define __ASM_ARCH_SERIAL_H
 
+#include <asm/memory.h>
+
 #include <mach/hardware.h>
 
+/*
+ * Stolen area that contains debug uart physical and virtual addresses.  These
+ * addresses are filled in by the uncompress.h code, and are used by the debug
+ * macros in debug-macro.S.
+ *
+ * This area sits just below the page tables (see arch/arm/kernel/head.S).
+ */
+#define DAVINCI_UART_INFO       (PHYS_OFFSET + 0x3ff8)
+
 #define DAVINCI_UART0_BASE      (IO_PHYS + 0x20000)
 #define DAVINCI_UART1_BASE      (IO_PHYS + 0x20400)
 #define DAVINCI_UART2_BASE      (IO_PHYS + 0x20800)
@@ -21,16 +32,26 @@
 #define DA8XX_UART1_BASE        (IO_PHYS + 0x10c000)
 #define DA8XX_UART2_BASE        (IO_PHYS + 0x10d000)
 
+#define TNETV107X_UART0_BASE    0x08108100
+#define TNETV107X_UART1_BASE    0x08088400
+#define TNETV107X_UART2_BASE    0x08108300
+
+#define TNETV107X_UART0_VIRT    IOMEM(0xfee08100)
+#define TNETV107X_UART1_VIRT    IOMEM(0xfed88400)
+#define TNETV107X_UART2_VIRT    IOMEM(0xfee08300)
+
 /* DaVinci UART register offsets */
 #define UART_DAVINCI_PWREMU             0x0c
 #define UART_DM646X_SCR                 0x10
 #define UART_DM646X_SCR_TX_WATERMARK    0x08
 
+#ifndef __ASSEMBLY__
 struct davinci_uart_config {
         /* Bit field of UARTs present; bit 0 --> UART1 */
         unsigned int enabled_uarts;
 };
 
 extern int davinci_serial_init(struct davinci_uart_config *);
+#endif
 
 #endif /* __ASM_ARCH_SERIAL_H */
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
new file mode 100644
index 000000000000..c72064733123
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -0,0 +1,55 @@
+/*
+ * Texas Instruments TNETV107X SoC Specific Defines
+ *
+ * Copyright (C) 2010 Texas Instruments
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __ASM_ARCH_DAVINCI_TNETV107X_H
+#define __ASM_ARCH_DAVINCI_TNETV107X_H
+
+#include <asm/sizes.h>
+
+#define TNETV107X_DDR_BASE      0x80000000
+
+/*
+ * Fixed mapping for early init starts here. If low-level debug is enabled,
+ * this area also gets mapped via io_pg_offset and io_phys by the boot code.
+ * To fit in with the io_pg_offset calculation, the io base address selected
+ * here _must_ be a multiple of 2^20.
+ */
+#define TNETV107X_IO_BASE       0x08000000
+#define TNETV107X_IO_VIRT       (IO_VIRT + SZ_1M)
+
+#define TNETV107X_N_GPIO        65
+
+#ifndef __ASSEMBLY__
+
+#include <linux/serial_8250.h>
+#include <mach/mmc.h>
+#include <mach/nand.h>
+#include <mach/serial.h>
+
+struct tnetv107x_device_info {
+        struct davinci_uart_config      *serial_config;
+        struct davinci_mmc_config       *mmc_config[2];  /* 2 controllers */
+        struct davinci_nand_pdata       *nand_config[4]; /* 4 chipsels */
+};
+
+extern struct platform_device tnetv107x_wdt_device;
+extern struct platform_device tnetv107x_serial_device;
+
+extern void __init tnetv107x_init(void);
+extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);
+extern void __init tnetv107x_irq_init(void);
+
+#endif
+
+#endif /* __ASM_ARCH_DAVINCI_TNETV107X_H */
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h
index 33796b4db17f..15a6192ad6eb 100644
--- a/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/arch/arm/mach-davinci/include/mach/uncompress.h
@@ -1,8 +1,17 @@
 /*
  * Serial port stubs for kernel decompress status messages
  *
- *  Author:     Anant Gole
- * (C) Copyright (C) 2006, Texas Instruments, Inc
+ * Initially based on:
+ * arch/arm/plat-omap/include/mach/uncompress.h
+ *
+ * Original copyrights follow.
+ *
+ * Copyright (C) 2000 RidgeRun, Inc.
+ * Author: Greg Lonnon <glonnon@ridgerun.com>
+ *
+ * Rewritten by:
+ * Author: <source@mvista.com>
+ * 2004 (c) MontaVista Software, Inc.
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
@@ -11,30 +20,17 @@
 
 #include <linux/types.h>
 #include <linux/serial_reg.h>
-#include <mach/serial.h>
 
 #include <asm/mach-types.h>
 
-extern unsigned int __machine_arch_type;
+#include <mach/serial.h>
 
 static u32 *uart;
-
-static u32 *get_uart_base(void)
-{
-        if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM ||
-                __machine_arch_type == MACH_TYPE_DAVINCI_DA850_EVM)
-                return (u32 *)DA8XX_UART2_BASE;
-        else
-                return (u32 *)DAVINCI_UART0_BASE;
-}
+static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
 
 /* PORT_16C550A, in polled non-fifo mode */
-
 static void putc(char c)
 {
-        if (!uart)
-                uart = get_uart_base();
-
         while (!(uart[UART_LSR] & UART_LSR_THRE))
                 barrier();
         uart[UART_TX] = c;
@@ -42,12 +38,61 @@ static void putc(char c)
 
 static inline void flush(void)
 {
-        if (!uart)
-                uart = get_uart_base();
-
         while (!(uart[UART_LSR] & UART_LSR_THRE))
                 barrier();
 }
 
-#define arch_decomp_setup()
+static inline void set_uart_info(u32 phys, void * __iomem virt)
+{
+        uart = (u32 *)phys;
+        uart_info[0] = phys;
+        uart_info[1] = (u32)virt;
+}
+
+#define _DEBUG_LL_ENTRY(machine, phys, virt)                    \
+        if (machine_is_##machine()) {                           \
+                set_uart_info(phys, virt);                      \
+                break;                                          \
+        }
+
+#define DEBUG_LL_DAVINCI(machine, port)                         \
+        _DEBUG_LL_ENTRY(machine, DAVINCI_UART##port##_BASE,     \
+                        IO_ADDRESS(DAVINCI_UART##port##_BASE))
+
+#define DEBUG_LL_DA8XX(machine, port)                           \
+        _DEBUG_LL_ENTRY(machine, DA8XX_UART##port##_BASE,       \
+                        IO_ADDRESS(DA8XX_UART##port##_BASE))
+
+#define DEBUG_LL_TNETV107X(machine, port)                       \
+        _DEBUG_LL_ENTRY(machine, TNETV107X_UART##port##_BASE,   \
+                        TNETV107X_UART##port##_VIRT)
+
+static inline void __arch_decomp_setup(unsigned long arch_id)
+{
+        /*
+         * Initialize the port based on the machine ID from the bootloader.
+         * Note that we're using macros here instead of switch statement
+         * as machine_is functions are optimized out for the boards that
+         * are not selected.
+         */
+        do {
+                /* Davinci boards */
+                DEBUG_LL_DAVINCI(davinci_evm,           0);
+                DEBUG_LL_DAVINCI(sffsdr,                0);
+                DEBUG_LL_DAVINCI(neuros_osd2,           0);
+                DEBUG_LL_DAVINCI(davinci_dm355_evm,     0);
+                DEBUG_LL_DAVINCI(dm355_leopard,         0);
+                DEBUG_LL_DAVINCI(davinci_dm6467_evm,    0);
+                DEBUG_LL_DAVINCI(davinci_dm365_evm,     0);
+
+                /* DA8xx boards */
+                DEBUG_LL_DA8XX(davinci_da830_evm,       2);
+                DEBUG_LL_DA8XX(davinci_da850_evm,       2);
+
+                /* TNETV107x boards */
+                DEBUG_LL_TNETV107X(tnetv107x,           1);
+        } while (0);
+}
+
+#define arch_decomp_setup()     __arch_decomp_setup(arch_id)
 #define arch_decomp_wdog()