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

Commit c378aa27 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'next-s3c64xx' into next-s3c

parents 215ed323 c7c8f615

arch/arm/mach-s3c6400/include/mach/map.h

+2 −0
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ 
#define S3C64XX_PA_USB_HSOTG	(0x7C000000)

#define S3C64XX_PA_WATCHDOG	(0x7E004000)

#define S3C64XX_PA_SYSCON	(0x7E00F000)

#define S3C64XX_PA_AC97		(0x7F001000)

#define S3C64XX_PA_IIS0		(0x7F002000)

#define S3C64XX_PA_IIS1		(0x7F003000)

#define S3C64XX_PA_TIMER	(0x7F006000)

#define S3C64XX_PA_IIC0		(0x7F004000)

#define S3C64XX_PA_IISV4	(0x7F00D000)

#define S3C64XX_PA_IIC1		(0x7F00F000)



#define S3C64XX_PA_GPIO		(0x7F008000)

arch/arm/mach-s3c6410/mach-ncp.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct platform_device *ncp_devices[] __initdata = { 
	&s3c_device_i2c0,

};



struct map_desc ncp_iodesc[] = {};

static struct map_desc ncp_iodesc[] __initdata = {};



static void __init ncp_map_io(void)

{

arch/arm/mach-s3c6410/mach-smdk6410.c

+20 −6
Original line number Diff line number Diff line
@@ -65,16 +65,30 @@ static struct s3c2410_uartcfg smdk6410_uartcfgs[] __initdata = { 
	[0] = {

		.hwport	     = 0,

		.flags	     = 0,

		.ucon	     = 0x3c5,

		.ulcon	     = 0x03,

		.ufcon	     = 0x51,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

	},

	[1] = {

		.hwport	     = 1,

		.flags	     = 0,

		.ucon	     = 0x3c5,

		.ulcon	     = 0x03,

		.ufcon	     = 0x51,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

	},

	[2] = {

		.hwport	     = 2,

		.flags	     = 0,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

	},

	[3] = {

		.hwport	     = 3,

		.flags	     = 0,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

	},

};