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/dss/dss.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/dss/dss.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c index 6daeb7ed44c6..e7d7dc36f37b 100644 --- a/drivers/video/fbdev/omap2/dss/dss.c +++ b/drivers/video/fbdev/omap2/dss/dss.c @@ -105,12 +105,12 @@ static const char * const dss_generic_clk_source_names[] = { static inline void dss_write_reg(const struct dss_reg idx, u32 val) { - __raw_writel(val, dss.base + idx.idx); + writel_relaxed(val, dss.base + idx.idx); } static inline u32 dss_read_reg(const struct dss_reg idx) { - return __raw_readl(dss.base + idx.idx); + return readl_relaxed(dss.base + idx.idx); } #define SR(reg) \ |