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

Commit 46491c94 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON 



Patch from Ben Dooks

The current S3C2412 support has moved to using
S3C24XX_DCLKCON unless the specific DCLKCON is
required (S3C2412_DCLKCON or S3C2410_DKCLKCON)

Move the few places using S3C2410_DCLKCON to
S3C24XX_DCLKCON

Depends on Patch #3635/1

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 73e55cb3

arch/arm/mach-s3c2410/clock.c

+4 −4
Original line number Diff line number Diff line
@@ -268,14 +268,14 @@ struct clk clk_usb_bus = { 


static int s3c24xx_dclk_enable(struct clk *clk, int enable)

{

	unsigned long dclkcon = __raw_readl(S3C2410_DCLKCON);

	unsigned long dclkcon = __raw_readl(S3C24XX_DCLKCON);



	if (enable)

		dclkcon |= clk->ctrlbit;

	else

		dclkcon &= ~clk->ctrlbit;



	__raw_writel(dclkcon, S3C2410_DCLKCON);

	__raw_writel(dclkcon, S3C24XX_DCLKCON);



	return 0;

}
@@ -294,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) 


	clk->parent = parent;



	dclkcon = __raw_readl(S3C2410_DCLKCON);

	dclkcon = __raw_readl(S3C24XX_DCLKCON);



	if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) {

		if (uclk)
@@ -308,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) 
			dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK;

	}



	__raw_writel(dclkcon, S3C2410_DCLKCON);

	__raw_writel(dclkcon, S3C24XX_DCLKCON);



	return 0;

}