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

Commit 9bc128e1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-multiplatform-asoc' of... 

Merge tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/multiplatform

From Linus Walleij <linus.walleij@linaro.org>:

Ux500 multiplatform support.  This tag builds upon the MFD-specific base
tag "ux500-multiplatform-mfd". This removes all <mach/*> dependencies
and makes the ux500 fully multi-platform.

* tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: build hotplug.o for ARMv7-a
  ARM: ux500: move to multiplatform
  ARM: ux500: make remaining headers local
  ARM: ux500: make irqs.h local to platform
  ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
  staging: ste_rmi4: kill platform_data hack
  ARM: ux500: move mach/msp.h to <linux/platform_data/*>
  clk: ux500: pass clock base adresses in init call
  ARM: ux500: make debug macro stand-alone
  ARM: ux500: move debugmacro to debug includes
  ARM: ux500: split out prcmu initialization
  mfd: db8500-prcmu: drop unused includes
  ARM: ux500: move PM-related PRCMU functions to machine
  mfd: db8500-prcmu: get base address from resource
  mfd: prcmu: pass a base and size with the early initcall

Conflicts:
	arch/arm/Kconfig

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 835f9c38 f6f1bdac

arch/arm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -853,22 +853,6 @@ config ARCH_U300 
	help

	  Support for ST-Ericsson U300 series mobile platforms.



config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SPARSE_IRQ

	help

	  Support for ST-Ericsson's Ux500 architecture





config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -432,6 +432,13 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the uart1 port on SiRFmarco devices.



	config DEBUG_UX500_UART

		depends on ARCH_U8500

		bool "Use Ux500 UART for low-level debug"

		help

		  Say Y here if you want kernel low-level debugging support

		  on Ux500 based platforms.



	config DEBUG_VEXPRESS_UART0_DETECT

		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"

		depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -620,6 +627,7 @@ config DEBUG_LL_INCLUDE 
		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/ux500.S" if DEBUG_UX500_UART

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "mach/debug-macro.S"

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

+48 −0
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * published by the Free Software Foundation.

 *

 */

#include <mach/hardware.h>





#if CONFIG_UX500_DEBUG_UART > 2

#error Invalid Ux500 debug UART
@@ -21,19 +21,28 @@ 
 */



#ifdef CONFIG_UX500_SOC_DB8500

#define __UX500_UART(n)	U8500_UART##n##_BASE

#define U8500_UART0_PHYS_BASE	(0x80120000)

#define U8500_UART1_PHYS_BASE	(0x80121000)

#define U8500_UART2_PHYS_BASE	(0x80007000)

#define U8500_UART0_VIRT_BASE	(0xa8120000)

#define U8500_UART1_VIRT_BASE	(0xa8121000)

#define U8500_UART2_VIRT_BASE	(0xa8007000)

#define __UX500_PHYS_UART(n)	U8500_UART##n##_PHYS_BASE

#define __UX500_VIRT_UART(n)	U8500_UART##n##_VIRT_BASE

#endif



#ifndef __UX500_UART

#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART)

#error Unknown SOC

#endif



#define UX500_UART(n)	__UX500_UART(n)

#define UART_BASE	UX500_UART(CONFIG_UX500_DEBUG_UART)

#define UX500_PHYS_UART(n)	__UX500_PHYS_UART(n)

#define UX500_VIRT_UART(n)	__UX500_VIRT_UART(n)

#define UART_PHYS_BASE	UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART)

#define UART_VIRT_BASE	UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART)



	.macro	addruart, rp, rv, tmp

	ldr	\rp, =UART_BASE				@ no, physical address

	ldr	\rv, =IO_ADDRESS(UART_BASE)		@ yes, virtual address

	ldr	\rp, =UART_PHYS_BASE		@ no, physical address

	ldr	\rv, =UART_VIRT_BASE		@ yes, virtual address

	.endm



#include <asm/hardware/debug-pl01x.S>

arch/arm/mach-ux500/Kconfig

+14 −0
Original line number Diff line number Diff line 
config ARCH_U8500

	bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Support for ST-Ericsson's Ux500 architecture



if ARCH_U8500



config UX500_SOC_COMMON

arch/arm/mach-ux500/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



obj-y				:= cpu.o devices.o devices-common.o \

				   id.o usb.o timer.o

				   id.o usb.o timer.o pm.o

obj-$(CONFIG_CPU_IDLE)          += cpuidle.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o
@@ -15,3 +15,5 @@ obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ 
				board-mop500-audio.o

obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o



CFLAGS_hotplug.o		+= -march=armv7-a