From mboxrd@z Thu Jan 1 00:00:00 1970 From: broonie@opensource.wolfsonmicro.com (Mark Brown) Date: Tue, 30 Aug 2011 22:30:41 +0100 Subject: [PATCH] ARM: S3C64XX: Fix clkdev device names for I2C clocks Message-ID: <1314739841-13522-1-git-send-email-broonie@opensource.wolfsonmicro.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- 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