diff options
| author | Seungwon <tgih.jun@samsung.com> | 2010-08-13 17:25:29 +0900 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:42:23 -0800 |
| commit | d1b263c885b6b18a5e635b3ed496e209bec12ddd (patch) | |
| tree | a8e4fd6c0965268d2ad0c3fae28b290becf4a917 | |
| parent | 0534fb2b66258b062adc36654b6ddce94a8b6c0e (diff) | |
| download | kernel_samsung_crespo-d1b263c885b6b18a5e635b3ed496e209bec12ddd.zip kernel_samsung_crespo-d1b263c885b6b18a5e635b3ed496e209bec12ddd.tar.gz kernel_samsung_crespo-d1b263c885b6b18a5e635b3ed496e209bec12ddd.tar.bz2 | |
S5PC110: uart: add gpio configuration in MACH
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/gpio.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/init.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-s5pv210.c | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h index c0ae08b..16b38f1 100644 --- a/arch/arm/mach-s5pv210/include/mach/gpio.h +++ b/arch/arm/mach-s5pv210/include/mach/gpio.h @@ -248,5 +248,6 @@ extern int s3c_gpio_set_slewrate(unsigned int pin, unsigned int config); #define S3C_GPIO_SLEWRATE_SLOW (1) extern int s3c_gpio_slp_setpull_updown(unsigned int pin, s3c_gpio_pull_t pull); +extern int s5pv210_gpiolib_init(void); #endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-s5pv210/init.c b/arch/arm/mach-s5pv210/init.c index 6d7072b..4865ae2 100644 --- a/arch/arm/mach-s5pv210/init.c +++ b/arch/arm/mach-s5pv210/init.c @@ -20,7 +20,7 @@ static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = { [0] = { - .name = "uclk1", + .name = "pclk", .divisor = 1, .min_baud = 0, .max_baud = 0, diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index da53a29..b19b95e 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -2838,6 +2838,7 @@ static void __init herring_map_io(void) { s5p_init_io(NULL, 0, S5P_VA_CHIPID); s3c24xx_init_clocks(24000000); + s5pv210_gpiolib_init(); s3c24xx_init_uarts(herring_uartcfgs, ARRAY_SIZE(herring_uartcfgs)); #ifndef CONFIG_S5P_HIGH_RES_TIMERS s5p_set_timer_source(S5P_PWM3, S5P_PWM4); diff --git a/drivers/gpio/gpio-s5pv210.c b/drivers/gpio/gpio-s5pv210.c index dda868c..834fe62 100644 --- a/drivers/gpio/gpio-s5pv210.c +++ b/drivers/gpio/gpio-s5pv210.c @@ -619,7 +619,7 @@ int s3c_gpio_set_slewrate(unsigned int pin, unsigned int config) return 0; } -static __init int s5pv210_gpiolib_init(void) +__init int s5pv210_gpiolib_init(void) { struct s3c_gpio_chip *chip = s5pv210_gpio_4bit; int nr_chips = ARRAY_SIZE(s5pv210_gpio_4bit); @@ -640,4 +640,3 @@ static __init int s5pv210_gpiolib_init(void) return 0; } -core_initcall(s5pv210_gpiolib_init); |