Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70b7aa7a authored by John Keeping's avatar John Keeping Committed by Linus Walleij
Browse files

pinctrl: rockchip: convert to raw spinlock 



This lock is used from rockchip_irq_set_type() which is part of the
irq_chip implementation and thus must use raw_spinlock_t as documented
in Documentation/gpio/driver.txt.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f07bedc3

drivers/pinctrl/pinctrl-rockchip.c

+13 −13
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ struct rockchip_pin_bank { 
	struct irq_domain		*domain;

	struct gpio_chip		gpio_chip;

	struct pinctrl_gpio_range	grange;

	spinlock_t			slock;

	raw_spinlock_t			slock;

	u32				toggle_edge_mode;

};
@@ -1498,7 +1498,7 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip, 
		return ret;



	clk_enable(bank->clk);

	spin_lock_irqsave(&bank->slock, flags);

	raw_spin_lock_irqsave(&bank->slock, flags);



	data = readl_relaxed(bank->reg_base + GPIO_SWPORT_DDR);

	/* set bit to 1 for output, 0 for input */
@@ -1508,7 +1508,7 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip, 
		data &= ~BIT(pin);

	writel_relaxed(data, bank->reg_base + GPIO_SWPORT_DDR);



	spin_unlock_irqrestore(&bank->slock, flags);

	raw_spin_unlock_irqrestore(&bank->slock, flags);

	clk_disable(bank->clk);



	return 0;
@@ -1958,7 +1958,7 @@ static void rockchip_gpio_set(struct gpio_chip *gc, unsigned offset, int value) 
	u32 data;



	clk_enable(bank->clk);

	spin_lock_irqsave(&bank->slock, flags);

	raw_spin_lock_irqsave(&bank->slock, flags);



	data = readl(reg);

	data &= ~BIT(offset);
@@ -1966,7 +1966,7 @@ static void rockchip_gpio_set(struct gpio_chip *gc, unsigned offset, int value) 
		data |= BIT(offset);

	writel(data, reg);



	spin_unlock_irqrestore(&bank->slock, flags);

	raw_spin_unlock_irqrestore(&bank->slock, flags);

	clk_disable(bank->clk);

}
@@ -2078,7 +2078,7 @@ static void rockchip_irq_demux(struct irq_desc *desc) 


			data = readl_relaxed(bank->reg_base + GPIO_EXT_PORT);

			do {

				spin_lock_irqsave(&bank->slock, flags);

				raw_spin_lock_irqsave(&bank->slock, flags);



				polarity = readl_relaxed(bank->reg_base +

							 GPIO_INT_POLARITY);
@@ -2089,7 +2089,7 @@ static void rockchip_irq_demux(struct irq_desc *desc) 
				writel(polarity,

				       bank->reg_base + GPIO_INT_POLARITY);



				spin_unlock_irqrestore(&bank->slock, flags);

				raw_spin_unlock_irqrestore(&bank->slock, flags);



				data_old = data;

				data = readl_relaxed(bank->reg_base +
@@ -2120,20 +2120,20 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type) 
		return ret;



	clk_enable(bank->clk);

	spin_lock_irqsave(&bank->slock, flags);

	raw_spin_lock_irqsave(&bank->slock, flags);



	data = readl_relaxed(bank->reg_base + GPIO_SWPORT_DDR);

	data &= ~mask;

	writel_relaxed(data, bank->reg_base + GPIO_SWPORT_DDR);



	spin_unlock_irqrestore(&bank->slock, flags);

	raw_spin_unlock_irqrestore(&bank->slock, flags);



	if (type & IRQ_TYPE_EDGE_BOTH)

		irq_set_handler_locked(d, handle_edge_irq);

	else

		irq_set_handler_locked(d, handle_level_irq);



	spin_lock_irqsave(&bank->slock, flags);

	raw_spin_lock_irqsave(&bank->slock, flags);

	irq_gc_lock(gc);



	level = readl_relaxed(gc->reg_base + GPIO_INTTYPE_LEVEL);
@@ -2176,7 +2176,7 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type) 
		break;

	default:

		irq_gc_unlock(gc);

		spin_unlock_irqrestore(&bank->slock, flags);

		raw_spin_unlock_irqrestore(&bank->slock, flags);

		clk_disable(bank->clk);

		return -EINVAL;

	}
@@ -2185,7 +2185,7 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type) 
	writel_relaxed(polarity, gc->reg_base + GPIO_INT_POLARITY);



	irq_gc_unlock(gc);

	spin_unlock_irqrestore(&bank->slock, flags);

	raw_spin_unlock_irqrestore(&bank->slock, flags);

	clk_disable(bank->clk);



	return 0;
@@ -2468,7 +2468,7 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( 
	for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {

		int bank_pins = 0;



		spin_lock_init(&bank->slock);

		raw_spin_lock_init(&bank->slock);

		bank->drvdata = d;

		bank->pin_base = ctrl->nr_pins;

		ctrl->nr_pins += bank->nr_pins;