Commit f2b7e3c5 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s5p' into for-next 

Conflicts:
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c
parents 6b8eda04 0fdb480e

arch/arm/mach-s5p6440/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#define IRQ_DISPCON3		S5P_IRQ_VIC1(19)

#define IRQ_FIMGVG		S5P_IRQ_VIC1(20)

#define IRQ_EINT_GROUPS		S5P_IRQ_VIC1(21)

#define IRQ_PMUIRQ		S5P_IRQ_VIC1(23)

#define IRQ_PMU			S5P_IRQ_VIC1(23)

#define IRQ_HSMMC0		S5P_IRQ_VIC1(24)

#define IRQ_HSMMC1		S5P_IRQ_VIC1(25)

#define IRQ_HSMMC2		IRQ_SPI1	/* shared with SPI1 */

arch/arm/mach-s5p6440/include/mach/system.h

+2 −5
Original line number Diff line number Diff line
@@ -13,12 +13,9 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H __FILE__



static void arch_idle(void)

{

	/* nothing here yet */

}

#include <plat/system-reset.h>



static void arch_reset(char mode, const char *cmd)

static void arch_idle(void)

{

	/* nothing here yet */

}

arch/arm/mach-s5p6440/mach-smdk6440.c

+15 −15
Original line number Diff line number Diff line
@@ -43,16 +43,16 @@ 
#include <plat/adc.h>

#include <plat/ts.h>



#define S5P6440_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |	\

#define SMDK6440_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

				S3C2410_UCON_RXILEVEL |		\

				S3C2410_UCON_TXIRQMODE |	\

				S3C2410_UCON_RXIRQMODE |	\

				S3C2410_UCON_RXFIFO_TOI |	\

				S3C2443_UCON_RXERR_IRQEN)



#define S5P6440_ULCON_DEFAULT	S3C2410_LCON_CS8

#define SMDK6440_ULCON_DEFAULT	S3C2410_LCON_CS8



#define S5P6440_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |	\

#define SMDK6440_UFCON_DEFAULT	(S3C2410_UFCON_FIFOMODE |	\

				S3C2440_UFCON_TXTRIG16 |	\

				S3C2410_UFCON_RXTRIG8)
@@ -60,30 +60,30 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = { 
	[0] = {

		.hwport	     = 0,

		.flags	     = 0,

		.ucon	     = S5P6440_UCON_DEFAULT,

		.ulcon	     = S5P6440_ULCON_DEFAULT,

		.ufcon	     = S5P6440_UFCON_DEFAULT,

		.ucon	     = SMDK6440_UCON_DEFAULT,

		.ulcon	     = SMDK6440_ULCON_DEFAULT,

		.ufcon	     = SMDK6440_UFCON_DEFAULT,

	},

	[1] = {

		.hwport	     = 1,

		.flags	     = 0,

		.ucon	     = S5P6440_UCON_DEFAULT,

		.ulcon	     = S5P6440_ULCON_DEFAULT,

		.ufcon	     = S5P6440_UFCON_DEFAULT,

		.ucon	     = SMDK6440_UCON_DEFAULT,

		.ulcon	     = SMDK6440_ULCON_DEFAULT,

		.ufcon	     = SMDK6440_UFCON_DEFAULT,

	},

	[2] = {

		.hwport	     = 2,

		.flags	     = 0,

		.ucon	     = S5P6440_UCON_DEFAULT,

		.ulcon	     = S5P6440_ULCON_DEFAULT,

		.ufcon	     = S5P6440_UFCON_DEFAULT,

		.ucon	     = SMDK6440_UCON_DEFAULT,

		.ulcon	     = SMDK6440_ULCON_DEFAULT,

		.ufcon	     = SMDK6440_UFCON_DEFAULT,

	},

	[3] = {

		.hwport	     = 3,

		.flags	     = 0,

		.ucon	     = S5P6440_UCON_DEFAULT,

		.ulcon	     = S5P6440_ULCON_DEFAULT,

		.ufcon	     = S5P6440_UFCON_DEFAULT,

		.ucon	     = SMDK6440_UCON_DEFAULT,

		.ulcon	     = SMDK6440_ULCON_DEFAULT,

		.ufcon	     = SMDK6440_UFCON_DEFAULT,

	},

};

arch/arm/mach-s5p6442/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define IRQ_GPIOINT		S5P_IRQ_VIC0(30)



/* VIC1 */

#define IRQ_nPMUIRQ 		S5P_IRQ_VIC1(0)

#define IRQ_PMU			S5P_IRQ_VIC1(0)

#define IRQ_ONENAND 		S5P_IRQ_VIC1(7)

#define IRQ_UART0 		S5P_IRQ_VIC1(10)

#define IRQ_UART1 		S5P_IRQ_VIC1(11)

arch/arm/mach-s5p6442/include/mach/system.h

+2 −5
Original line number Diff line number Diff line
@@ -13,12 +13,9 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H __FILE__



static void arch_idle(void)

{

	/* nothing here yet */

}

#include <plat/system-reset.h>



static void arch_reset(char mode, const char *cmd)

static void arch_idle(void)

{

	/* nothing here yet */

}