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

Commit 8b1bd11c authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Linus Walleij
Browse files

pinctrl: samsung: Add the support the multiple IORESOURCE_MEM for one pin-bank 



This patch supports the multiple IORESOURCE_MEM resources for one pin-bank.
In the pre-existing Exynos series, the registers of the gpio bank are included
in the one memory map. But, some gpio bank need to support the one more memory
map (IORESOURCE_MEM) because the registers of gpio bank are separated into
the different memory map.

For example,
The both ALIVE and IMEM domain have the different memory base address.
The GFP[1-5] of exynos5433 are composed as following:
- ALIVE domain : WEINT_* registers
- IMEM domain  : CON/DAT/PUD/DRV/CONPDN/PUDPDN register

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: linux-gpio@vger.kernel.org
Suggested-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ccca1ad5

drivers/pinctrl/samsung/pinctrl-exynos.c

+16 −23
Original line number Original line Diff line number Diff line
@@ -61,16 +61,15 @@ static void exynos_irq_mask(struct irq_data *irqd) 
	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned long reg_mask = our_chip->eint_mask + bank->eint_offset;

	unsigned long reg_mask = our_chip->eint_mask + bank->eint_offset;

	unsigned long mask;

	unsigned long mask;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&bank->slock, flags);

	spin_lock_irqsave(&bank->slock, flags);





	mask = readl(d->virt_base + reg_mask);

	mask = readl(bank->eint_base + reg_mask);

	mask |= 1 << irqd->hwirq;

	mask |= 1 << irqd->hwirq;

	writel(mask, d->virt_base + reg_mask);

	writel(mask, bank->eint_base + reg_mask);





	spin_unlock_irqrestore(&bank->slock, flags);

	spin_unlock_irqrestore(&bank->slock, flags);

}

}
@@ -80,10 +79,9 @@ static void exynos_irq_ack(struct irq_data *irqd) 
	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned long reg_pend = our_chip->eint_pend + bank->eint_offset;

	unsigned long reg_pend = our_chip->eint_pend + bank->eint_offset;





	writel(1 << irqd->hwirq, d->virt_base + reg_pend);

	writel(1 << irqd->hwirq, bank->eint_base + reg_pend);

}

}





static void exynos_irq_unmask(struct irq_data *irqd)

static void exynos_irq_unmask(struct irq_data *irqd)
@@ -91,7 +89,6 @@ static void exynos_irq_unmask(struct irq_data *irqd) 
	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned long reg_mask = our_chip->eint_mask + bank->eint_offset;

	unsigned long reg_mask = our_chip->eint_mask + bank->eint_offset;

	unsigned long mask;

	unsigned long mask;

	unsigned long flags;

	unsigned long flags;
@@ -109,9 +106,9 @@ static void exynos_irq_unmask(struct irq_data *irqd) 




	spin_lock_irqsave(&bank->slock, flags);

	spin_lock_irqsave(&bank->slock, flags);





	mask = readl(d->virt_base + reg_mask);

	mask = readl(bank->eint_base + reg_mask);

	mask &= ~(1 << irqd->hwirq);

	mask &= ~(1 << irqd->hwirq);

	writel(mask, d->virt_base + reg_mask);

	writel(mask, bank->eint_base + reg_mask);





	spin_unlock_irqrestore(&bank->slock, flags);

	spin_unlock_irqrestore(&bank->slock, flags);

}

}
@@ -121,7 +118,6 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type) 
	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct irq_chip *chip = irq_data_get_irq_chip(irqd);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned int con, trig_type;

	unsigned int con, trig_type;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
@@ -152,10 +148,10 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type) 
	else

	else

		irq_set_handler_locked(irqd, handle_level_irq);

		irq_set_handler_locked(irqd, handle_level_irq);





	con = readl(d->virt_base + reg_con);

	con = readl(bank->eint_base + reg_con);

	con &= ~(EXYNOS_EINT_CON_MASK << shift);

	con &= ~(EXYNOS_EINT_CON_MASK << shift);

	con |= trig_type << shift;

	con |= trig_type << shift;

	writel(con, d->virt_base + reg_con);

	writel(con, bank->eint_base + reg_con);





	return 0;

	return 0;

}

}
@@ -166,7 +162,6 @@ static int exynos_irq_request_resources(struct irq_data *irqd) 
	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	const struct samsung_pin_bank_type *bank_type = bank->type;

	const struct samsung_pin_bank_type *bank_type = bank->type;

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;

	unsigned long flags;

	unsigned long flags;
@@ -188,10 +183,10 @@ static int exynos_irq_request_resources(struct irq_data *irqd) 




	spin_lock_irqsave(&bank->slock, flags);

	spin_lock_irqsave(&bank->slock, flags);





	con = readl(d->virt_base + reg_con);

	con = readl(bank->eint_base + reg_con);

	con &= ~(mask << shift);

	con &= ~(mask << shift);

	con |= EXYNOS_EINT_FUNC << shift;

	con |= EXYNOS_EINT_FUNC << shift;

	writel(con, d->virt_base + reg_con);

	writel(con, bank->eint_base + reg_con);





	spin_unlock_irqrestore(&bank->slock, flags);

	spin_unlock_irqrestore(&bank->slock, flags);
@@ -206,7 +201,6 @@ static void exynos_irq_release_resources(struct irq_data *irqd) 
	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	const struct samsung_pin_bank_type *bank_type = bank->type;

	const struct samsung_pin_bank_type *bank_type = bank->type;

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;

	unsigned long reg_con = our_chip->eint_con + bank->eint_offset;

	unsigned long flags;

	unsigned long flags;
@@ -221,10 +215,10 @@ static void exynos_irq_release_resources(struct irq_data *irqd) 




	spin_lock_irqsave(&bank->slock, flags);

	spin_lock_irqsave(&bank->slock, flags);





	con = readl(d->virt_base + reg_con);

	con = readl(bank->eint_base + reg_con);

	con &= ~(mask << shift);

	con &= ~(mask << shift);

	con |= FUNC_INPUT << shift;

	con |= FUNC_INPUT << shift;

	writel(con, d->virt_base + reg_con);

	writel(con, bank->eint_base + reg_con);





	spin_unlock_irqrestore(&bank->slock, flags);

	spin_unlock_irqrestore(&bank->slock, flags);
@@ -274,7 +268,7 @@ static irqreturn_t exynos_eint_gpio_irq(int irq, void *data) 
	struct samsung_pin_bank *bank = d->pin_banks;

	struct samsung_pin_bank *bank = d->pin_banks;

	unsigned int svc, group, pin, virq;

	unsigned int svc, group, pin, virq;





	svc = readl(d->virt_base + EXYNOS_SVC_OFFSET);

	svc = readl(bank->eint_base + EXYNOS_SVC_OFFSET);

	group = EXYNOS_SVC_GROUP(svc);

	group = EXYNOS_SVC_GROUP(svc);

	pin = svc & EXYNOS_SVC_NUM_MASK;

	pin = svc & EXYNOS_SVC_NUM_MASK;
@@ -452,7 +446,6 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc) 
{

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct exynos_muxed_weint_data *eintd = irq_desc_get_handler_data(desc);

	struct exynos_muxed_weint_data *eintd = irq_desc_get_handler_data(desc);

	struct samsung_pinctrl_drv_data *d = eintd->banks[0]->drvdata;

	unsigned long pend;

	unsigned long pend;

	unsigned long mask;

	unsigned long mask;

	int i;

	int i;
@@ -461,9 +454,9 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc) 




	for (i = 0; i < eintd->nr_banks; ++i) {

	for (i = 0; i < eintd->nr_banks; ++i) {

		struct samsung_pin_bank *b = eintd->banks[i];

		struct samsung_pin_bank *b = eintd->banks[i];

		pend = readl(d->virt_base + b->irq_chip->eint_pend

		pend = readl(b->eint_base + b->irq_chip->eint_pend

				+ b->eint_offset);

				+ b->eint_offset);

		mask = readl(d->virt_base + b->irq_chip->eint_mask

		mask = readl(b->eint_base + b->irq_chip->eint_mask

				+ b->eint_offset);

				+ b->eint_offset);

		exynos_irq_demux_eint(pend & ~mask, b->irq_domain);

		exynos_irq_demux_eint(pend & ~mask, b->irq_domain);

	}

	}
@@ -581,7 +574,7 @@ static void exynos_pinctrl_suspend_bank( 
				struct samsung_pin_bank *bank)

				struct samsung_pin_bank *bank)

{

{

	struct exynos_eint_gpio_save *save = bank->soc_priv;

	struct exynos_eint_gpio_save *save = bank->soc_priv;

	void __iomem *regs = drvdata->virt_base;

	void __iomem *regs = bank->eint_base;





	save->eint_con = readl(regs + EXYNOS_GPIO_ECON_OFFSET

	save->eint_con = readl(regs + EXYNOS_GPIO_ECON_OFFSET

						+ bank->eint_offset);

						+ bank->eint_offset);
@@ -610,7 +603,7 @@ static void exynos_pinctrl_resume_bank( 
				struct samsung_pin_bank *bank)

				struct samsung_pin_bank *bank)

{

{

	struct exynos_eint_gpio_save *save = bank->soc_priv;

	struct exynos_eint_gpio_save *save = bank->soc_priv;

	void __iomem *regs = drvdata->virt_base;

	void __iomem *regs = bank->eint_base;





	pr_debug("%s:     con %#010x => %#010x\n", bank->name,

	pr_debug("%s:     con %#010x => %#010x\n", bank->name,

			readl(regs + EXYNOS_GPIO_ECON_OFFSET

			readl(regs + EXYNOS_GPIO_ECON_OFFSET

drivers/pinctrl/samsung/pinctrl-exynos.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,17 @@ 
		.name		= id			\

		.name		= id			\

	}

	}





#define EXYNOS_PIN_BANK_EINTW_EXT(pins, reg, id, offs, pctl_idx) \

	{						\

		.type           = &bank_type_alive,	\

		.pctl_offset    = reg,                  \

		.nr_pins        = pins,                 \

		.eint_type      = EINT_TYPE_WKUP,       \

		.eint_offset    = offs,                 \

		.name           = id,                   \

		.pctl_res_idx   = pctl_idx,             \

	}						\



/**

/**

 * struct exynos_weint_data: irq specific data for all the wakeup interrupts

 * struct exynos_weint_data: irq specific data for all the wakeup interrupts

 * generated by the external wakeup interrupt controller.

 * generated by the external wakeup interrupt controller.

drivers/pinctrl/samsung/pinctrl-s3c24xx.c

+16 −21
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ static void s3c24xx_eint_set_function(struct samsung_pinctrl_drv_data *d, 
	u32 val;

	u32 val;





	/* Make sure that pin is configured as interrupt */

	/* Make sure that pin is configured as interrupt */

	reg = d->virt_base + bank->pctl_offset;

	reg = bank->pctl_base + bank->pctl_offset;

	shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC];

	shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC];

	mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;

	mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;
@@ -184,7 +184,7 @@ static int s3c24xx_eint_type(struct irq_data *data, unsigned int type) 
	s3c24xx_eint_set_handler(data, type);

	s3c24xx_eint_set_handler(data, type);





	/* Set up interrupt trigger */

	/* Set up interrupt trigger */

	reg = d->virt_base + EINT_REG(index);

	reg = bank->eint_base + EINT_REG(index);

	shift = EINT_OFFS(index);

	shift = EINT_OFFS(index);





	val = readl(reg);

	val = readl(reg);
@@ -259,32 +259,29 @@ static void s3c2410_demux_eint0_3(struct irq_desc *desc) 
static void s3c2412_eint0_3_ack(struct irq_data *data)

static void s3c2412_eint0_3_ack(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;





	unsigned long bitval = 1UL << data->hwirq;

	unsigned long bitval = 1UL << data->hwirq;

	writel(bitval, d->virt_base + EINTPEND_REG);

	writel(bitval, bank->eint_base + EINTPEND_REG);

}

}





static void s3c2412_eint0_3_mask(struct irq_data *data)

static void s3c2412_eint0_3_mask(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned long mask;

	unsigned long mask;





	mask = readl(d->virt_base + EINTMASK_REG);

	mask = readl(bank->eint_base + EINTMASK_REG);

	mask |= (1UL << data->hwirq);

	mask |= (1UL << data->hwirq);

	writel(mask, d->virt_base + EINTMASK_REG);

	writel(mask, bank->eint_base + EINTMASK_REG);

}

}





static void s3c2412_eint0_3_unmask(struct irq_data *data)

static void s3c2412_eint0_3_unmask(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned long mask;

	unsigned long mask;





	mask = readl(d->virt_base + EINTMASK_REG);

	mask = readl(bank->eint_base + EINTMASK_REG);

	mask &= ~(1UL << data->hwirq);

	mask &= ~(1UL << data->hwirq);

	writel(mask, d->virt_base + EINTMASK_REG);

	writel(mask, bank->eint_base + EINTMASK_REG);

}

}





static struct irq_chip s3c2412_eint0_3_chip = {

static struct irq_chip s3c2412_eint0_3_chip = {
@@ -319,34 +316,31 @@ static void s3c2412_demux_eint0_3(struct irq_desc *desc) 
static void s3c24xx_eint_ack(struct irq_data *data)

static void s3c24xx_eint_ack(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned char index = bank->eint_offset + data->hwirq;

	unsigned char index = bank->eint_offset + data->hwirq;





	writel(1UL << index, d->virt_base + EINTPEND_REG);

	writel(1UL << index, bank->eint_base + EINTPEND_REG);

}

}





static void s3c24xx_eint_mask(struct irq_data *data)

static void s3c24xx_eint_mask(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned char index = bank->eint_offset + data->hwirq;

	unsigned char index = bank->eint_offset + data->hwirq;

	unsigned long mask;

	unsigned long mask;





	mask = readl(d->virt_base + EINTMASK_REG);

	mask = readl(bank->eint_base + EINTMASK_REG);

	mask |= (1UL << index);

	mask |= (1UL << index);

	writel(mask, d->virt_base + EINTMASK_REG);

	writel(mask, bank->eint_base + EINTMASK_REG);

}

}





static void s3c24xx_eint_unmask(struct irq_data *data)

static void s3c24xx_eint_unmask(struct irq_data *data)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(data);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned char index = bank->eint_offset + data->hwirq;

	unsigned char index = bank->eint_offset + data->hwirq;

	unsigned long mask;

	unsigned long mask;





	mask = readl(d->virt_base + EINTMASK_REG);

	mask = readl(bank->eint_base + EINTMASK_REG);

	mask &= ~(1UL << index);

	mask &= ~(1UL << index);

	writel(mask, d->virt_base + EINTMASK_REG);

	writel(mask, bank->eint_base + EINTMASK_REG);

}

}





static struct irq_chip s3c24xx_eint_chip = {

static struct irq_chip s3c24xx_eint_chip = {
@@ -362,13 +356,14 @@ static inline void s3c24xx_demux_eint(struct irq_desc *desc, 
{

{

	struct s3c24xx_eint_data *data = irq_desc_get_handler_data(desc);

	struct s3c24xx_eint_data *data = irq_desc_get_handler_data(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct samsung_pinctrl_drv_data *d = data->drvdata;

	struct irq_data *irqd = irq_desc_get_irq_data(desc);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	unsigned int pend, mask;

	unsigned int pend, mask;





	chained_irq_enter(chip, desc);

	chained_irq_enter(chip, desc);





	pend = readl(d->virt_base + EINTPEND_REG);

	pend = readl(bank->eint_base + EINTPEND_REG);

	mask = readl(d->virt_base + EINTMASK_REG);

	mask = readl(bank->eint_base + EINTMASK_REG);





	pend &= ~mask;

	pend &= ~mask;

	pend &= range;

	pend &= range;

drivers/pinctrl/samsung/pinctrl-s3c64xx.c

+22 −18
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ static void s3c64xx_irq_set_function(struct samsung_pinctrl_drv_data *d, 
	u32 val;

	u32 val;





	/* Make sure that pin is configured as interrupt */

	/* Make sure that pin is configured as interrupt */

	reg = d->virt_base + bank->pctl_offset;

	reg = bank->pctl_base + bank->pctl_offset;

	shift = pin;

	shift = pin;

	if (bank_type->fld_width[PINCFG_TYPE_FUNC] * shift >= 32) {

	if (bank_type->fld_width[PINCFG_TYPE_FUNC] * shift >= 32) {

		/* 4-bit bank type with 2 con regs */

		/* 4-bit bank type with 2 con regs */
@@ -308,9 +308,8 @@ static void s3c64xx_irq_set_function(struct samsung_pinctrl_drv_data *d, 
static inline void s3c64xx_gpio_irq_set_mask(struct irq_data *irqd, bool mask)

static inline void s3c64xx_gpio_irq_set_mask(struct irq_data *irqd, bool mask)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned char index = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	unsigned char index = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	void __iomem *reg = d->virt_base + EINTMASK_REG(bank->eint_offset);

	void __iomem *reg = bank->eint_base + EINTMASK_REG(bank->eint_offset);

	u32 val;

	u32 val;





	val = readl(reg);

	val = readl(reg);
@@ -334,9 +333,8 @@ static void s3c64xx_gpio_irq_mask(struct irq_data *irqd) 
static void s3c64xx_gpio_irq_ack(struct irq_data *irqd)

static void s3c64xx_gpio_irq_ack(struct irq_data *irqd)

{

{

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	unsigned char index = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	unsigned char index = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	void __iomem *reg = d->virt_base + EINTPEND_REG(bank->eint_offset);

	void __iomem *reg = bank->eint_base + EINTPEND_REG(bank->eint_offset);





	writel(1 << index, reg);

	writel(1 << index, reg);

}

}
@@ -359,7 +357,7 @@ static int s3c64xx_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) 
	s3c64xx_irq_set_handler(irqd, type);

	s3c64xx_irq_set_handler(irqd, type);





	/* Set up interrupt trigger */

	/* Set up interrupt trigger */

	reg = d->virt_base + EINTCON_REG(bank->eint_offset);

	reg = bank->eint_base + EINTCON_REG(bank->eint_offset);

	shift = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	shift = EINT_OFFS(bank->eint_offset) + irqd->hwirq;

	shift = 4 * (shift / 4); /* 4 EINTs per trigger selector */

	shift = 4 * (shift / 4); /* 4 EINTs per trigger selector */
@@ -411,7 +409,8 @@ static void s3c64xx_eint_gpio_irq(struct irq_desc *desc) 
{

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct s3c64xx_eint_gpio_data *data = irq_desc_get_handler_data(desc);

	struct s3c64xx_eint_gpio_data *data = irq_desc_get_handler_data(desc);

	struct samsung_pinctrl_drv_data *drvdata = data->drvdata;

	struct irq_data *irqd = irq_desc_get_irq_data(desc);

	struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);





	chained_irq_enter(chip, desc);

	chained_irq_enter(chip, desc);
@@ -421,7 +420,7 @@ static void s3c64xx_eint_gpio_irq(struct irq_desc *desc) 
		unsigned int pin;

		unsigned int pin;

		unsigned int virq;

		unsigned int virq;





		svc = readl(drvdata->virt_base + SERVICE_REG);

		svc = readl(bank->eint_base + SERVICE_REG);

		group = SVC_GROUP(svc);

		group = SVC_GROUP(svc);

		pin = svc & SVC_NUM_MASK;

		pin = svc & SVC_NUM_MASK;
@@ -518,15 +517,15 @@ static inline void s3c64xx_eint0_irq_set_mask(struct irq_data *irqd, bool mask) 
{

{

	struct s3c64xx_eint0_domain_data *ddata =

	struct s3c64xx_eint0_domain_data *ddata =

					irq_data_get_irq_chip_data(irqd);

					irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = ddata->bank->drvdata;

	struct samsung_pin_bank *bank = ddata->bank;

	u32 val;

	u32 val;





	val = readl(d->virt_base + EINT0MASK_REG);

	val = readl(bank->eint_base + EINT0MASK_REG);

	if (mask)

	if (mask)

		val |= 1 << ddata->eints[irqd->hwirq];

		val |= 1 << ddata->eints[irqd->hwirq];

	else

	else

		val &= ~(1 << ddata->eints[irqd->hwirq]);

		val &= ~(1 << ddata->eints[irqd->hwirq]);

	writel(val, d->virt_base + EINT0MASK_REG);

	writel(val, bank->eint_base + EINT0MASK_REG);

}

}





static void s3c64xx_eint0_irq_unmask(struct irq_data *irqd)

static void s3c64xx_eint0_irq_unmask(struct irq_data *irqd)
@@ -543,10 +542,10 @@ static void s3c64xx_eint0_irq_ack(struct irq_data *irqd) 
{

{

	struct s3c64xx_eint0_domain_data *ddata =

	struct s3c64xx_eint0_domain_data *ddata =

					irq_data_get_irq_chip_data(irqd);

					irq_data_get_irq_chip_data(irqd);

	struct samsung_pinctrl_drv_data *d = ddata->bank->drvdata;

	struct samsung_pin_bank *bank = ddata->bank;





	writel(1 << ddata->eints[irqd->hwirq],

	writel(1 << ddata->eints[irqd->hwirq],

					d->virt_base + EINT0PEND_REG);

					bank->eint_base + EINT0PEND_REG);

}

}





static int s3c64xx_eint0_irq_set_type(struct irq_data *irqd, unsigned int type)

static int s3c64xx_eint0_irq_set_type(struct irq_data *irqd, unsigned int type)
@@ -554,7 +553,7 @@ static int s3c64xx_eint0_irq_set_type(struct irq_data *irqd, unsigned int type) 
	struct s3c64xx_eint0_domain_data *ddata =

	struct s3c64xx_eint0_domain_data *ddata =

					irq_data_get_irq_chip_data(irqd);

					irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = ddata->bank;

	struct samsung_pin_bank *bank = ddata->bank;

	struct samsung_pinctrl_drv_data *d = bank->drvdata;

	struct samsung_pinctrl_drv_data *d = ddata->bank->drvdata;

	void __iomem *reg;

	void __iomem *reg;

	int trigger;

	int trigger;

	u8 shift;

	u8 shift;
@@ -569,7 +568,7 @@ static int s3c64xx_eint0_irq_set_type(struct irq_data *irqd, unsigned int type) 
	s3c64xx_irq_set_handler(irqd, type);

	s3c64xx_irq_set_handler(irqd, type);





	/* Set up interrupt trigger */

	/* Set up interrupt trigger */

	reg = d->virt_base + EINT0CON0_REG;

	reg = bank->eint_base + EINT0CON0_REG;

	shift = ddata->eints[irqd->hwirq];

	shift = ddata->eints[irqd->hwirq];

	if (shift >= EINT_MAX_PER_REG) {

	if (shift >= EINT_MAX_PER_REG) {

		reg += 4;

		reg += 4;
@@ -601,14 +600,19 @@ static struct irq_chip s3c64xx_eint0_irq_chip = { 
static inline void s3c64xx_irq_demux_eint(struct irq_desc *desc, u32 range)

static inline void s3c64xx_irq_demux_eint(struct irq_desc *desc, u32 range)

{

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_data *irqd = irq_desc_get_irq_data(desc);

	struct s3c64xx_eint0_domain_data *ddata =

					irq_data_get_irq_chip_data(irqd);

	struct samsung_pin_bank *bank = ddata->bank;



	struct s3c64xx_eint0_data *data = irq_desc_get_handler_data(desc);

	struct s3c64xx_eint0_data *data = irq_desc_get_handler_data(desc);

	struct samsung_pinctrl_drv_data *drvdata = data->drvdata;



	unsigned int pend, mask;

	unsigned int pend, mask;





	chained_irq_enter(chip, desc);

	chained_irq_enter(chip, desc);





	pend = readl(drvdata->virt_base + EINT0PEND_REG);

	pend = readl(bank->eint_base + EINT0PEND_REG);

	mask = readl(drvdata->virt_base + EINT0MASK_REG);

	mask = readl(bank->eint_base + EINT0MASK_REG);





	pend = pend & range & ~mask;

	pend = pend & range & ~mask;

	pend &= range;

	pend &= range;

drivers/pinctrl/samsung/pinctrl-samsung.c

+26 −14
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ 
#include "../core.h"

#include "../core.h"

#include "pinctrl-samsung.h"

#include "pinctrl-samsung.h"





/* maximum number of the memory resources */

#define	SAMSUNG_PINCTRL_NUM_RESOURCES	2



/* list of all possible config options supported */

/* list of all possible config options supported */

static struct pin_config {

static struct pin_config {

	const char *property;

	const char *property;
@@ -345,7 +348,7 @@ static void pin_to_reg_bank(struct samsung_pinctrl_drv_data *drvdata, 
			((b->pin_base + b->nr_pins - 1) < pin))

			((b->pin_base + b->nr_pins - 1) < pin))

		b++;

		b++;





	*reg = drvdata->virt_base + b->pctl_offset;

	*reg = b->pctl_base + b->pctl_offset;

	*offset = pin - b->pin_base;

	*offset = pin - b->pin_base;

	if (bank)

	if (bank)

		*bank = b;

		*bank = b;
@@ -526,7 +529,7 @@ static void samsung_gpio_set_value(struct gpio_chip *gc, 
	void __iomem *reg;

	void __iomem *reg;

	u32 data;

	u32 data;





	reg = bank->drvdata->virt_base + bank->pctl_offset;

	reg = bank->pctl_base + bank->pctl_offset;





	data = readl(reg + type->reg_offset[PINCFG_TYPE_DAT]);

	data = readl(reg + type->reg_offset[PINCFG_TYPE_DAT]);

	data &= ~(1 << offset);

	data &= ~(1 << offset);
@@ -554,7 +557,7 @@ static int samsung_gpio_get(struct gpio_chip *gc, unsigned offset) 
	struct samsung_pin_bank *bank = gpiochip_get_data(gc);

	struct samsung_pin_bank *bank = gpiochip_get_data(gc);

	const struct samsung_pin_bank_type *type = bank->type;

	const struct samsung_pin_bank_type *type = bank->type;





	reg = bank->drvdata->virt_base + bank->pctl_offset;

	reg = bank->pctl_base + bank->pctl_offset;





	data = readl(reg + type->reg_offset[PINCFG_TYPE_DAT]);

	data = readl(reg + type->reg_offset[PINCFG_TYPE_DAT]);

	data >>= offset;

	data >>= offset;
@@ -581,8 +584,8 @@ static int samsung_gpio_set_direction(struct gpio_chip *gc, 
	type = bank->type;

	type = bank->type;

	drvdata = bank->drvdata;

	drvdata = bank->drvdata;





	reg = drvdata->virt_base + bank->pctl_offset +

	reg = bank->pctl_base + bank->pctl_offset

					type->reg_offset[PINCFG_TYPE_FUNC];

			+ type->reg_offset[PINCFG_TYPE_FUNC];





	mask = (1 << type->fld_width[PINCFG_TYPE_FUNC]) - 1;

	mask = (1 << type->fld_width[PINCFG_TYPE_FUNC]) - 1;

	shift = offset * type->fld_width[PINCFG_TYPE_FUNC];

	shift = offset * type->fld_width[PINCFG_TYPE_FUNC];
@@ -979,6 +982,8 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, 
	const struct samsung_pin_bank_data *bdata;

	const struct samsung_pin_bank_data *bdata;

	const struct samsung_pin_ctrl *ctrl;

	const struct samsung_pin_ctrl *ctrl;

	struct samsung_pin_bank *bank;

	struct samsung_pin_bank *bank;

	struct resource *res;

	void __iomem *virt_base[SAMSUNG_PINCTRL_NUM_RESOURCES];

	int i;

	int i;





	id = of_alias_get_id(node, "pinctrl");

	id = of_alias_get_id(node, "pinctrl");
@@ -997,6 +1002,17 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, 
	if (!d->pin_banks)

	if (!d->pin_banks)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	if (ctrl->nr_ext_resources + 1 > SAMSUNG_PINCTRL_NUM_RESOURCES)

		return ERR_PTR(-EINVAL);



	for (i = 0; i < ctrl->nr_ext_resources + 1; i++) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		virt_base[i] = devm_ioremap(&pdev->dev, res->start,

						resource_size(res));

		if (IS_ERR(virt_base[i]))

			return ERR_PTR(-EIO);

	}



	bank = d->pin_banks;

	bank = d->pin_banks;

	bdata = ctrl->pin_banks;

	bdata = ctrl->pin_banks;

	for (i = 0; i < ctrl->nr_banks; ++i, ++bdata, ++bank) {

	for (i = 0; i < ctrl->nr_banks; ++i, ++bdata, ++bank) {
@@ -1013,6 +1029,9 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, 
		bank->drvdata = d;

		bank->drvdata = d;

		bank->pin_base = d->nr_pins;

		bank->pin_base = d->nr_pins;

		d->nr_pins += bank->nr_pins;

		d->nr_pins += bank->nr_pins;



		bank->eint_base = virt_base[0];

		bank->pctl_base = virt_base[bdata->pctl_res_idx];

	}

	}





	for_each_child_of_node(node, np) {

	for_each_child_of_node(node, np) {
@@ -1052,11 +1071,6 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) 
	}

	}

	drvdata->dev = dev;

	drvdata->dev = dev;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	drvdata->virt_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(drvdata->virt_base))

		return PTR_ERR(drvdata->virt_base);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (res)

	if (res)

		drvdata->irq = res->start;

		drvdata->irq = res->start;
@@ -1094,12 +1108,11 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) 
static void samsung_pinctrl_suspend_dev(

static void samsung_pinctrl_suspend_dev(

	struct samsung_pinctrl_drv_data *drvdata)

	struct samsung_pinctrl_drv_data *drvdata)

{

{

	void __iomem *virt_base = drvdata->virt_base;

	int i;

	int i;





	for (i = 0; i < drvdata->nr_banks; i++) {

	for (i = 0; i < drvdata->nr_banks; i++) {

		struct samsung_pin_bank *bank = &drvdata->pin_banks[i];

		struct samsung_pin_bank *bank = &drvdata->pin_banks[i];

		void __iomem *reg = virt_base + bank->pctl_offset;

		void __iomem *reg = bank->pctl_base + bank->pctl_offset;

		const u8 *offs = bank->type->reg_offset;

		const u8 *offs = bank->type->reg_offset;

		const u8 *widths = bank->type->fld_width;

		const u8 *widths = bank->type->fld_width;

		enum pincfg_type type;

		enum pincfg_type type;
@@ -1140,7 +1153,6 @@ static void samsung_pinctrl_suspend_dev( 
 */

 */

static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata)

static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata)

{

{

	void __iomem *virt_base = drvdata->virt_base;

	int i;

	int i;





	if (drvdata->resume)

	if (drvdata->resume)
@@ -1148,7 +1160,7 @@ static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) 




	for (i = 0; i < drvdata->nr_banks; i++) {

	for (i = 0; i < drvdata->nr_banks; i++) {

		struct samsung_pin_bank *bank = &drvdata->pin_banks[i];

		struct samsung_pin_bank *bank = &drvdata->pin_banks[i];

		void __iomem *reg = virt_base + bank->pctl_offset;

		void __iomem *reg = bank->pctl_base + bank->pctl_offset;

		const u8 *offs = bank->type->reg_offset;

		const u8 *offs = bank->type->reg_offset;

		const u8 *widths = bank->type->fld_width;

		const u8 *widths = bank->type->fld_width;

		enum pincfg_type type;

		enum pincfg_type type;