Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eccfe8b7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarTony 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: default avatarOlof Johansson <olof@lixom.net>
parents 4afe30df 83cc7690

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/compressed/head-vt8500.S

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * 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:

arch/arm/mach-vt8500/include/mach/hardware.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* 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.

 *

 */

arch/arm/mach-vt8500/include/mach/i8042.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* 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;

arch/arm/mach-vt8500/include/mach/restart.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/* 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);