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

Commit c7657846 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT 



Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT to be
CONFIG_S3C_LOWLEVEL_UART_PORT as we move to using
plat-s3c for base of S3C operations.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cbc4dbff

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -100,6 +100,6 @@ config DEBUG_S3C2410_UART 
	  initialised by the boot-loader before use.



	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C2410_LOWLEVEL_UART_PORT.

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.



endmenu

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#elif defined(CONFIG_ARCH_S3C2410)

		.macro loadsp, rb

		mov	\rb, #0x50000000

		add	\rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT

		add	\rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT

		.endm

#else

		.macro	loadsp,	rb

arch/arm/configs/s3c2410_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ CONFIG_PM_SIMTEC=y 
# CONFIG_S3C2410_BOOT_ERROR_RESET is not set

# CONFIG_S3C2410_PM_DEBUG is not set

# CONFIG_S3C2410_PM_CHECK is not set

CONFIG_S3C2410_LOWLEVEL_UART_PORT=0

CONFIG_S3C_LOWLEVEL_UART_PORT=0

CONFIG_S3C2410_DMA=y

# CONFIG_S3C2410_DMA_DEBUG is not set

CONFIG_MACH_SMDK=y

arch/arm/plat-s3c/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ config S3C2410_PM_CHECK_CHUNKSIZE 


	  See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>



config S3C2410_LOWLEVEL_UART_PORT

	int "S3C2410 UART to use for low-level messages"

config S3C_LOWLEVEL_UART_PORT

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

	depends on PLAT_S3C

	default 0

	help

include/asm-arm/arch-s3c2410/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ 
/* how many bytes we allow into the FIFO at a time in FIFO mode */

#define FIFO_MAX	 (14)



#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT)

#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C_LOWLEVEL_UART_PORT)



static __inline__ void

uart_wr(unsigned int reg, unsigned int val)