diff --git a/[refs] b/[refs] index 7f9602a42406..91bdd399c317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dad2d9e666cbd733afff855f5224dd7e8a7996d3 +refs/heads/master: c38cd8729c90495687ad027a993099d9972ffbf1 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 7a0c31a6669e..a1f8868becc6 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -956,6 +956,22 @@ config ARCH_OMAP1 help Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) +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/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index 6472a5737427..8cccce36b067 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -419,13 +419,6 @@ 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 @@ -569,7 +562,6 @@ 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/trunk/arch/arm/configs/multi_v7_defconfig b/trunk/arch/arm/configs/multi_v7_defconfig index e31d442343c8..2eeff1e64b6e 100644 --- a/trunk/arch/arm/configs/multi_v7_defconfig +++ b/trunk/arch/arm/configs/multi_v7_defconfig @@ -8,7 +8,6 @@ CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SUNXI=y # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set -CONFIG_ARCH_ZYNQ=y CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y CONFIG_ARM_ARCH_TIMER=y @@ -40,6 +39,7 @@ CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y CONFIG_SPI_PL022=y +CONFIG_GPIOLIB=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/trunk/arch/arm/mach-omap2/drm.c b/trunk/arch/arm/mach-omap2/drm.c index 289e8cfb594c..ab8a0e64c5f7 100644 --- a/trunk/arch/arm/mach-omap2/drm.c +++ b/trunk/arch/arm/mach-omap2/drm.c @@ -27,7 +27,6 @@ #include "omap_device.h" #include "omap_hwmod.h" -#include "soc.h" #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) diff --git a/trunk/arch/arm/mach-omap2/hwspinlock.c b/trunk/arch/arm/mach-omap2/hwspinlock.c index bcb357e948b7..ce1b5b6fc22c 100644 --- a/trunk/arch/arm/mach-omap2/hwspinlock.c +++ b/trunk/arch/arm/mach-omap2/hwspinlock.c @@ -21,7 +21,6 @@ #include #include -#include "soc.h" #include "omap_hwmod.h" #include "omap_device.h" diff --git a/trunk/arch/arm/mach-omap2/omap-iommu.c b/trunk/arch/arm/mach-omap2/omap-iommu.c index c20423955bf7..dd8ce6d2f4eb 100644 --- a/trunk/arch/arm/mach-omap2/omap-iommu.c +++ b/trunk/arch/arm/mach-omap2/omap-iommu.c @@ -16,7 +16,6 @@ #include #include -#include "soc.h" #include "omap_hwmod.h" #include "omap_device.h" diff --git a/trunk/arch/arm/mach-omap2/smartreflex-class3.c b/trunk/arch/arm/mach-omap2/smartreflex-class3.c index aee3c8940a30..80f3acb266dc 100644 --- a/trunk/arch/arm/mach-omap2/smartreflex-class3.c +++ b/trunk/arch/arm/mach-omap2/smartreflex-class3.c @@ -12,7 +12,6 @@ */ #include -#include "soc.h" #include "voltage.h" static int sr_class3_enable(struct omap_sr *sr) diff --git a/trunk/arch/arm/mach-vt8500/Kconfig b/trunk/arch/arm/mach-vt8500/Kconfig index cdcc4329b4a8..2ed0b7d95db6 100644 --- a/trunk/arch/arm/mach-vt8500/Kconfig +++ b/trunk/arch/arm/mach-vt8500/Kconfig @@ -1,17 +1,12 @@ config ARCH_VT8500 - bool + bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5 + default ARCH_VT8500_SINGLE 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 diff --git a/trunk/arch/arm/include/debug/vt8500.S b/trunk/arch/arm/mach-vt8500/include/mach/debug-macro.S similarity index 56% rename from trunk/arch/arm/include/debug/vt8500.S rename to trunk/arch/arm/mach-vt8500/include/mach/debug-macro.S index 0e0ca0869da7..ca292f29d4a3 100644 --- a/trunk/arch/arm/include/debug/vt8500.S +++ b/trunk/arch/arm/mach-vt8500/include/mach/debug-macro.S @@ -1,24 +1,20 @@ -/* - * Debugging macro include header +/* + * arch/arm/mach-vt8500/include/mach/debug-macro.S * * Copyright (C) 2010 Alexey Charkov - * Moved from arch/arm/mach-vt8500/include/mach/debug-macro.S - * Minor changes for readability. + * + * Debugging macro include header * * 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, #DEBUG_LL_UART_OFFSET - orr \rv, \rp, #DEBUG_LL_VIRT_BASE - orr \rp, \rp, #DEBUG_LL_PHYS_BASE + mov \rp, #0x00200000 + orr \rv, \rp, #0xf8000000 + orr \rp, \rp, #0xd8000000 .endm .macro senduart,rd,rx @@ -33,5 +29,3 @@ .macro waituart,rd,rx .endm - -#endif diff --git a/trunk/arch/arm/mach-vt8500/include/mach/timex.h b/trunk/arch/arm/mach-vt8500/include/mach/timex.h new file mode 100644 index 000000000000..8487e4c690b7 --- /dev/null +++ b/trunk/arch/arm/mach-vt8500/include/mach/timex.h @@ -0,0 +1,26 @@ +/* + * arch/arm/mach-vt8500/include/mach/timex.h + * + * Copyright (C) 2010 Alexey Charkov + * + * 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/trunk/arch/arm/mach-vt8500/include/mach/uncompress.h b/trunk/arch/arm/mach-vt8500/include/mach/uncompress.h new file mode 100644 index 000000000000..e6e81fdaf109 --- /dev/null +++ b/trunk/arch/arm/mach-vt8500/include/mach/uncompress.h @@ -0,0 +1,37 @@ +/* arch/arm/mach-vt8500/include/mach/uncompress.h + * + * Copyright (C) 2010 Alexey Charkov + * + * 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/trunk/drivers/media/platform/davinci/vpss.c b/trunk/drivers/media/platform/davinci/vpss.c index cdbff88e0f1e..684e815a81b6 100644 --- a/trunk/drivers/media/platform/davinci/vpss.c +++ b/trunk/drivers/media/platform/davinci/vpss.c @@ -25,7 +25,6 @@ #include #include #include -#include #include MODULE_LICENSE("GPL");