OMAP2: I2C: Use clock id
Subsystems (7)
PATCH 1/1 OMAP2: I2C: Use clock id
Tony,
Attached patch uses clock id for I2C clocks on OMAP2. Tested with H4.
Signed-off-by Komal Shah <[email protected]>
---Komal Shah
http://komalshah.blogspot.com/
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
arch/arm/mach-omap2/clock.h +8 -4
@@ -1698,7 +1698,8 @@ static struct clk hdq_fck = { };static struct clk i2c2_ick = { - .name ="i2c2_ick" , + .name ="i2c_ick" , + .id =2 , .parent = &l4_ck, .flags =CLOCK_IN_OMAP242X |CLOCK_IN_OMAP243X , .enable_reg = (void __iomem *)&CM_ICLKEN1_CORE ,
@@ -1707,7 +1708,8 @@ static struct clk i2c2_ick = { };static struct clk i2c2_fck = { - .name ="i2c2_fck" , + .name ="i2c_fck" , + .id =2 , .parent = &func_12m_ck, .flags =CLOCK_IN_OMAP242X |CLOCK_IN_OMAP243X , .enable_reg = (void __iomem *)&CM_FCLKEN1_CORE ,
@@ -1725,7 +1727,8 @@ static struct clk i2chs2_fck = { };static struct clk i2c1_ick = { - .name ="i2c1_ick" , + .name ="i2c_ick" , + .id =1 , .parent = &l4_ck, .flags =CLOCK_IN_OMAP242X |CLOCK_IN_OMAP243X , .enable_reg = (void __iomem *)&CM_ICLKEN1_CORE ,
@@ -1734,7 +1737,8 @@ static struct clk i2c1_ick = { };static struct clk i2c1_fck = { - .name ="i2c1_fck" , + .name ="i2c_fck" , + .id =1 , .parent = &func_12m_ck, .flags =CLOCK_IN_OMAP242X |CLOCK_IN_OMAP243X , .enable_reg = (void __iomem *)&CM_FCLKEN1_CORE ,
drivers/i2c/busses/i2c-omap.c +5 -7
@@ -162,19 +162,17 @@ static inline u16 omap_i2c_read_reg(stru }#ifdef CONFIG_ARCH_OMAP24XX -static int omap_i2c_get_clocks (struct omap_i2c_dev *dev,int bus) +static int omap_i2c_get_clocks (struct omap_i2c_dev *dev) {if (!cpu_is_omap24xx ())return 0 ; - dev->iclk =clk_get (NULL , - bus ==1 ?"i2c1_ick" :"i2c2_ick" ); + dev->iclk =clk_get (dev->dev,"i2c_ick" );if (IS_ERR (dev->iclk)) {return -ENODEV ; } - dev->fclk =clk_get (NULL , - bus ==1 ?"i2c1_fck" :"i2c2_fck" ); + dev->fclk =clk_get (dev->dev,"i2c_fck" );if (IS_ERR (dev->fclk)) {clk_put (dev->fclk);return -ENODEV ;
@@ -202,7 +200,7 @@ static void omap_i2c_disable_clocks(stru }#else -#define omap_i2c_get_clocks (x, y) 0 +#define omap_i2c_get_clocks (x) 0#define omap_i2c_enable_clocks (x) do {} while (0)#define omap_i2c_disable_clocks (x) do {} while (0)#define omap_i2c_put_clocks (x) do {} while (0)
@@ -619,7 +617,7 @@ omap_i2c_probe(struct platform_device *p dev->base = (void __iomem *)IO_ADDRESS (mem->start);platform_set_drvdata (pdev, dev); -if ((r =omap_i2c_get_clocks (dev, pdev->id)) !=0 ) +if ((r =omap_i2c_get_clocks (dev)) !=0 ) goto do_free_mem;omap_i2c_enable_clocks (dev);
Tony Lindgren
maintainerQuoted 3 lines · Komal Shah
Tony,
Attached patch uses clock id for I2C clocks on OMAP2. Tested with H4.
Thanks, pushing today.
Tony