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

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

Merge branch 'next-s5p6442' into for-next

parents 2c97886d b46de63d

arch/arm/mach-s5p6442/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ config CPU_S5P6442 
config MACH_SMDK6442

	bool "SMDK6442"

	select CPU_S5P6442

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	  Machine support for Samsung SMDK6442

arch/arm/mach-s5p6442/clock.c

+6 −0
Original line number Diff line number Diff line
@@ -360,6 +360,12 @@ static struct clk init_clocks[] = { 
		.parent		= &clk_pclkd1,

		.enable		= s5p6442_clk_ip3_ctrl,

		.ctrlbit	= (1<<19),

	}, {

		.name		= "watchdog",

		.id		= -1,

		.parent		= &clk_pclkd1,

		.enable		= s5p6442_clk_ip3_ctrl,

		.ctrlbit	= (1 << 22),

	}, {

		.name		= "timers",

		.id		= -1,

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

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 


#define S5P6442_PA_SYSTIMER   	(0xEA100000)



#define S5P6442_PA_WATCHDOG	(0xEA200000)



#define S5P6442_PA_UART		(0xEC000000)



#define S5P_PA_UART0		(S5P6442_PA_UART + 0x0)
@@ -65,6 +67,7 @@ 
#define S5P6442_PA_PCM1		0xF2500000



/* compatibiltiy defines. */

#define S3C_PA_WDT		S5P6442_PA_WATCHDOG

#define S3C_PA_UART		S5P6442_PA_UART

#define S3C_PA_IIC		S5P6442_PA_IIC0

arch/arm/mach-s5p6442/mach-smdk6442.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = { 


static struct platform_device *smdk6442_devices[] __initdata = {

	&s5p6442_device_iis0,

	&s3c_device_wdt,

};



static void __init smdk6442_map_io(void)