linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: S3C64XX: Fix clkdev device names for I2C clocks
Date: Tue, 30 Aug 2011 22:30:41 +0100	[thread overview]
Message-ID: <1314739841-13522-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)

When the S3C64xx CPUs were converted to clkdev mappings were added for the
I2C controllers on them but there's a couple of issues with these mappings:

- We're randomly using a device name for controller 1 but not controller 0
  which is odd.
- The controller type for controller 1 is s3c2440, not s3c2410 which is
  what the device is actually registered as so dev_name() based lookups
  fail.

The end result is that only controller 0 has a good mapping, though for
some reason this did used to work.

Something in recent -next appears to have triggered this but I can't for
the life of me figure out how it ever worked.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/clock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 872e683..3f2bb26 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -138,12 +138,13 @@ static struct clk init_clocks_off[] = {
 		.ctrlbit	= S3C_CLKCON_PCLK_TSADC,
 	}, {
 		.name		= "i2c",
+		.devname	= "s3c2440-i2c.0",
 		.parent		= &clk_p,
 		.enable		= s3c64xx_pclk_ctrl,
 		.ctrlbit	= S3C_CLKCON_PCLK_IIC,
 	}, {
 		.name		= "i2c",
-		.devname	= "s3c2440-i2c.1",
+		.devname	= "s3c2410-i2c.1",
 		.parent		= &clk_p,
 		.enable		= s3c64xx_pclk_ctrl,
 		.ctrlbit	= S3C6410_CLKCON_PCLK_I2C1,
-- 
1.7.5.4

             reply	other threads:[~2011-08-30 21:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-30 21:30 Mark Brown [this message]
2011-08-30 23:48 ` [PATCH] ARM: S3C64XX: Fix clkdev device names for I2C clocks Kyungmin Park
2011-08-31  0:21   ` Mark Brown
2011-08-31  8:14     ` Thomas Abraham
2011-08-31 10:25       ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314739841-13522-1-git-send-email-broonie@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).