Commit ad264679 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

omap: get rid of a useless cast

That cast was annyoing for quite a while. Now
omap_ctrl_base_get() returns void __iomem *
and __raw_read/write friends uses void __iomem *
so there's no need for casting.
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0134605b
...@@ -128,7 +128,8 @@ static int __init msecure_init(void) ...@@ -128,7 +128,8 @@ static int __init msecure_init(void)
/* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */ /* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */
if (omap_type() == OMAP2_DEVICE_TYPE_GP && if (omap_type() == OMAP2_DEVICE_TYPE_GP &&
system_rev < OMAP3430_REV_ES2_0) { system_rev < OMAP3430_REV_ES2_0) {
u32 msecure_pad_config_reg = omap_ctrl_base_get() + 0xA3C; void __iomem *msecure_pad_config_reg = omap_ctrl_base_get() +
0xA3C;
int mux_mask = 0x04; int mux_mask = 0x04;
u16 tmp; u16 tmp;
...@@ -143,10 +144,10 @@ static int __init msecure_init(void) ...@@ -143,10 +144,10 @@ static int __init msecure_init(void)
* is low. Make msecure line high in order to change the * is low. Make msecure line high in order to change the
* TWL4030 RTC time and calender registers. * TWL4030 RTC time and calender registers.
*/ */
tmp = omap_readw(msecure_pad_config_reg); tmp = __raw_readw(msecure_pad_config_reg);
tmp &= 0xF8; /* To enable mux mode 03/04 = GPIO_RTC */ tmp &= 0xF8; /* To enable mux mode 03/04 = GPIO_RTC */
tmp |= mux_mask;/* To enable mux mode 03/04 = GPIO_RTC */ tmp |= mux_mask;/* To enable mux mode 03/04 = GPIO_RTC */
omap_writew(tmp, msecure_pad_config_reg); __raw_writew(tmp, msecure_pad_config_reg);
gpio_direction_output(TWL4030_MSECURE_GPIO, 1); gpio_direction_output(TWL4030_MSECURE_GPIO, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment