summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2019-05-23 17:39:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-05-24 08:16:01 +0200
commit9a307e8da54d34e328d7face138bd096e99bb746 (patch)
treed864efa41325b6a851144efaf0a65a99df874b84 /drivers/pinctrl
parentca3077068c561fbffd08a2665b3247be37eee06a (diff)
downloadbarebox-9a307e8da54d34e328d7face138bd096e99bb746.tar.gz
barebox-9a307e8da54d34e328d7face138bd096e99bb746.tar.xz
ARM: at91: replace __raw_{readl, writel} of peripherals with readl, writel
Use the potentially endianness-changing readl, writel and siblings directly. They looks prettier and are the correct thing to do, as even if the CPU is in big-endian mode, the peripherals are little-endian. Unlike Linux, barebox readl,writel are the same Linux' {readl,writel}_relaxed (they don't imply memory barriers) and thus there shouldn't be any functional change. Patch was generated by a mass search and replace. I looked it over, adjust some whitespace and further verified by reviewing the output of git diff HEAD~1 --word-diff | \ perl -pe 's/\[-(.*?)__raw_/{+$1/; s/-\]\{\+/+}{+/;' \ -e 's/(\{\+.*?\+\})\1/__ALL_IS_WELL__/' | grep '+}{+' which filters out the common case of lines where a single __raw_{readT,writeT} had its __raw_ prefix stripped without any further changes. Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Tested-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-at91.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 11e00833c5..9b366e4812 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -303,11 +303,11 @@ static enum at91_mux at91_mux_pio3_get_periph(void __iomem *pio, unsigned mask)
{
unsigned select;
- if (__raw_readl(pio + PIO_PSR) & mask)
+ if (readl(pio + PIO_PSR) & mask)
return AT91_MUX_GPIO;
- select = !!(__raw_readl(pio + PIO_ABCDSR1) & mask);
- select |= (!!(__raw_readl(pio + PIO_ABCDSR2) & mask) << 1);
+ select = !!(readl(pio + PIO_ABCDSR1) & mask);
+ select |= (!!(readl(pio + PIO_ABCDSR2) & mask) << 1);
return select + 1;
}
@@ -316,34 +316,34 @@ static enum at91_mux at91_mux_get_periph(void __iomem *pio, unsigned mask)
{
unsigned select;
- if (__raw_readl(pio + PIO_PSR) & mask)
+ if (readl(pio + PIO_PSR) & mask)
return AT91_MUX_GPIO;
- select = __raw_readl(pio + PIO_ABSR) & mask;
+ select = readl(pio + PIO_ABSR) & mask;
return select + 1;
}
static bool at91_mux_get_deglitch(void __iomem *pio, unsigned pin)
{
- return (__raw_readl(pio + PIO_IFSR) >> pin) & 0x1;
+ return (readl(pio + PIO_IFSR) >> pin) & 0x1;
}
static bool at91_mux_pio3_get_debounce(void __iomem *pio, unsigned pin, u32 *div)
{
- *div = __raw_readl(pio + PIO_SCDR);
+ *div = readl(pio + PIO_SCDR);
- return (__raw_readl(pio + PIO_IFSCSR) >> pin) & 0x1;
+ return (readl(pio + PIO_IFSCSR) >> pin) & 0x1;
}
static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
{
- return (__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1;
+ return (readl(pio + PIO_PPDSR) >> pin) & 0x1;
}
static bool at91_mux_pio3_get_schmitt_trig(void __iomem *pio, unsigned pin)
{
- return (__raw_readl(pio + PIO_SCHMITT) >> pin) & 0x1;
+ return (readl(pio + PIO_SCHMITT) >> pin) & 0x1;
}
static struct at91_pinctrl_mux_ops at91rm9200_ops = {
@@ -559,7 +559,7 @@ static int at91_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
unsigned mask = 1 << offset;
at91_mux_gpio_set(pio, mask, value);
- __raw_writel(mask, pio + PIO_OER);
+ writel(mask, pio + PIO_OER);
return 0;
}
@@ -571,8 +571,8 @@ static int at91_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
unsigned mask = 1 << offset;
u32 osr;
- if (mask & __raw_readl(pio + PIO_PSR)) {
- osr = __raw_readl(pio + PIO_OSR);
+ if (mask & readl(pio + PIO_PSR)) {
+ osr = readl(pio + PIO_OSR);
return !(osr & mask);
} else {
return -EBUSY;
@@ -585,7 +585,7 @@ static int at91_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
void __iomem *pio = at91_gpio->regbase;
unsigned mask = 1 << offset;
- __raw_writel(mask, pio + PIO_ODR);
+ writel(mask, pio + PIO_ODR);
return 0;
}