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

Commit 11cd4cb5 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents 485bdde7 55b404fd

arch/arm/mach-s3c2443/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -1033,8 +1033,7 @@ void __init s3c2443_init_clocks(int xtal) 


	fclk = pll / s3c2443_fclk_div(clkdiv0);

	hclk = s3c2443_prediv_getrate(&clk_prediv);

	hclk = hclk / s3c2443_get_hdiv(clkdiv0);

	hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1);

	hclk /= s3c2443_get_hdiv(clkdiv0);

 	pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1);



	s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);

arch/arm/plat-s3c24xx/pwm-clock.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) 
	if (parent == s3c24xx_pwmclk_tclk(id))

		bits = S3C2410_TCFG1_MUX_TCLK << shift;

	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

		return -EINVAL;

arch/arm/plat-s3c24xx/pwm.c

+6 −6
Original line number Diff line number Diff line
@@ -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",		\

	.id		= _tmr_no,			\

	.num_resources	= TIMER_RESOURCE_SIZE,		\
@@ -67,11 +67,11 @@ static struct clk *clk_scaler[2]; 
 */



struct platform_device s3c_device_timer[] = {

	[0] = { DEFINE_TIMER(0, IRQ_TIMER0) },

	[1] = { DEFINE_TIMER(1, IRQ_TIMER1) },

	[2] = { DEFINE_TIMER(2, IRQ_TIMER2) },

	[3] = { DEFINE_TIMER(3, IRQ_TIMER3) },

	[4] = { DEFINE_TIMER(4, IRQ_TIMER4) },

	[0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },

	[1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },

	[2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },

	[3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },

	[4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },

};



static inline int pwm_is_tdiv(struct pwm_device *pwm)

drivers/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ config SERIAL_SAMSUNG 


config SERIAL_SAMSUNG_DEBUG

	bool "Samsung SoC serial debug"

	depends on SERIAL_SAMSUNG

	depends on SERIAL_SAMSUNG && DEBUG_LL

	help

	  Add support for debugging the serial driver. Since this is

	  generally being used as a console, we use our own output