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

Commit e4de6c96 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

From Tony Prisk <linux@prisktech.co.nz>:

Convert arch-vt8500 to multiplatform

* tag 'armsoc-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt

:
  ARM: vt8500: Convert arch-vt8500 to multiplatform
  arm: vt8500: Convert irq.c for multiplatform integration

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6f0c0580 6f35f9a9

arch/arm/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ config ARCH_OMAP 
	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).



config ARCH_VT8500

config ARCH_VT8500_SINGLE

	bool "VIA/WonderMedia 85xx"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB
@@ -951,6 +951,8 @@ config ARCH_VT8500 
	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.
@@ -1126,6 +1128,8 @@ source "arch/arm/mach-versatile/Kconfig" 
source "arch/arm/mach-vexpress/Kconfig"

source "arch/arm/plat-versatile/Kconfig"



source "arch/arm/mach-vt8500/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"



# Definitions to make life easier

arch/arm/mach-vt8500/Kconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
config ARCH_VT8500

	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.

arch/arm/mach-vt8500/common.h

+3 −0
Original line number Diff line number Diff line
@@ -25,4 +25,7 @@ int __init vt8500_irq_init(struct device_node *node, 
/* defined in drivers/clk/clk-vt8500.c */

void __init vtwm_clk_init(void __iomem *pmc_base);



/* defined in irq.c */

asmlinkage void vt8500_handle_irq(struct pt_regs *regs);



#endif

arch/arm/mach-vt8500/include/mach/entry-macro.S

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

 * arch/arm/mach-vt8500/include/mach/entry-macro.S

 *

 * Low-level IRQ helper macros for VIA VT8500

 *

 * This file is licensed under  the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



	.macro  get_irqnr_preamble, base, tmp

	@ physical 0xd8140000 is virtual 0xf8140000

	mov	\base, #0xf8000000

	orr	\base, \base, #0x00140000

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\irqnr, [\base]

	cmp	\irqnr, #63 @ may be false positive, check interrupt status

	bne	1001f

	ldr	\irqstat, [\base, #0x84]

	ands	\irqstat, #0x80000000

	moveq	\irqnr, #0

1001:

	.endm

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

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

 *  arch/arm/mach-vt8500/include/mach/irqs.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

 */



/* This value is just to make the core happy, never used otherwise */

#define NR_IRQS 128