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

Commit 5d3a2199 authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

ARM: S3C6410: Use device names for both I2C clocks 



When the S3C64xx CPUs were converted to clkdev mappings were added for the
I2C controllers on them. On S3C6410 a device name is specified for I2C
controller 1 but not for controller 0 which makes the code less robust as
we'll falsely return the clock for controller 0 if there's an error in the
request for controller 1.

Improve things by registering a device name for controller 0 as well. Due
to the fact that we change the numbering for controller 0 depending on if
we've registered controller 1 this requires an ifdef to choose the name.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b7c9705c

arch/arm/mach-s3c64xx/clock.c

+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= S3C_CLKCON_PCLK_TSADC,

	}, {

		.name		= "i2c",

#ifdef CONFIG_S3C_DEV_I2C1

		.devname        = "s3c2440-i2c.0",

#else

		.devname	= "s3c2440-i2c",

#endif

		.parent		= &clk_p,

		.enable		= s3c64xx_pclk_ctrl,

		.ctrlbit	= S3C_CLKCON_PCLK_IIC,