From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [RFC 16/23] ASoC: omap: mcbsp, mcpdm, dmic: raw read and write endian fix Date: Mon, 18 Nov 2013 12:30:42 +0200 Message-ID: <5289EC52.2060803@ti.com> References: <1384560086-11994-1-git-send-email-taras.kondratiuk@linaro.org> <1384560086-11994-17-git-send-email-taras.kondratiuk@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1384560086-11994-17-git-send-email-taras.kondratiuk@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Taras Kondratiuk , linux-omap@vger.kernel.org Cc: alsa-devel@alsa-project.org, Victor Kamensky , Takashi Iwai , linux-kernel@vger.kernel.org, Liam Girdwood , Mark Brown , linaro-networking@linaro.org, Jarkko Nikula List-Id: linux-omap@vger.kernel.org On 11/16/2013 02:01 AM, Taras Kondratiuk wrote: > From: Victor Kamensky > = > All OMAP IP blocks expect LE data, but CPU may operate in BE mode. > Need to use endian neutral functions to read/write h/w registers. > I.e instead of __raw_read[lw] and __raw_write[lw] functions code > need to use read[lw]_relaxed and write[lw]_relaxed functions. > If the first simply reads/writes register, the second will byteswap > it if host operates in BE mode. > = > Changes are trivial sed like replacement of __raw_xxx functions > with xxx_relaxed variant. > = > Signed-off-by: Victor Kamensky > Signed-off-by: Taras Kondratiuk Acked-by: Peter Ujfalusi > --- > sound/soc/omap/mcbsp.c | 12 ++++++------ > sound/soc/omap/omap-dmic.c | 4 ++-- > sound/soc/omap/omap-mcpdm.c | 4 ++-- > 3 files changed, 10 insertions(+), 10 deletions(-) > = > diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c > index 83433fd..86c7538 100644 > --- a/sound/soc/omap/mcbsp.c > +++ b/sound/soc/omap/mcbsp.c > @@ -36,10 +36,10 @@ static void omap_mcbsp_write(struct omap_mcbsp *mcbsp= , u16 reg, u32 val) > = > if (mcbsp->pdata->reg_size =3D=3D 2) { > ((u16 *)mcbsp->reg_cache)[reg] =3D (u16)val; > - __raw_writew((u16)val, addr); > + writew_relaxed((u16)val, addr); > } else { > ((u32 *)mcbsp->reg_cache)[reg] =3D val; > - __raw_writel(val, addr); > + writel_relaxed(val, addr); > } > } > = > @@ -48,22 +48,22 @@ static int omap_mcbsp_read(struct omap_mcbsp *mcbsp, = u16 reg, bool from_cache) > void __iomem *addr =3D mcbsp->io_base + reg * mcbsp->pdata->reg_step; > = > if (mcbsp->pdata->reg_size =3D=3D 2) { > - return !from_cache ? __raw_readw(addr) : > + return !from_cache ? readw_relaxed(addr) : > ((u16 *)mcbsp->reg_cache)[reg]; > } else { > - return !from_cache ? __raw_readl(addr) : > + return !from_cache ? readl_relaxed(addr) : > ((u32 *)mcbsp->reg_cache)[reg]; > } > } > = > static void omap_mcbsp_st_write(struct omap_mcbsp *mcbsp, u16 reg, u32 v= al) > { > - __raw_writel(val, mcbsp->st_data->io_base_st + reg); > + writel_relaxed(val, mcbsp->st_data->io_base_st + reg); > } > = > static int omap_mcbsp_st_read(struct omap_mcbsp *mcbsp, u16 reg) > { > - return __raw_readl(mcbsp->st_data->io_base_st + reg); > + return readl_relaxed(mcbsp->st_data->io_base_st + reg); > } > = > #define MCBSP_READ(mcbsp, reg) \ > diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c > index 12e566b..1bd531d 100644 > --- a/sound/soc/omap/omap-dmic.c > +++ b/sound/soc/omap/omap-dmic.c > @@ -61,12 +61,12 @@ struct omap_dmic { > = > static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 = val) > { > - __raw_writel(val, dmic->io_base + reg); > + writel_relaxed(val, dmic->io_base + reg); > } > = > static inline int omap_dmic_read(struct omap_dmic *dmic, u16 reg) > { > - return __raw_readl(dmic->io_base + reg); > + return readl_relaxed(dmic->io_base + reg); > } > = > static inline void omap_dmic_start(struct omap_dmic *dmic) > diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c > index 90d2a7c..653ba1c 100644 > --- a/sound/soc/omap/omap-mcpdm.c > +++ b/sound/soc/omap/omap-mcpdm.c > @@ -74,12 +74,12 @@ struct omap_mcpdm { > = > static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u= 32 val) > { > - __raw_writel(val, mcpdm->io_base + reg); > + writel_relaxed(val, mcpdm->io_base + reg); > } > = > static inline int omap_mcpdm_read(struct omap_mcpdm *mcpdm, u16 reg) > { > - return __raw_readl(mcpdm->io_base + reg); > + return readl_relaxed(mcpdm->io_base + reg); > } > = > #ifdef DEBUG > = -- = P=E9ter