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

Commit 8d685b7f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and... 

Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'msm/misc' into next/cleanup
parents 1e81799b 2b222a29

arch/arm/Kconfig.debug

+37 −0
Original line number Diff line number Diff line
@@ -255,6 +255,43 @@ 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

		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.



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



	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.



endchoice



config EARLY_PRINTK

arch/arm/mach-msm/Kconfig

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

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS



config ARCH_MSM7X30

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

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS



config ARCH_QSD8X50

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

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS



config ARCH_MSM8X60

	bool "MSM8X60"
@@ -63,6 +60,9 @@ config ARCH_MSM8960 


endchoice



config MSM_HAS_DEBUG_UART_HS

	bool



config MSM_SOC_REV_A

	bool

config  ARCH_MSM_SCORPIONMP
@@ -73,9 +73,6 @@ config ARCH_MSM_ARM11 
config  ARCH_MSM_SCORPION

	bool



config HAS_MSM_DEBUG_UART_PHYS

	bool



config  MSM_VIC

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


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

	bool

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

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

/*

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.

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

 *

 * This software is licensed under the terms of the GNU General Public
@@ -14,40 +15,52 @@ 
 *

 */







#include <mach/hardware.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

#ifdef MSM_DEBUG_UART_PHYS

	ldr	\rp, =MSM_DEBUG_UART_PHYS

	ldr	\rv, =MSM_DEBUG_UART_BASE

#endif

	.endm



	.macro	senduart, rd, rx

#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS

	@ Write the 1 character to UARTDM_TF

	str	\rd, [\rx, #0x70]

#else

	teq	\rx, #0

	strne	\rd, [\rx, #0x0C]

#endif

	.endm



	.macro	waituart, rd, rx

#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS

	@ check for TX_EMT in UARTDM_SR

	ldr	\rd, [\rx, #0x08]

	tst	\rd, #0x08

	bne	1002f

	@ wait for TXREADY in UARTDM_ISR

1001:	ldr	\rd, [\rx, #0x14]

	tst	\rd, #0x80

	beq 	1001b

1002:

	@ Clear TX_READY by writing to the UARTDM_CR register

	mov	\rd, #0x300

	str	\rd, [\rx, #0x10]

	@ Write 0x1 to NCF register

	mov 	\rd, #0x1

	str	\rd, [\rx, #0x40]

	@ UARTDM reg. Read to induce delay

	ldr	\rd, [\rx, #0x08]

#else

	@ wait for TX_READY

1001:	ldr	\rd, [\rx, #0x08]

	tst	\rd, #0x04

	beq	1001b

	.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

	.endm



	.macro	busyuart, rd, rx

	.endm

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

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

#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_SIZE         SZ_4K

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

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

#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_PHYS	      0xAA500000

#define MSM_MDC_SIZE	      SZ_1M