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

Commit 7684f784 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s3c24xx' into for-next

parents 05daf079 6436b6a7

arch/arm/mach-s3c2410/include/mach/gpio.h

+7 −3
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#ifdef CONFIG_CPU_S3C244X

#define ARCH_NR_GPIOS	(32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA)

#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)

#define ARCH_NR_GPIOS	(32 * 12 + CONFIG_S3C24XX_GPIO_EXTRA)

#else

#define ARCH_NR_GPIOS	(256 + CONFIG_S3C24XX_GPIO_EXTRA)

#endif
@@ -30,8 +32,10 @@ 
#include <mach/gpio-nrs.h>

#include <mach/gpio-fns.h>



#ifdef CONFIG_CPU_S3C24XX

#define S3C_GPIO_END	(S3C2410_GPIO_BANKJ + 32)

#ifdef CONFIG_CPU_S3C244X

#define S3C_GPIO_END	(S3C2410_GPJ(0) + 32)

#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)

#define S3C_GPIO_END	(S3C2410_GPM(0) + 32)

#else

#define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)

#define S3C_GPIO_END	(S3C2410_GPH(0) + 32)

#endif

arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 
#define S3C2443_SCLKCON_UARTCLK		(1<<8)

#define S3C2443_SCLKCON_USBHOST		(1<<1)



#define S3C2443_PWRCFG_SLEEP		(1<<15)



#include <asm/div64.h>



static inline unsigned int

arch/arm/mach-s3c2412/s3c2412.c

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <plat/clock.h>

#include <plat/pm.h>

#include <plat/pll.h>

#include <plat/nand-core.h>



#ifndef CONFIG_CPU_S3C2412_ONLY

void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
@@ -92,7 +93,7 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no) 
	/* rename devices that are s3c2412/s3c2413 specific */

	s3c_device_sdi.name  = "s3c2412-sdi";

	s3c_device_lcd.name  = "s3c2412-lcd";

	s3c_device_nand.name = "s3c2412-nand";

	s3c_nand_setname("s3c2412-nand");



	/* alter IRQ of SDI controller */

arch/arm/mach-s3c2416/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ config S3C2416_DMA 
	help

	  Internal config node for S3C2416 DMA support



config S3C2416_PM

	bool

	help

	  Internal config node to apply S3C2416 power management



menu "S3C2416 Machines"



config MACH_SMDK2416
@@ -33,6 +38,7 @@ config MACH_SMDK2416 
	select S3C_DEV_FB

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C2416_PM if PM

	help

	  Say Y here if you are using an SMDK2416

arch/arm/mach-s3c2416/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj- := 


obj-$(CONFIG_CPU_S3C2416)	+= s3c2416.o clock.o

obj-$(CONFIG_CPU_S3C2416)	+= irq.o



obj-$(CONFIG_S3C2416_PM)	+= pm.o

#obj-$(CONFIG_S3C2416_DMA)	+= dma.o



# Machine support