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

Commit 2cbe23e3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'tegra/cleanups' into next/timer 



Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-vexpress/core.h

The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b2f1df8d ed1b4acc

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -186,6 +186,9 @@ config GENERIC_ISA_DMA 
config FIQ

	bool



config NEED_RET_TO_USER

	bool



config ARCH_MTD_XIP

	bool
@@ -479,6 +482,7 @@ config ARCH_IOP13XX 
	select ARCH_SUPPORTS_MSI

	select VMSPLIT_1G

	select NEED_MACH_MEMORY_H

	select NEED_RET_TO_USER

	help

	  Support for Intel's IOP13XX (XScale) family of processors.
@@ -486,6 +490,7 @@ config ARCH_IOP32X 
	bool "IOP32x-based"

	depends on MMU

	select CPU_XSCALE

	select NEED_RET_TO_USER

	select PLAT_IOP

	select PCI

	select ARCH_REQUIRE_GPIOLIB
@@ -497,6 +502,7 @@ config ARCH_IOP33X 
	bool "IOP33x-based"

	depends on MMU

	select CPU_XSCALE

	select NEED_RET_TO_USER

	select PLAT_IOP

	select PCI

	select ARCH_REQUIRE_GPIOLIB

arch/arm/Kconfig.debug

+78 −78
Original line number Diff line number Diff line
@@ -81,25 +81,6 @@ choice 
	prompt "Kernel low-level debugging port"

	depends on DEBUG_LL



	config DEBUG_LL_UART_NONE

		bool "No low-level debugging UART"

		help

		  Say Y here if your platform doesn't provide a UART option

		  below. This relies on your platform choosing the right UART

		  definition internally in order for low-level debugging to

		  work.



	config DEBUG_ICEDCC

		bool "Kernel low-level debugging via EmbeddedICE DCC channel"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the EmbeddedICE macrocell's DCC channel using

		  co-processor 14. This is known to work on the ARM9 style ICE

		  channel and on the XScale with the PEEDI.



		  Note that the system will appear to hang during boot if there

		  is nothing connected to read from the DCC.



	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		depends on HAVE_AT91_DBGU0
@@ -108,20 +89,6 @@ choice 
		bool "Kernel low-level debugging on 9263, 9g45 and cap9"

		depends on HAVE_AT91_DBGU1



	config DEBUG_FOOTBRIDGE_COM1

		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the 8250 at PCI COM1.



	config DEBUG_DC21285_PORT

		bool "Kernel low-level debugging messages via footbridge serial port"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port in the DC21285 (Footbridge).



	config DEBUG_CLPS711X_UART1

		bool "Kernel low-level debugging messages via UART1"

		depends on ARCH_CLPS711X
@@ -136,6 +103,20 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on these devices.



	config DEBUG_DC21285_PORT

		bool "Kernel low-level debugging messages via footbridge serial port"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port in the DC21285 (Footbridge).



	config DEBUG_FOOTBRIDGE_COM1

		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the 8250 at PCI COM1.



	config DEBUG_HIGHBANK_UART

		bool "Kernel low-level debugging messages via Highbank UART"

		depends on ARCH_HIGHBANK
@@ -206,38 +187,42 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q.



	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 0 for low-level debug"

	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 0. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.

		  their output to the first serial port on MSM devices.



	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 1 for low-level debug"

	config DEBUG_MSM_UART2

		bool "Kernel low-level debugging messages via MSM UART2"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 1. The port must have been initialised

		  by the boot-loader before use.

		  their output to the second serial port on MSM devices.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.

	config DEBUG_MSM_UART3

		bool "Kernel low-level debugging messages via MSM UART3"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the third serial port on MSM devices.



	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 2 for low-level debug"

	config DEBUG_MSM8660_UART

		bool "Kernel low-level debugging messages via MSM 8660 UART"

		depends on ARCH_MSM8X60

		select MSM_HAS_DEBUG_UART_HS

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.

		  their output to the serial port on MSM 8660 devices.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.

	config DEBUG_MSM8960_UART

		bool "Kernel low-level debugging messages via MSM 8960 UART"

		depends on ARCH_MSM8960

		select MSM_HAS_DEBUG_UART_HS

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM 8960 devices.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"
@@ -255,42 +240,57 @@ choice 
		  their output to the standard serial port on the RealView

		  PB1176 platform.



	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the first serial port on MSM devices.

		  their output to UART 0. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_MSM_UART2

		bool "Kernel low-level debugging messages via MSM UART2"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on MSM devices.

		  their output to UART 1. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_MSM_UART3

		bool "Kernel low-level debugging messages via MSM UART3"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the third serial port on MSM devices.

		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_MSM8660_UART

		bool "Kernel low-level debugging messages via MSM 8660 UART"

		depends on ARCH_MSM8X60

		select MSM_HAS_DEBUG_UART_HS

		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_LL_UART_NONE

		bool "No low-level debugging UART"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM 8660 devices.

		  Say Y here if your platform doesn't provide a UART option

		  below. This relies on your platform choosing the right UART

		  definition internally in order for low-level debugging to

		  work.



	config DEBUG_MSM8960_UART

		bool "Kernel low-level debugging messages via MSM 8960 UART"

		depends on ARCH_MSM8960

		select MSM_HAS_DEBUG_UART_HS

	config DEBUG_ICEDCC

		bool "Kernel low-level debugging via EmbeddedICE DCC channel"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM 8960 devices.

		  their output to the EmbeddedICE macrocell's DCC channel using

		  co-processor 14. This is known to work on the ARM9 style ICE

		  channel and on the XScale with the PEEDI.



		  Note that the system will appear to hang during boot if there

		  is nothing connected to read from the DCC.



endchoice

arch/arm/include/asm/hardware/entry-macro-iomd.S

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 
/* IOC / IOMD based hardware */

#include <asm/hardware/iomd.h>



		.macro	disable_fiq

		mov	r12, #ioc_base_high

		.if	ioc_base_low

		orr	r12, r12, #ioc_base_low

		.endif

		strb	r12, [r12, #0x38]	@ Disable FIQ register

		.endm



		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

		ldrb	\irqstat, [\base, #IOMD_IRQREQB]	@ get high priority first

		ldr	\tmp, =irq_prio_h

arch/arm/include/asm/system.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ extern void cpu_init(void); 


void soft_restart(unsigned long);

extern void (*arm_pm_restart)(char str, const char *cmd);

extern void (*arm_pm_idle)(void);



#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_SYSCALL	(1 << 1)

arch/arm/kernel/entry-armv.S

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
#include <asm/glue-df.h>

#include <asm/glue-pf.h>

#include <asm/vfpmacros.h>

#ifndef CONFIG_MULTI_IRQ_HANDLER

#include <mach/entry-macro.S>

#endif

#include <asm/thread_notify.h>

#include <asm/unwind.h>

#include <asm/unistd.h>
@@ -1101,7 +1103,6 @@ __stubs_start: 
 * get out of that mode without clobbering one register.

 */

vector_fiq:

	disable_fiq

	subs	pc, lr, #4



/*=============================================================================