1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[mcs814x] use the recommended ARM I/O accessors

use {read,write}l_relaxed instead of the plain __raw_{read,write}l variants.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33330 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2012-09-08 09:51:05 +00:00
parent 555155f8ea
commit 08b17128a1
9 changed files with 55 additions and 52 deletions

View File

@@ -30,7 +30,7 @@ static int mcs814x_gpio_get(struct gpio_chip *chip, unsigned offset)
{
struct mcs814x_gpio_chip *mcs814x = to_mcs814x_gpio_chip(chip);
return __raw_readl(mcs814x->regs + GPIO_PIN) & (1 << offset);
return readl_relaxed(mcs814x->regs + GPIO_PIN) & (1 << offset);
}
static void mcs814x_gpio_set(struct gpio_chip *chip,
@@ -39,12 +39,12 @@ static void mcs814x_gpio_set(struct gpio_chip *chip,
struct mcs814x_gpio_chip *mcs814x = to_mcs814x_gpio_chip(chip);
u32 mask;
mask = __raw_readl(mcs814x->regs + GPIO_PIN);
mask = readl_relaxed(mcs814x->regs + GPIO_PIN);
if (value)
mask |= (1 << offset);
else
mask &= ~(1 << offset);
__raw_writel(mask, mcs814x->regs + GPIO_PIN);
writel_relaxed(mask, mcs814x->regs + GPIO_PIN);
}
static int mcs814x_gpio_direction_output(struct gpio_chip *chip,
@@ -53,9 +53,9 @@ static int mcs814x_gpio_direction_output(struct gpio_chip *chip,
struct mcs814x_gpio_chip *mcs814x = to_mcs814x_gpio_chip(chip);
u32 mask;
mask = __raw_readl(mcs814x->regs + GPIO_DIR);
mask = readl_relaxed(mcs814x->regs + GPIO_DIR);
mask &= ~(1 << offset);
__raw_writel(mask, mcs814x->regs + GPIO_DIR);
writel_relaxed(mask, mcs814x->regs + GPIO_DIR);
return 0;
}
@@ -66,9 +66,9 @@ static int mcs814x_gpio_direction_input(struct gpio_chip *chip,
struct mcs814x_gpio_chip *mcs814x = to_mcs814x_gpio_chip(chip);
u32 mask;
mask = __raw_readl(mcs814x->regs + GPIO_DIR);
mask = readl_relaxed(mcs814x->regs + GPIO_DIR);
mask |= (1 << offset);
__raw_writel(mask, mcs814x->regs + GPIO_DIR);
writel_relaxed(mask, mcs814x->regs + GPIO_DIR);
return 0;
}