On 09 Oct 01, balajitk@xxxxxx wrote:
> From: Balaji T K <balajitk@xxxxxx>
>
> This patch renames function names like twl4030_i2c_write_u8,
> twl4030_i2c_read_u8 to twl_i2c_write_u8, twl_i2c_read_u8.
> I2C address for modules(MADC, Battery Charger, Audio, RTC)
> have changed between 4030 and 6030. Base address of these module register also
> changed. Thus twl4030_map will be different for twl4030 and twl6030.
>
> Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
> Signed-off-by: Balaji T K <balajitk@xxxxxx>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
> Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
> ---
<lots of snipping>
> @@ -652,9 +661,9 @@ static inline int __init unprotect_pm_master(void)
> {
> int e = 0;
>
> - e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_UNLOCK1,
> + e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK1,
> R_PROTECT_KEY);
> - e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_UNLOCK2,
> + e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK2,
> R_PROTECT_KEY);
> return e;
> }
We should fix this code to return an error immediately, instead of OR'ing the
return values. Perhaps as a separate patch.
> @@ -673,7 +682,7 @@ static void clocks_init(struct device *dev)
> osc = clk_get(dev, "osc_sys_ck");
>
> if (IS_ERR(osc)) {
> - printk(KERN_WARNING "Skipping twl4030 internal clock init and "
> + printk(KERN_WARNING "Skipping twl internal clock init and "
> "using bootloader value (unknown osc rate)\n");
> return;
> }
> @@ -687,7 +696,7 @@ static void clocks_init(struct device *dev)
> */
> osc = ERR_PTR(-EIO);
>
> - printk(KERN_WARNING "Skipping twl4030 internal clock init and "
> + printk(KERN_WARNING "Skipping twl internal clock init and "
> "using bootloader value (unknown osc rate)\n");
>
> return;
> @@ -708,7 +717,7 @@ static void clocks_init(struct device *dev)
> ctrl |= HIGH_PERF_SQ;
> e |= unprotect_pm_master();
> /* effect->MADC+USB ck en */
> - e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
> + e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
> e |= protect_pm_master();
And here.
Regards,
Amit
--
-------------------------------------------------------------------------
Amit Kucheria, Kernel Developer, Verdurent
-------------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
