Commit 650e3f0d authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice 



Now that DEBUG_LL is a choice we can move MSM's homegrown choice
menu to DEBUG_LL.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 1ea6b8f4

arch/arm/Kconfig.debug

+21 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,27 @@ choice 
		  their output to the standard serial port on the RealView

		  their output to the standard serial port on the RealView

		  PB1176 platform.

		  PB1176 platform.





	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 the first serial port on MSM devices.



	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 the second serial port on MSM devices.



	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.



endchoice

endchoice





config EARLY_PRINTK

config EARLY_PRINTK

arch/arm/mach-msm/Kconfig

+0 −32
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ config ARCH_MSM7X00A 
	select CPU_V6

	select CPU_V6

	select GPIO_MSM_V1

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS





config ARCH_MSM7X30

config ARCH_MSM7X30

	bool "MSM7x30"

	bool "MSM7x30"
@@ -25,7 +24,6 @@ config ARCH_MSM7X30 
	select MSM_GPIOMUX

	select MSM_GPIOMUX

	select GPIO_MSM_V1

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS





config ARCH_QSD8X50

config ARCH_QSD8X50

	bool "QSD8X50"

	bool "QSD8X50"
@@ -37,7 +35,6 @@ config ARCH_QSD8X50 
	select MSM_GPIOMUX

	select MSM_GPIOMUX

	select GPIO_MSM_V1

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS





config ARCH_MSM8X60

config ARCH_MSM8X60

	bool "MSM8X60"

	bool "MSM8X60"
@@ -73,9 +70,6 @@ config ARCH_MSM_ARM11 
config  ARCH_MSM_SCORPION

config  ARCH_MSM_SCORPION

	bool

	bool





config HAS_MSM_DEBUG_UART_PHYS

	bool



config  MSM_VIC

config  MSM_VIC

	bool

	bool
@@ -152,32 +146,6 @@ config MACH_MSM8960_RUMI3 




endmenu

endmenu





config MSM_DEBUG_UART

	int

	default 1 if MSM_DEBUG_UART1

	default 2 if MSM_DEBUG_UART2

	default 3 if MSM_DEBUG_UART3



if HAS_MSM_DEBUG_UART_PHYS

choice

	prompt "Debug UART"



	default MSM_DEBUG_UART_NONE



	config MSM_DEBUG_UART_NONE

		bool "None"



	config MSM_DEBUG_UART1

		bool "UART1"



	config MSM_DEBUG_UART2

		bool "UART2"



	config MSM_DEBUG_UART3

		bool "UART3"

endchoice

endif



config MSM_SMD_PKG3

config MSM_SMD_PKG3

	bool

	bool

arch/arm/mach-msm/include/mach/debug-macro.S

+3 −16
Original line number Original line Diff line number Diff line 
/* arch/arm/mach-msm7200/include/mach/debug-macro.S

/*

 *

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (C) 2007 Google, Inc.

 * Author: Brian Swetland <swetland@google.com>

 * Author: Brian Swetland <swetland@google.com>
@@ -14,15 +14,14 @@ 
 *

 *

 */

 */









#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/msm_iomap.h>

#include <mach/msm_iomap.h>





#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)

	.macro	addruart, rp, rv, tmp

	.macro	addruart, rp, rv, tmp

#ifdef MSM_DEBUG_UART_PHYS

	ldr	\rp, =MSM_DEBUG_UART_PHYS

	ldr	\rp, =MSM_DEBUG_UART_PHYS

	ldr	\rv, =MSM_DEBUG_UART_BASE

	ldr	\rv, =MSM_DEBUG_UART_BASE

#endif

	.endm

	.endm





	.macro	senduart,rd,rx

	.macro	senduart,rd,rx
@@ -36,18 +35,6 @@ 
	tst	\rd, #0x04

	tst	\rd, #0x04

	beq	1001b

	beq	1001b

	.endm

	.endm

#else

	.macro  addruart, rp, rv, tmp

	mov	\rv, #0xff000000

	orr	\rv, \rv, #0x00f00000

	.endm



	.macro	senduart,rd,rx

	.endm



	.macro	waituart,rd,rx

	.endm

#endif





	.macro	busyuart,rd,rx

	.macro	busyuart,rd,rx

	.endm
 
	.endm

arch/arm/mach-msm/include/mach/msm_iomap-7x00.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -78,18 +78,6 @@ 
#define MSM_UART3_PHYS        0xA9C00000

#define MSM_UART3_PHYS        0xA9C00000

#define MSM_UART3_SIZE        SZ_4K

#define MSM_UART3_SIZE        SZ_4K





#ifdef CONFIG_MSM_DEBUG_UART

#define MSM_DEBUG_UART_BASE   0xE1000000

#if CONFIG_MSM_DEBUG_UART == 1

#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS

#elif CONFIG_MSM_DEBUG_UART == 2

#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS

#elif CONFIG_MSM_DEBUG_UART == 3

#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS

#endif

#define MSM_DEBUG_UART_SIZE   SZ_4K

#endif



#define MSM_SDC1_PHYS         0xA0400000

#define MSM_SDC1_PHYS         0xA0400000

#define MSM_SDC1_SIZE         SZ_4K

#define MSM_SDC1_SIZE         SZ_4K

arch/arm/mach-msm/include/mach/msm_iomap-7x30.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -89,18 +89,6 @@ 
#define MSM_UART3_PHYS        0xACC00000

#define MSM_UART3_PHYS        0xACC00000

#define MSM_UART3_SIZE        SZ_4K

#define MSM_UART3_SIZE        SZ_4K





#ifdef CONFIG_MSM_DEBUG_UART

#define MSM_DEBUG_UART_BASE   0xE1000000

#if CONFIG_MSM_DEBUG_UART == 1

#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS

#elif CONFIG_MSM_DEBUG_UART == 2

#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS

#elif CONFIG_MSM_DEBUG_UART == 3

#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS

#endif

#define MSM_DEBUG_UART_SIZE   SZ_4K

#endif



#define MSM_MDC_BASE	      IOMEM(0xE0200000)

#define MSM_MDC_BASE	      IOMEM(0xE0200000)

#define MSM_MDC_PHYS	      0xAA500000

#define MSM_MDC_PHYS	      0xAA500000

#define MSM_MDC_SIZE	      SZ_1M

#define MSM_MDC_SIZE	      SZ_1M