diff options
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r-- | arch/arm/mach-omap2/vc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 0d1629c5f84e..a4628a9e760c 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c | |||
@@ -542,7 +542,7 @@ static void omap4_set_timings(struct voltagedomain *voltdm, bool off_mode) | |||
542 | val |= omap4_usec_to_val_scrm(tshut, OMAP4_DOWNTIME_SHIFT, | 542 | val |= omap4_usec_to_val_scrm(tshut, OMAP4_DOWNTIME_SHIFT, |
543 | OMAP4_DOWNTIME_MASK); | 543 | OMAP4_DOWNTIME_MASK); |
544 | 544 | ||
545 | __raw_writel(val, OMAP4_SCRM_CLKSETUPTIME); | 545 | writel_relaxed(val, OMAP4_SCRM_CLKSETUPTIME); |
546 | } | 546 | } |
547 | 547 | ||
548 | /* OMAP4 specific voltage init functions */ | 548 | /* OMAP4 specific voltage init functions */ |
@@ -664,7 +664,7 @@ static void __init omap4_vc_i2c_timing_init(struct voltagedomain *voltdm) | |||
664 | val = i2c_data->loadbits << 25 | i2c_data->loadbits << 29; | 664 | val = i2c_data->loadbits << 25 | i2c_data->loadbits << 29; |
665 | 665 | ||
666 | /* Write to SYSCTRL_PADCONF_WKUP_CTRL_I2C_2 to setup I2C pull */ | 666 | /* Write to SYSCTRL_PADCONF_WKUP_CTRL_I2C_2 to setup I2C pull */ |
667 | __raw_writel(val, OMAP2_L4_IO_ADDRESS(OMAP4_CTRL_MODULE_PAD_WKUP + | 667 | writel_relaxed(val, OMAP2_L4_IO_ADDRESS(OMAP4_CTRL_MODULE_PAD_WKUP + |
668 | OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_I2C_2)); | 668 | OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_I2C_2)); |
669 | 669 | ||
670 | /* HSSCLH can always be zero */ | 670 | /* HSSCLH can always be zero */ |