hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pinctrl: sirf: move sgpio lock into state container 

Instead of referring to a global static variable for the sgpio
locking, use the state container to contain the lock.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-04-23 23:13:01 +02:00
parent 7414b0993c
commit 1dfe0d159d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pinctrl/sirf/pinctrl-sirf.c
View File

@ -39,10 +39,9 @@ struct sirfsoc_gpio_bank {
struct sirfsoc_gpio_chip { struct sirfsoc_gpio_chip {
struct of_mm_gpio_chip chip; struct of_mm_gpio_chip chip;
struct sirfsoc_gpio_bank sgpio_bank[SIRFSOC_GPIO_NO_OF_BANKS]; struct sirfsoc_gpio_bank sgpio_bank[SIRFSOC_GPIO_NO_OF_BANKS];
spinlock_t lock;
}; };
static DEFINE_SPINLOCK(sgpio_lock);
static struct sirfsoc_pin_group *sirfsoc_pin_groups; static struct sirfsoc_pin_group *sirfsoc_pin_groups;
static int sirfsoc_pingrp_cnt; static int sirfsoc_pingrp_cnt;
@ -427,13 +426,13 @@ static void sirfsoc_gpio_irq_ack(struct irq_data *d)
offset = SIRFSOC_GPIO_CTRL(bank->id, idx); offset = SIRFSOC_GPIO_CTRL(bank->id, idx);
spin_lock_irqsave(&sgpio_lock, flags); spin_lock_irqsave(&sgpio->lock, flags);
val = readl(sgpio->chip.regs + offset); val = readl(sgpio->chip.regs + offset);
writel(val, sgpio->chip.regs + offset); writel(val, sgpio->chip.regs + offset);
spin_unlock_irqrestore(&sgpio_lock, flags); spin_unlock_irqrestore(&sgpio->lock, flags);
} }
static void __sirfsoc_gpio_irq_mask(struct sirfsoc_gpio_chip *sgpio, static void __sirfsoc_gpio_irq_mask(struct sirfsoc_gpio_chip *sgpio,
@ -445,14 +444,14 @@ static void __sirfsoc_gpio_irq_mask(struct sirfsoc_gpio_chip *sgpio,
offset = SIRFSOC_GPIO_CTRL(bank->id, idx); offset = SIRFSOC_GPIO_CTRL(bank->id, idx);
spin_lock_irqsave(&sgpio_lock, flags); spin_lock_irqsave(&sgpio->lock, flags);
val = readl(sgpio->chip.regs + offset); val = readl(sgpio->chip.regs + offset);
val &= ~SIRFSOC_GPIO_CTL_INTR_EN_MASK; val &= ~SIRFSOC_GPIO_CTL_INTR_EN_MASK;
val &= ~SIRFSOC_GPIO_CTL_INTR_STS_MASK; val &= ~SIRFSOC_GPIO_CTL_INTR_STS_MASK;
writel(val, sgpio->chip.regs + offset); writel(val, sgpio->chip.regs + offset);
spin_unlock_irqrestore(&sgpio_lock, flags); spin_unlock_irqrestore(&sgpio->lock, flags);
} }
static void sirfsoc_gpio_irq_mask(struct irq_data *d) static void sirfsoc_gpio_irq_mask(struct irq_data *d)
@ -475,14 +474,14 @@ static void sirfsoc_gpio_irq_unmask(struct irq_data *d)
offset = SIRFSOC_GPIO_CTRL(bank->id, idx); offset = SIRFSOC_GPIO_CTRL(bank->id, idx);
spin_lock_irqsave(&sgpio_lock, flags); spin_lock_irqsave(&sgpio->lock, flags);
val = readl(sgpio->chip.regs + offset); val = readl(sgpio->chip.regs + offset);
val &= ~SIRFSOC_GPIO_CTL_INTR_STS_MASK; val &= ~SIRFSOC_GPIO_CTL_INTR_STS_MASK;
val |= SIRFSOC_GPIO_CTL_INTR_EN_MASK; val |= SIRFSOC_GPIO_CTL_INTR_EN_MASK;
writel(val, sgpio->chip.regs + offset); writel(val, sgpio->chip.regs + offset);
spin_unlock_irqrestore(&sgpio_lock, flags); spin_unlock_irqrestore(&sgpio->lock, flags);
} }
static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type) static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)
@ -496,7 +495,7 @@ static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)
offset = SIRFSOC_GPIO_CTRL(bank->id, idx); offset = SIRFSOC_GPIO_CTRL(bank->id, idx);
spin_lock_irqsave(&sgpio_lock, flags); spin_lock_irqsave(&sgpio->lock, flags);
val = readl(sgpio->chip.regs + offset); val = readl(sgpio->chip.regs + offset);
val &= ~(SIRFSOC_GPIO_CTL_INTR_STS_MASK | SIRFSOC_GPIO_CTL_OUT_EN_MASK); val &= ~(SIRFSOC_GPIO_CTL_INTR_STS_MASK | SIRFSOC_GPIO_CTL_OUT_EN_MASK);
@ -533,7 +532,7 @@ static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)
writel(val, sgpio->chip.regs + offset); writel(val, sgpio->chip.regs + offset);
spin_unlock_irqrestore(&sgpio_lock, flags); spin_unlock_irqrestore(&sgpio->lock, flags);
return 0; return 0;
} }
@ -697,11 +696,11 @@ static int sirfsoc_gpio_direction_output(struct gpio_chip *chip,
offset = SIRFSOC_GPIO_CTRL(bank->id, idx); offset = SIRFSOC_GPIO_CTRL(bank->id, idx);
spin_lock_irqsave(&sgpio_lock, flags); spin_lock_irqsave(&sgpio->lock, flags);
sirfsoc_gpio_set_output(sgpio, bank, offset, value); sirfsoc_gpio_set_output(sgpio, bank, offset, value);
spin_unlock_irqrestore(&sgpio_lock, flags); spin_unlock_irqrestore(&sgpio->lock, flags);
return 0; return 0;
} }
@ -793,6 +792,7 @@ static int sirfsoc_gpio_probe(struct device_node *np)
sgpio = devm_kzalloc(&pdev->dev, sizeof(*sgpio), GFP_KERNEL); sgpio = devm_kzalloc(&pdev->dev, sizeof(*sgpio), GFP_KERNEL);
if (!sgpio) if (!sgpio)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&sgpio->lock);
regs = of_iomap(np, 0); regs = of_iomap(np, 0);
if (!regs) if (!regs)