diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-07-11 23:06:28 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-07-11 23:06:28 +0400 |
| commit | a95e969d0c4b86fca183b05acac78ac8236d0bd0 (patch) | |
| tree | 5745140939468e9543ff37542a6521a156912b40 /drivers/video/fbdev/omap2/vrfb.c | |
| parent | 42416e186bde04c935d5372c2af4a73ff7b1ece0 (diff) | |
| parent | 9be6cbd771d9d34ba6e9242530dd4dcc3d93338c (diff) | |
Merge branch 'be-armv7-omap' into be-armv7tracking-be_arm-ll-20140818.0tracking-be_arm-ll-20140814.0tracking-be_arm-ll-20140807.0tracking-be_arm-ll-20140725.0tracking-be_arm-ll-20140721.0tracking-be_arm-ll-20140716.0tracking-be_arm-ll-20140714.0tracking-be_arm-ll-20140711.0
Diffstat (limited to 'drivers/video/fbdev/omap2/vrfb.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/vrfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/vrfb.c b/drivers/video/fbdev/omap2/vrfb.c index f346b02eee1d..032469079bfe 100644 --- a/drivers/video/fbdev/omap2/vrfb.c +++ b/drivers/video/fbdev/omap2/vrfb.c @@ -82,17 +82,17 @@ static bool vrfb_loaded; static void omap2_sms_write_rot_control(u32 val, unsigned ctx) { - __raw_writel(val, vrfb_base + SMS_ROT_CONTROL(ctx)); + writel_relaxed(val, vrfb_base + SMS_ROT_CONTROL(ctx)); } static void omap2_sms_write_rot_size(u32 val, unsigned ctx) { - __raw_writel(val, vrfb_base + SMS_ROT_SIZE(ctx)); + writel_relaxed(val, vrfb_base + SMS_ROT_SIZE(ctx)); } static void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) { - __raw_writel(val, vrfb_base + SMS_ROT_PHYSICAL_BA(ctx)); + writel_relaxed(val, vrfb_base + SMS_ROT_PHYSICAL_BA(ctx)); } static inline void restore_hw_context(int ctx) |