mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arm: vt8500: Convert arch-vt8500 to multiplatform only. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQ8NA/AAoJEAKiPfwuf9N/caoIAIvDe6pEB1dCmoL+X14bYc2E
 Q0qeDyP2TUlVqJFf/vy0Lq/LwDHsMj5t4fxJpnWXz1QfEcMPL46Ahlhg49ryt4Zq
 Y6VzBDIEeZz+OFj8THhlGKGFdbqtqktcofBpQ3NoJV+AIomVCDPHKq/bcXOHGFGv
 q0gjBwG8xaBv+Cx8LPv4p62hrJHcmebm+yg4fgfL1D+aTw+031EVTgK1xwUQw6IE
 oSftBeB/WS5Yhk+JuX0hmSOfOCFxQv+mrfoxa00hoFcd5ZKu6Eqx88kOc2M0sl76
 hmVy+0HDF2Ccs4aPYPLz3/wEJ8P7744F1zYfNvJgMjS7eijJXZ3XtpFMVXzDRKk=
 =y4dJ
 -----END PGP SIGNATURE-----

Merge tag 'vt8500-multiplatform-3.9' of git://server.prisktech.co.nz/git/linuxwmt into next/multiplatform

From Tony Prisk:
Convert arch-vt8500 to multiplatform only.

* tag 'vt8500-multiplatform-3.9' of git://server.prisktech.co.nz/git/linuxwmt:
  arm: vt8500: Remove remaining mach includes
  arm: vt8500: Convert debug-macro.S to be multiplatform friendly
  arm: vt8500: Remove single platform Kconfig options

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-01-12 09:06:31 -08:00
parent 6130133248 ce3f386fdf
commit 2fd73eb62b
6 changed files with 31 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/Kconfig
View File

@ -956,22 +956,6 @@ 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"

8
arch/arm/Kconfig.debug
View File

@ -419,6 +419,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
@ -562,6 +569,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"

24
arch/arm/mach-vt8500/include/mach/debug-macro.S → arch/arm/include/debug/vt8500.S
View File

@ -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

11
arch/arm/mach-vt8500/Kconfig
View File

@ -1,12 +1,17 @@
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

26
arch/arm/mach-vt8500/include/mach/timex.h
View File

@ -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 */

37
arch/arm/mach-vt8500/include/mach/uncompress.h
View File

@ -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()