lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

Browse Source
This commit is contained in:
Russell King
2008-10-17 14:29:03 +01:00
committed by Russell King
parent 485bdde787 55b404fd78
commit 11cd4cb5f5
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-s3c2443/clock.c
View File

@@ -1033,8 +1033,7 @@ void __init s3c2443_init_clocks(int xtal)
fclk = pll / s3c2443_fclk_div(clkdiv0); fclk = pll / s3c2443_fclk_div(clkdiv0);
hclk = s3c2443_prediv_getrate(&clk_prediv); hclk = s3c2443_prediv_getrate(&clk_prediv);
hclk = hclk / s3c2443_get_hdiv(clkdiv0); hclk /= s3c2443_get_hdiv(clkdiv0);
hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1);
pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1);
s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);

2
arch/arm/plat-s3c24xx/pwm-clock.c
View File

@@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent)
if (parent == s3c24xx_pwmclk_tclk(id)) if (parent == s3c24xx_pwmclk_tclk(id))
bits = S3C2410_TCFG1_MUX_TCLK << shift; bits = S3C2410_TCFG1_MUX_TCLK << shift;
else if (parent == s3c24xx_pwmclk_tdiv(id)) else if (parent == s3c24xx_pwmclk_tdiv(id))
bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift;
else else
return -EINVAL; return -EINVAL;

12
arch/arm/plat-s3c24xx/pwm.c
View File

@@ -56,7 +56,7 @@ static struct clk *clk_scaler[2];
} \ } \
} }
#define DEFINE_TIMER(_tmr_no, _irq) \ #define DEFINE_S3C_TIMER(_tmr_no, _irq) \
.name = "s3c24xx-pwm", \ .name = "s3c24xx-pwm", \
.id = _tmr_no, \ .id = _tmr_no, \
.num_resources = TIMER_RESOURCE_SIZE, \ .num_resources = TIMER_RESOURCE_SIZE, \
@@ -67,11 +67,11 @@ static struct clk *clk_scaler[2];
*/ */
struct platform_device s3c_device_timer[] = { struct platform_device s3c_device_timer[] = {
[0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },
[1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },
[2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },
[3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },
[4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },
}; };
static inline int pwm_is_tdiv(struct pwm_device *pwm) static inline int pwm_is_tdiv(struct pwm_device *pwm)

2
drivers/serial/Kconfig
View File

@@ -457,7 +457,7 @@ config SERIAL_SAMSUNG
config SERIAL_SAMSUNG_DEBUG config SERIAL_SAMSUNG_DEBUG
bool "Samsung SoC serial debug" bool "Samsung SoC serial debug"
depends on SERIAL_SAMSUNG depends on SERIAL_SAMSUNG && DEBUG_LL
help help
Add support for debugging the serial driver. Since this is Add support for debugging the serial driver. Since this is
generally being used as a console, we use our own output generally being used as a console, we use our own output