8 files changed, 57 insertions, 91 deletions

diff --git a/Documentation/devicetree/bindings/arm/vt8500.txt b/Documentation/devicetree/bindings/arm/vt8500.txt
index d657832c6819..87dc1ddf4770 100644
--- a/Documentation/devicetree/bindings/arm/vt8500.txt
+++ b/Documentation/devicetree/bindings/arm/vt8500.txt
@@ -12,3 +12,11 @@ compatible = "wm,wm8505";
 Boards with the Wondermedia WM8650 SoC shall have the following properties:
 Required root node property:
 compatible = "wm,wm8650";
+
+Boards with the Wondermedia WM8750 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8750";
+
+Boards with the Wondermedia WM8850 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8850";
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 67874b82a4ed..31fe86d52608 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -949,22 +949,6 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1/2/3/4).
 
-config ARCH_VT8500_SINGLE
-        bool "VIA/WonderMedia 85xx"
-        select ARCH_HAS_CPUFREQ
-        select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
-        select COMMON_CLK
-        select CPU_ARM926T
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
-        select HAVE_CLK
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
-        select USE_OF
-        help
-          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
-
 endchoice
 
 menu "Multiple platform selection"
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 661030d6bc6c..bbb0a670cd1a 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -412,6 +412,13 @@ choice
                   of the tiles using the RS1 memory map, including all new A-class
                   core tiles, FPGA-based SMMs and software models.
 
+        config DEBUG_VT8500_UART0
+                bool "Use UART0 on VIA/Wondermedia SoCs"
+                depends on ARCH_VT8500
+                help
+                  This option selects UART0 on VIA/Wondermedia System-on-a-chip
+                  devices, including VT8500, WM8505, WM8650 and WM8850.
+
         config DEBUG_LL_UART_NONE
                 bool "No low-level debugging UART"
                 depends on !ARCH_MULTIPLATFORM
@@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE
         default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
         default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
                 DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
+        default "debug/vt8500.S" if DEBUG_VT8500_UART0
         default "debug/tegra.S" if DEBUG_TEGRA_UART
         default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
         default "mach/debug-macro.S"
diff --git a/arch/arm/mach-vt8500/include/mach/debug-macro.S b/arch/arm/include/debug/vt8500.S
index ca292f29d4a3..0e0ca0869da7 100644
--- a/arch/arm/mach-vt8500/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/vt8500.S
@@ -1,20 +1,24 @@
-/*
- * arch/arm/mach-vt8500/include/mach/debug-macro.S
+/* 
+ * Debugging macro include header
  *
  *  Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Debugging macro include header
+ *    Moved from arch/arm/mach-vt8500/include/mach/debug-macro.S
+ *    Minor changes for readability.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
-*/
+ */
+
+#define DEBUG_LL_PHYS_BASE              0xD8000000
+#define DEBUG_LL_VIRT_BASE              0xF8000000
+#define DEBUG_LL_UART_OFFSET            0x00200000
 
+#if defined(CONFIG_DEBUG_VT8500_UART0)
         .macro  addruart, rp, rv, tmp
-        mov     \rp,      #0x00200000
-        orr     \rv, \rp, #0xf8000000
-        orr     \rp, \rp, #0xd8000000
+        mov     \rp,      #DEBUG_LL_UART_OFFSET
+        orr     \rv, \rp, #DEBUG_LL_VIRT_BASE
+        orr     \rp, \rp, #DEBUG_LL_PHYS_BASE
         .endm
 
         .macro  senduart,rd,rx
@@ -29,3 +33,5 @@
 
         .macro  waituart,rd,rx
         .endm
+
+#endif
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 2ed0b7d95db6..747aa14d0475 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,12 +1,33 @@
 config ARCH_VT8500
-        bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5
-        default ARCH_VT8500_SINGLE
+        bool
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
         select HAVE_CLK
         help
           Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+
+config ARCH_WM8505
+        bool "VIA/Wondermedia 85xx and WM8650"
+        depends on ARCH_MULTI_V5
+        select ARCH_VT8500
+        select CPU_ARM926T
+        help
+
+config ARCH_WM8750
+        bool "WonderMedia WM8750"
+        depends on ARCH_MULTI_V6
+        select ARCH_VT8500
+        select CPU_V6
+        help
+          Support for WonderMedia WM8750 System-on-Chip.
+
+config ARCH_WM8850
+        bool "WonderMedia WM8850"
+        depends on ARCH_MULTI_V7
+        select ARCH_VT8500
+        select CPU_V7
+        help
+          Support for WonderMedia WM8850 System-on-Chip.
diff --git a/arch/arm/mach-vt8500/include/mach/timex.h b/arch/arm/mach-vt8500/include/mach/timex.h
deleted file mode 100644
index 8487e4c690b7..000000000000
--- a/arch/arm/mach-vt8500/include/mach/timex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  arch/arm/mach-vt8500/include/mach/timex.h
- *
- *  Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * 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
- */
-
-#ifndef MACH_TIMEX_H
-#define MACH_TIMEX_H
-
-#define CLOCK_TICK_RATE         (3000000)
-
-#endif /* MACH_TIMEX_H */
diff --git a/arch/arm/mach-vt8500/include/mach/uncompress.h b/arch/arm/mach-vt8500/include/mach/uncompress.h
deleted file mode 100644
index e6e81fdaf109..000000000000
--- a/arch/arm/mach-vt8500/include/mach/uncompress.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/uncompress.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Based on arch/arm/mach-dove/include/mach/uncompress.h
- *
- * 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.
- *
- */
-
-#define UART0_PHYS      0xd8200000
-#define UART0_ADDR(x)   *(volatile unsigned char *)(UART0_PHYS + x)
-
-static void putc(const char c)
-{
-        while (UART0_ADDR(0x1c) & 0x2)
-                /* Tx busy, wait and poll */;
-
-        UART0_ADDR(0) = c;
-}
-
-static void flush(void)
-{
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-#define arch_decomp_wdog()
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 3c66d48ea082..55162ab1a943 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -183,6 +183,8 @@ static const char * const vt8500_dt_compat[] = {
         "via,vt8500",
         "wm,wm8650",
         "wm,wm8505",
+        "wm,wm8750",
+        "wm,wm8850",
 };
 
 DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")