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

Commit 0321c51f authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s5pc100' into for-next

parents e4201764 aaeedff6

arch/arm/mach-s5pc100/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ config S5PC100_SETUP_I2C1 
	help

	  Common setup code for i2c bus 1.



config S5PC100_SETUP_IDE

	bool

	help

	  Common setup code for S5PC100 IDE GPIO configurations



config S5PC100_SETUP_KEYPAD

	bool

	help

	  Common setup code for KEYPAD GPIO configurations.



config S5PC100_SETUP_SDHCI

	bool

	select S5PC100_SETUP_SDHCI_GPIO
@@ -39,14 +49,24 @@ config S5PC100_SETUP_SDHCI_GPIO 
config MACH_SMDKC100

	bool "SMDKC100"

	select CPU_S5PC100

	select SAMSUNG_DEV_ADC

	select S3C_DEV_FB

	select S3C_DEV_I2C1

	select SAMSUNG_DEV_IDE

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select SAMSUNG_DEV_KEYPAD

	select S3C_DEV_RTC

	select SAMSUNG_DEV_TS

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PC100_SETUP_FB_24BPP

	select S5PC100_SETUP_I2C1

	select S5PC100_SETUP_IDE

	select S5PC100_SETUP_KEYPAD

	select S5PC100_SETUP_SDHCI

	select HAVE_S3C_RTC

	help

	  Machine support for the Samsung SMDKC100

arch/arm/mach-s5pc100/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ obj-$(CONFIG_CPU_S5PC100) += dma.o 


obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o

obj-$(CONFIG_S5PC100_SETUP_IDE)		+= setup-ide.o

obj-$(CONFIG_S5PC100_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_S5PC100_SETUP_SDHCI)	+= setup-sdhci.o

obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

arch/arm/mach-s5pc100/clock.c

+4 −4
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static struct clk init_clocks_disable[] = { 
		.enable		= s5pc100_d1_5_ctrl,

		.ctrlbit	= (1 << 7),

	}, {

		.name		= "keyif",

		.name		= "keypad",

		.id		= -1,

		.parent		= &clk_div_d1_bus.clk,

		.enable		= s5pc100_d1_5_ctrl,
@@ -1078,7 +1078,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 0,

			.ctrlbit	= (1 << 12),

			.enable		= s5pc100_sclk1_ctrl,
@@ -1089,7 +1089,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 1,

			.ctrlbit	= (1 << 13),

			.enable		= s5pc100_sclk1_ctrl,
@@ -1100,7 +1100,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 2,

			.ctrlbit	= (1 << 14),

			.enable		= s5pc100_sclk1_ctrl,

arch/arm/mach-s5pc100/cpu.c

+5 −0
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ 
#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/ata-core.h>

#include <plat/iic-core.h>

#include <plat/sdhci.h>

#include <plat/adc-core.h>

#include <plat/onenand-core.h>



#include <plat/s5pc100.h>
@@ -87,11 +89,14 @@ void __init s5pc100_map_io(void) 
	s5pc100_default_sdhci1();

	s5pc100_default_sdhci2();



	s3c_adc_setname("s3c64xx-adc");



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");



	s3c_onenand_setname("s5pc100-onenand");

	s3c_cfcon_setname("s5pc100-pata");

}



void __init s5pc100_init_clocks(int xtal)

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define IRQ_IEMIEC		S5P_IRQ_VIC1(6)

#define IRQ_ONENAND		S5P_IRQ_VIC1(7)

#define IRQ_NFC			S5P_IRQ_VIC1(8)

#define IRQ_CFC			S5P_IRQ_VIC1(9)

#define IRQ_CFCON		S5P_IRQ_VIC1(9)

#define IRQ_UART0		S5P_IRQ_VIC1(10)

#define IRQ_UART1		S5P_IRQ_VIC1(11)

#define IRQ_UART2		S5P_IRQ_VIC1(12)