Commit 6585dea1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
  arm/imx: use Kconfig choice for low-level debug UART selection
  ARM: realview: use Kconfig choice for debug UART selection
  ARM: plat-samsung: use Kconfig choice for debug UART selection
  ARM: versatile: convert logical CPU numbers to physical numbers
  ARM: ux500: convert logical CPU numbers to physical numbers
  ARM: shmobile: convert logical CPU numbers to physical numbers
  ARM: msm: convert logical CPU numbers to physical numbers
  ARM: exynos4: convert logical CPU numbers to physical numbers

Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
parents 16ee792e 97c24c1a

arch/arm/Kconfig.debug

+105 −12
Original line number Diff line number Diff line
@@ -128,6 +128,111 @@ 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_IMX1_UART

		bool "i.MX1 Debug UART"

		depends on SOC_IMX1

		help

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

		  on i.MX1.



	config DEBUG_IMX23_UART

		bool "i.MX23 Debug UART"

		depends on SOC_IMX23

		help

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

		  on i.MX23.



	config DEBUG_IMX25_UART

		bool "i.MX25 Debug UART"

		depends on SOC_IMX25

		help

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

		  on i.MX25.



	config DEBUG_IMX21_IMX27_UART

		bool "i.MX21 and i.MX27 Debug UART"

		depends on SOC_IMX21 || SOC_IMX27

		help

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

		  on i.MX21 or i.MX27.



	config DEBUG_IMX28_UART

		bool "i.MX28 Debug UART"

		depends on SOC_IMX28

		help

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

		  on i.MX28.



	config DEBUG_IMX31_IMX35_UART

		bool "i.MX31 and i.MX35 Debug UART"

		depends on SOC_IMX31 || SOC_IMX35

		help

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

		  on i.MX31 or i.MX35.



	config DEBUG_IMX51_UART

		bool "i.MX51 Debug UART"

		depends on SOC_IMX51

		help

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

		  on i.MX51.



	config DEBUG_IMX50_IMX53_UART

		bool "i.MX50 and i.MX53 Debug UART"

		depends on SOC_IMX50 || SOC_IMX53

		help

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

		  on i.MX50 or i.MX53.



	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 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.



	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 UART 1. 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.



	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 UART 2. 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.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW

		help

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

		  their output to the serial port on RealView EB, PB11MP, PBA8

		  and PBX platforms.



	config DEBUG_REALVIEW_PB1176_PORT

		bool "RealView PB1176 UART"

		depends on MACH_REALVIEW_PB1176

		help

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

		  their output to the standard serial port on the RealView

		  PB1176 platform.



endchoice



config EARLY_PRINTK
@@ -146,18 +251,6 @@ config OC_ETM 
	  buffer driver that will allow you to collect traces of the

	  kernel code.



config DEBUG_S3C_UART

	depends on PLAT_SAMSUNG

	int "S3C UART to use for low-level debug"

	default "0"

	help

	  Choice for UART for kernel low-level using S3C UARTS,

	  should be between zero and two. 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.



config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

arch/arm/mach-exynos4/hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) 
		    :

		    : "memory", "cc");



		if (pen_release == cpu) {

		if (pen_release == cpu_logical_map(cpu)) {

			/*

			 * OK, proper wakeup, we're done

			 */

arch/arm/mach-exynos4/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 
	 * Note that "pen_release" is the hardware CPU ID, whereas

	 * "cpu" is Linux's internal ID.

	 */

	write_pen_release(cpu);

	write_pen_release(cpu_logical_map(cpu));



	if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) {

		__raw_writel(S5P_CORE_LOCAL_PWR_EN,

arch/arm/mach-msm/hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static inline void platform_do_lowpower(unsigned int cpu) 
		    :

		    : "memory", "cc");



		if (pen_release == cpu) {

		if (pen_release == cpu_logical_map(cpu)) {

			/*

			 * OK, proper wakeup, we're done

			 */

arch/arm/mach-msm/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 
	 * Note that "pen_release" is the hardware CPU ID, whereas

	 * "cpu" is Linux's internal ID.

	 */

	pen_release = cpu;

	pen_release = cpu_logical_map(cpu);

	__cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release));

	outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1));

CRA Git | Maintained and supported by SUSTech CRA and CCSE