Skip to contentSkip to conversation

ARM: s3c2440: fix AC97 and camera clock registration

PATCH New Fabian Godehardt 2 participants 3 messages Nov 17, 2010 – Nov 29, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: s3c2440: fix AC97 and camera clock registration

This patch fixes 2 problems:
- it sets the correct bitmask of the AC97 flag on the control-bit field
- it increases the usage counter of both clocks because they get decreased on clock registration (a few lines later)

Maybe it is a better idea to check the usage counter on clk_disable() so it can not reach values <0.

---
 arch/arm/mach-s3c2440/clock.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/mach-s3c2440/clock.c +3 -1
index 3dc2426..0fc8461 100644
@@ -93,6 +93,7 @@ static struct clk s3c2440_clk_cam = {
 	.id		= -1,
 	.enable		= s3c2410_clkcon_enable,
 	.ctrlbit	= S3C2440_CLKCON_CAMERA,
+	.usage		= 1,
 };
 
 static struct clk s3c2440_clk_cam_upll = {
@@ -108,7 +109,8 @@ static struct clk s3c2440_clk_ac97 = {
 	.name		= "ac97",
 	.id		= -1,
 	.enable		= s3c2410_clkcon_enable,
-	.ctrlbit	= S3C2440_CLKCON_CAMERA,
+	.ctrlbit	= S3C2440_CLKCON_AC97,
+	.usage		= 1,
 };
 
 static int s3c2440_clk_add(struct sys_device *sysdev)
Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 1/1 ARM: s3c2440: fix AC97 and camera clock registration

Quoted 4 lines · Fabian Godehardt

This patch fixes 2 problems:
- it sets the correct bitmask of the AC97 flag on the control-bit field
- it increases the usage counter of both clocks because they get

decreased

Quoted 23 lines

on clock registration (a few lines later)

Maybe it is a better idea to check the usage counter on clk_disable() so it can not reach values <0.

---
 arch/arm/mach-s3c2440/clock.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/mach-s3c2440/clock.c +1 -0
index 3dc2426..0fc8461 100644
@@ -93,6 +93,7 @@ static struct clk s3c2440_clk_cam = {
 	.id		= -1,
 	.enable		= s3c2410_clkcon_enable,
 	.ctrlbit	= S3C2440_CLKCON_CAMERA,
+	.usage		= 1,
 };
 
 static struct clk s3c2440_clk_cam_upll = {

arch/arm/mach-s3c2440/clock.c static struct clk s3c2440_clk_ac97 = { · line 112

Quoted 5 lines
arch/arm/mach-s3c2440/clock.c +1 -1
@@ -108,7 +109,8 @@ static struct clk s3c2440_clk_ac97 = {
 	.name		= "ac97",
 	.id		= -1,
 	.enable		= s3c2410_clkcon_enable,
-	.ctrlbit	= S3C2440_CLKCON_CAMERA,
+	.ctrlbit	= S3C2440_CLKCON_AC97,

Ok.

Quoted 6 lines
arch/arm/mach-s3c2440/clock.c +1 -1
+	.usage		= 1,
 };
 
 static int s3c2440_clk_add(struct sys_device *sysdev)
--

1.6.6.1

How about following for fix usage field?

arch/arm/mach-s3c2440/clock.c +5 -1
index 3dc2426..2f393cb 100644
@@ -108,11 +108,12 @@ static struct clk s3c2440_clk_ac97 = {
        .name           = "ac97",
        .id             = -1,
        .enable         = s3c2410_clkcon_enable,
-       .ctrlbit        = S3C2440_CLKCON_CAMERA,
+       .ctrlbit        = S3C2440_CLKCON_AC97,
 };
 
 static int s3c2440_clk_add(struct sys_device *sysdev)
 {
+       unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);
        struct clk *clock_upll;
        struct clk *clock_h;
        struct clk *clock_p;
@@ -130,6 +131,9 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
        s3c2440_clk_ac97.parent = clock_p;
        s3c2440_clk_cam_upll.parent = clock_upll;
 
+       s3c2440_clk_cam.usage = clkcon & s3c2440_clk_cam.ctrlbit ? 1 : 0;
+       s3c2440_clk_ac97.usage = clkcon & s3c2440_clk_ac97.ctrlbit ? 1 : 0;
+
        s3c24xx_register_clock(&s3c2440_clk_ac97);
        s3c24xx_register_clock(&s3c2440_clk_cam);
        s3c24xx_register_clock(&s3c2440_clk_cam_upll);

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#2 lore raw

PATCH 1/1 ARM: s3c2440: fix AC97 and camera clock registration

Hi,

Quoted 7 lines

How about following for fix usage field?

arch/arm/mach-s3c2440/clock.c +0 -0
index 3dc2426..2f393cb 100644

arch/arm/mach-s3c2440/clock.c static struct clk s3c2440_clk_ac97 = { · line 116

Quoted 10 lines
arch/arm/mach-s3c2440/clock.c +2 -1
@@ -108,11 +108,12 @@ static struct clk s3c2440_clk_ac97 = {
        .name           = "ac97",
        .id             = -1,
        .enable         = s3c2410_clkcon_enable,
-       .ctrlbit        = S3C2440_CLKCON_CAMERA,
+       .ctrlbit        = S3C2440_CLKCON_AC97,
 };
 
 static int s3c2440_clk_add(struct sys_device *sysdev)
 {
+       unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);

Yes, you are right. The clocks should be checked :).

Quoted 5 lines
arch/arm/mach-s3c2440/clock.c +0 -0
        struct clk *clock_upll;
        struct clk *clock_h;
        struct clk *clock_p;

arch/arm/mach-s3c2440/clock.c static int s3c2440_clk_add(struct sys_device *sysdev) · line 139

Quoted 9 lines
arch/arm/mach-s3c2440/clock.c +3 -0
@@ -130,6 +131,9 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
        s3c2440_clk_ac97.parent = clock_p;
        s3c2440_clk_cam_upll.parent = clock_upll;
 
+       s3c2440_clk_cam.usage = clkcon & s3c2440_clk_cam.ctrlbit ? 1 : 0;
+       s3c2440_clk_ac97.usage = clkcon & s3c2440_clk_ac97.ctrlbit ? 1 : 0;
+
        s3c24xx_register_clock(&s3c2440_clk_ac97);
        s3c24xx_register_clock(&s3c2440_clk_cam);
        s3c24xx_register_clock(&s3c2440_clk_cam_upll);

But in the following lines the clocks are disabled again. So if the usage was set to '0' on the check above, we get '-1' again.
I would prefer to use your code and additionally do the check again before the clocks are disabled. Something like this:

- clk_disable(&s3c2440_clk_ac97);
- clk_disable(&s3c2440_clk_cam);
+ if (s3c2440_clk_ac97.usage)
+ clk_disable(&s3c2440_clk_ac97);
+
+ if (s3c2440_clk_cam.usage)
+ clk_disable(&s3c2440_clk_cam);

Mit freundlichen Gr??en/With kind regards

Fabian Godehardt

Signature · 6 lines
Dipl.-Ing. (FH) Fabian Godehardt, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax -11, Bahnhofsallee 1b, 37081 G?ttingen, Germany
Sitz der Gesellschaft: G?ttingen, Amtsgericht G?ttingen HR B 3160
Gesch?ftsf?hrer: Dr. Uwe Kracke, Ust-IdNr.: DE 205 198 055

emlix - your embedded linux partner