Cleanup for 3.8

Removes a few unused headers from include/mach
 Removes unused arm/boot/compressed/head-vt8500.S
 Fixes header text in mach-vt8500/timer.c
 
 Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQe2KiAAoJEAKiPfwuf9N/secH/0zr7mg17kgXxOflI/PSjwES
 QvYOsT+iR3qAN4KX27Dev7waZaBnfEwDUyVUPc/NYuAz5PjuFA6/6O3wlWEz3tvT
 zn2dgrKNaG6wEvmJjVEh7Ec7mP4Ztz9uNgV49A4s26yXj28kETgPXY+QV+hJA2Ct
 LBILW2KmyfgHzIYc3OryXMyuTlB23HseI0e6/pe1KcFmGJXyykW2/wUR8gtc5yoW
 9R9eeMPjw8olNLy7I2iuGIXiFC0BWYol7Wx5e9mvWfxfEXSSnvOurw0NKKB9GL1G
 RCVLFbJPJX2HMITQn2n6SV+cGalTZ9V0WupyU/WVUWSJnYEfciQubk2mwQEs4Y4=
 =1L0P
 -----END PGP SIGNATURE-----

Merge tag 'cleanup-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt into next/cleanup

From Tony Prisk: Cleanup for 3.8

Removes a few unused headers from include/mach
Removes unused arm/boot/compressed/head-vt8500.S
Fixes header text in mach-vt8500/timer.c

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>

* tag 'cleanup-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt:
  vt8500: Fix header in mach-vt8500/timer.c
  vt8500: Remove arm/boot/compressed/head-vt8500.S
  vt8500: Remove unused headers from include/mach/

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-10-16 11:19:04 -07:00
commit eccfe8b75b
7 changed files with 1 additions and 100 deletions

View File

@ -54,10 +54,6 @@ ifeq ($(CONFIG_ARCH_SA1100),y)
OBJS += head-sa1100.o
endif
ifeq ($(CONFIG_ARCH_VT8500),y)
OBJS += head-vt8500.o
endif
ifeq ($(CONFIG_CPU_XSCALE),y)
OBJS += head-xscale.o
endif

View File

@ -1,46 +0,0 @@
/*
* linux/arch/arm/boot/compressed/head-vt8500.S
*
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
*
* VIA VT8500 specific tweaks. This is merged into head.S by the linker.
*
*/
#include <linux/linkage.h>
#include <asm/mach-types.h>
.section ".start", "ax"
__VT8500_start:
@ Compare the SCC ID register against a list of known values
ldr r1, .SCCID
ldr r3, [r1]
@ VT8500 override
ldr r4, .VT8500SCC
cmp r3, r4
ldreq r7, .ID_BV07
beq .Lendvt8500
@ WM8505 override
ldr r4, .WM8505SCC
cmp r3, r4
ldreq r7, .ID_8505
beq .Lendvt8500
@ Otherwise, leave the bootloader's machine id untouched
.SCCID:
.word 0xd8120000
.VT8500SCC:
.word 0x34000102
.WM8505SCC:
.word 0x34260103
.ID_BV07:
.word MACH_TYPE_BV07
.ID_8505:
.word MACH_TYPE_WM8505_7IN_NETBOOK
.Lendvt8500:

View File

@ -1,12 +0,0 @@
/* arch/arm/mach-vt8500/include/mach/hardware.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.
*
*/

View File

@ -1,18 +0,0 @@
/* arch/arm/mach-vt8500/include/mach/i8042.h
*
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.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.
*
*/
extern unsigned long wmt_i8042_base __initdata;
extern int wmt_i8042_kbd_irq;
extern int wmt_i8042_aux_irq;

View File

@ -1,17 +0,0 @@
/* linux/arch/arm/mach-vt8500/restart.h
*
* Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
*
* 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.
*
*/
void vt8500_setup_restart(void);
void vt8500_restart(char mode, const char *cmd);

View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-vt8500/timer_dt.c
* arch/arm/mach-vt8500/timer.c
*
* Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>

View File

@ -31,8 +31,6 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <mach/restart.h>
#include "common.h"
#define LEGACY_GPIO_BASE 0xD8110000