Commit 32499e8d authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Tony Prisk:
Add support for WM8750 and WM8850 SoCs.

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

:
  arm: vt8500: Add support for Wondermedia WM8750/WM8850
  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: default avatarOlof Johansson <olof@lixom.net>
parents 9931faca 8d31bfa5

Documentation/devicetree/bindings/arm/vt8500.txt

+8 −0
Original line number Diff line number Diff line
@@ -12,3 +12,11 @@ compatible = "wm,wm8505"; 
Boards with the Wondermedia WM8650 SoC shall have the following properties:

Required root node property:

compatible = "wm,wm8650";



Boards with the Wondermedia WM8750 SoC shall have the following properties:

Required root node property:

compatible = "wm,wm8750";



Boards with the Wondermedia WM8850 SoC shall have the following properties:

Required root node property:

compatible = "wm,wm8850";

arch/arm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -949,22 +949,6 @@ config ARCH_OMAP 
	help

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



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"

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -412,6 +412,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
@@ -506,6 +513,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"

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

+15 −9
Original line number Diff line number Diff line 
/* 

 * 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

arch/arm/mach-vt8500/Kconfig

+24 −3
Original line number Diff line number Diff line 
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



config ARCH_WM8750

	bool "WonderMedia WM8750"

	depends on ARCH_MULTI_V6

	select ARCH_VT8500

	select CPU_V6

	help

	  Support for WonderMedia WM8750 System-on-Chip.



config ARCH_WM8850

	bool "WonderMedia WM8850"

	depends on ARCH_MULTI_V7

	select ARCH_VT8500

	select CPU_V7

	help

	  Support for WonderMedia WM8850 System-on-Chip.

CRA Git | Maintained and supported by SUSTech CRA and CCSE