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/usb/host/ehci-omap.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/usb/host/ehci-omap.c')
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index a24720beb39d..f5870aa626ef 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -73,12 +73,12 @@ struct omap_hcd { static inline void ehci_write(void __iomem *base, u32 reg, u32 val) { - __raw_writel(val, base + reg); + writel_relaxed(val, base + reg); } static inline u32 ehci_read(void __iomem *base, u32 reg) { - return __raw_readl(base + reg); + return readl_relaxed(base + reg); } /* configure so an HC device and id are always provided */ |