pinctrl: Add support for pin control on S3C64xx
Subsystems (3)
cover pinctrl: Add support for pin control on S3C64xx
This series makes necessary preparations to add support for pin controller available on Samsung S3C64xx using pinctrl-samsung driver and then adds pinctrl-s3c64xx driver which implements SoC-specific part of the code.
It has been tested on a tiny6410 (mini6410-compatible) board with my patches for samsung-time cleanup and S3C64xx Device Tree support:
- http://thread.gmane.org/gmane.linux.kernel.samsung-soc/16664
- http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg16325.html
Just the driver is added for now, as this is the part that can safely go through Linus' pinctrl tree. I will post appropriate enablement patches after all the dependencies get merged to Kgene's tree.
See particular patches for more detailed description of all changes.
Tomasz Figa (6):
pinctrl: samsung: Protect bank registers with a spinlock
pinctrl: samsung: Include pinctrl-exynos driver data conditionally
pinctrl: samsung: Split pin bank description into two structures
pinctrl: samsung: Remove hardcoded register offsets
pinctrl: samsung: Handle banks with two configuration registers
pinctrl: Add pinctrl-s3c64xx driver
.../bindings/pinctrl/samsung-pinctrl.txt | 3 + drivers/pinctrl/Kconfig | 5 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-exynos.c | 36 +- drivers/pinctrl/pinctrl-exynos.h | 16 +- drivers/pinctrl/pinctrl-s3c64xx.c | 817 +++++++++++++++++++++ drivers/pinctrl/pinctrl-samsung.c | 99 ++- drivers/pinctrl/pinctrl-samsung.h | 42 +- 8 files changed, 947 insertions(+), 72 deletions(-) create mode 100644 drivers/pinctrl/pinctrl-s3c64xx.c
Signature · 1 line
1.8.1.5
PATCH 1/6 pinctrl: samsung: Protect bank registers with a spinlock
Certain pin control registers can be accessed from different contexts, i.e. pinctrl, gpio and irq functions. This makes the locking provided by pin control core insufficient.
This patch adds necessary locking using a per bank spinlock as it was done in the old Samsung GPIO driver.
--- drivers/pinctrl/pinctrl-exynos.c | 11 +++++++++++ drivers/pinctrl/pinctrl-samsung.c | 24 ++++++++++++++++++++++++ drivers/pinctrl/pinctrl-samsung.h | 2 ++ 3 files changed, 37 insertions(+)
drivers/pinctrl/pinctrl-exynos.c +11 -0
@@ -26,6 +26,7 @@#include <linux/of_irq.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/err.h> #include <asm/mach/irq.h>
@@ -81,6 +82,7 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)unsigned int shift =EXYNOS_EINT_CON_LEN * pin;unsigned int con, trig_type;unsigned long reg_con = ctrl->geint_con + bank->eint_offset; +unsigned long flags;unsigned int mask;switch (type) {
@@ -118,11 +120,15 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) shift = pin * bank->func_width; mask = (1 << bank->func_width) -1 ; +spin_lock_irqsave (&bank->slock, flags); + con =readl (d->virt_base + reg_con); con &= ~(mask << shift); con |=EXYNOS_EINT_FUNC << shift;writel (con, d->virt_base + reg_con); +spin_unlock_irqrestore (&bank->slock, flags); +return 0 ; }
@@ -258,6 +264,7 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type)unsigned long reg_con = d->ctrl->weint_con + bank->eint_offset;unsigned long shift =EXYNOS_EINT_CON_LEN * pin;unsigned long con, trig_type; +unsigned long flags;unsigned int mask;switch (type) {
@@ -295,11 +302,15 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type) shift = pin * bank->func_width; mask = (1 << bank->func_width) -1 ; +spin_lock_irqsave (&bank->slock, flags); + con =readl (d->virt_base + reg_con); con &= ~(mask << shift); con |=EXYNOS_EINT_FUNC << shift;writel (con, d->virt_base + reg_con); +spin_unlock_irqrestore (&bank->slock, flags); +return 0 ; }
drivers/pinctrl/pinctrl-samsung.c +24 -0
@@ -27,6 +27,7 @@#include <linux/err.h> #include <linux/gpio.h> #include <linux/irqdomain.h> +#include <linux/spinlock.h> #include "core.h" #include "pinctrl-samsung.h"
@@ -289,6 +290,7 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,struct samsung_pin_bank *bank;void __iomem *reg;u32 mask, shift, data, pin_offset, cnt; +unsigned long flags; drvdata =pinctrl_dev_get_drvdata (pctldev); pins = drvdata->pin_groups[group].pins;
@@ -303,11 +305,15 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector, mask = (1 << bank->func_width) -1 ; shift = pin_offset * bank->func_width; +spin_lock_irqsave (&bank->slock, flags); + data =readl (reg); data &= ~(mask << shift);if (enable) data |= drvdata->pin_groups[group].func << shift;writel (data, reg); + +spin_unlock_irqrestore (&bank->slock, flags); } }
@@ -338,6 +344,7 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,struct samsung_pinctrl_drv_data *drvdata;void __iomem *reg;u32 data, pin_offset, mask, shift; +unsigned long flags; bank =gc_to_pin_bank (range->gc); drvdata =pinctrl_dev_get_drvdata (pctldev);
@@ -348,11 +355,16 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev, mask = (1 << bank->func_width) -1 ; shift = pin_offset * bank->func_width; +spin_lock_irqsave (&bank->slock, flags); + data =readl (reg); data &= ~(mask << shift);if (!input) data |=FUNC_OUTPUT << shift;writel (data, reg); + +spin_unlock_irqrestore (&bank->slock, flags); +return 0 ; }
@@ -376,6 +388,7 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin,enum pincfg_type cfg_type =PINCFG_UNPACK_TYPE (*config);u32 data, width, pin_offset, mask, shift;u32 cfg_value, cfg_reg; +unsigned long flags; drvdata =pinctrl_dev_get_drvdata (pctldev); pin_to_reg_bank(drvdata, pin - drvdata->ctrl->base, ®_base,
@@ -406,6 +419,8 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin,if (!width)return -EINVAL ; +spin_lock_irqsave (&bank->slock, flags); + mask = (1 << width) -1 ; shift = pin_offset * width; data =readl (reg_base + cfg_reg);
@@ -420,6 +435,9 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin, data &= mask; *config =PINCFG_PACK (cfg_type, data); } + +spin_unlock_irqrestore (&bank->slock, flags); +return 0 ; }
@@ -479,16 +497,21 @@ static const struct pinconf_ops samsung_pinconf_ops = {static void samsung_gpio_set (struct gpio_chip *gc,unsigned offset,int value) {struct samsung_pin_bank *bank =gc_to_pin_bank (gc); +unsigned long flags;void __iomem *reg;u32 data; reg = bank->drvdata->virt_base + bank->pctl_offset; +spin_lock_irqsave (&bank->slock, flags); + data =readl (reg +DAT_REG ); data &= ~(1 << offset);if (value) data |=1 << offset;writel (data, reg +DAT_REG ); + +spin_unlock_irqrestore (&bank->slock, flags); }/* gpiolib gpio_get callback function */
@@ -859,6 +882,7 @@ static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data( bank = ctrl->pin_banks;for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +spin_lock_init (&bank->slock); bank->drvdata = d; bank->pin_base = ctrl->nr_pins; ctrl->nr_pins += bank->nr_pins;
drivers/pinctrl/pinctrl-samsung.h +2 -0
@@ -119,6 +119,7 @@ struct samsung_pinctrl_drv_data;* @irq_domain: IRQ domain of the bank. * @gpio_chip: GPIO chip of the bank. * @grange: linux gpio pin range supported by this bank. +* @slock: spinlock protecting bank registers */ struct samsung_pin_bank {u32 pctl_offset;
@@ -137,6 +138,7 @@ struct samsung_pin_bank {struct irq_domain *irq_domain;struct gpio_chip gpio_chip;struct pinctrl_gpio_range grange; +spinlock_t slock; };/**
Signature · 1 line
1.8.1.5
PATCH 1/6 pinctrl: samsung: Protect bank registers with a spinlock
Quoted 8 lines · Tomasz Figa
Certain pin control registers can be accessed from different contexts, i.e. pinctrl, gpio and irq functions. This makes the locking provided by pin control core insufficient.
This patch adds necessary locking using a per bank spinlock as it was done in the old Samsung GPIO driver.
Signed-off-by Tomasz Figa <[email protected]>
OK no reaction from the other Samsung maintainers so now I start applying these...
Patch applied!
Yours,
Linus Walleij
PATCH 2/6 pinctrl: samsung: Include pinctrl-exynos driver data conditionally
In reply to Tomasz FigaSince pinctrl-samsung is a common part of the pin control support for several Samsung SoCs, it can be compiled without Exynos support enabled.
This patch surrounds Exynos-specific driver data with ifdefs to include them only when support for Exynos is enabled.
--- drivers/pinctrl/pinctrl-samsung.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-samsung.c +2 -0
@@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) }static const struct of_device_id samsung_pinctrl_dt_match[] = { +#ifdef CONFIG_PINCTRL_EXYNOS4 { .compatible ="samsung,exynos4210-pinctrl" , .data = (void *)exynos4210_pin_ctrl }, { .compatible ="samsung,exynos4x12-pinctrl" , .data = (void *)exynos4x12_pin_ctrl }, +#endif {}, };MODULE_DEVICE_TABLE (of, samsung_pinctrl_dt_match);
Signature · 1 line
1.8.1.5
PATCH 2/6 pinctrl: samsung: Include pinctrl-exynos driver data conditionally
Quoted 16 lines · On Monday 18 of March 2013 22:31:51 Tomasz Figa wrote:
Since pinctrl-samsung is a common part of the pin control support for several Samsung SoCs, it can be compiled without Exynos support enabled.
This patch surrounds Exynos-specific driver data with ifdefs to include them only when support for Exynos is enabled.
Signed-off-by Tomasz Figa <[email protected]>--- drivers/pinctrl/pinctrl-samsung.c | 2 ++ 1 file changed, 2 insertions(+)(quoted diff) +0
-0
b/drivers/pinctrl/pinctrl-samsung.cindex b1d4ac8..f1fb562 100644
drivers/pinctrl/pinctrl-samsung.c static int samsung_pinctrl_probe(struct · line 971
Quoted 4 lines
drivers/pinctrl/pinctrl-samsung.c +1
-0@@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) }static const struct of_device_id samsung_pinctrl_dt_match[] = { +#ifdef CONFIG_PINCTRL_EXYNOS4
Oops... This should be CONFIG_PINCTRL_EXYNOS. It used to be EXYNOS4 in Kgene's tree (on which I usually base my patches) for some time, but it no longer is, but I forgot to change this during rebae.
Linus, if remaining patches turned out to be OK, would you fix this when applying?
Best regards,
Tomasz
PATCH 2/6 pinctrl: samsung: Include pinctrl-exynos driver data conditionally
Quoted 26 lines · Tomasz Figa
Quoted 16 lines · On Monday 18 of March 2013 22:31:51 Tomasz Figa wrote:
Since pinctrl-samsung is a common part of the pin control support for several Samsung SoCs, it can be compiled without Exynos support enabled.
This patch surrounds Exynos-specific driver data with ifdefs to include them only when support for Exynos is enabled.
Signed-off-by Tomasz Figa <[email protected]>--- drivers/pinctrl/pinctrl-samsung.c | 2 ++ 1 file changed, 2 insertions(+)(quoted diff) +0
-0
b/drivers/pinctrl/pinctrl-samsung.cindex b1d4ac8..f1fb562 100644drivers/pinctrl/pinctrl-samsung.c static int samsung_pinctrl_probe(struct · line 971
Quoted 4 lines
drivers/pinctrl/pinctrl-samsung.c +1
-0@@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) }static const struct of_device_id samsung_pinctrl_dt_match[] = { +#ifdef CONFIG_PINCTRL_EXYNOS4Oops... This should be
CONFIG_PINCTRL_EXYNOS. It used to be EXYNOS4 in Kgene's tree (on which I usually base my patches) for some time, but it no longer is, but I forgot to change this during rebae.
Quoted 2 lines
Linus, if remaining patches turned out to be OK, would you fix this when applying?
Fixed and applied.
Thanks!
Linus Walleij
PATCH 3/6 pinctrl: samsung: Split pin bank description into two structures
In reply to Tomasz FigaThis patch splits pin bank description into two structures, one describing bank type (currently only bitfield widths), which can be shared across multiple banks and second containing bank-specific parameters including a pointer to a bank type struct.
It is a prerequisite for further patch removing the statically hardcoded register offsets, making it impossible to support SoCs with different set and order of pin control registers.
--- drivers/pinctrl/pinctrl-exynos.c | 19 +++++++++++++++---- drivers/pinctrl/pinctrl-exynos.h | 16 +++------------- drivers/pinctrl/pinctrl-samsung.c | 24 +++++++++++++++--------- drivers/pinctrl/pinctrl-samsung.h | 26 ++++++++++++++++---------- 4 files changed, 49 insertions(+), 36 deletions(-)
drivers/pinctrl/pinctrl-exynos.c +15 -4
@@ -34,6 +34,15 @@#include "pinctrl-samsung.h" #include "pinctrl-exynos.h" + +static struct samsung_pin_bank_type bank_type_off = { + .fld_width = {4 ,1 ,2 ,2 ,2 ,2 , }, +}; + +static struct samsung_pin_bank_type bank_type_alive = { + .fld_width = {4 ,1 ,2 ,2 , }, +}; +/* list of external wakeup controllers supported */ static const struct of_device_id exynos_wkup_irq_ids[] = { { .compatible ="samsung,exynos4210-wakeup-eint" , },
@@ -76,6 +85,7 @@ static void exynos_gpio_irq_ack(struct irq_data *irqd)static int exynos_gpio_irq_set_type (struct irq_data *irqd,unsigned int type) {struct samsung_pin_bank *bank =irq_data_get_irq_chip_data (irqd); +struct samsung_pin_bank_type *bank_type = bank->type;struct samsung_pinctrl_drv_data *d = bank->drvdata;struct samsung_pin_ctrl *ctrl = d->ctrl;unsigned int pin = irqd->hwirq;
@@ -117,8 +127,8 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)writel (con, d->virt_base + reg_con); reg_con = bank->pctl_offset; - shift = pin * bank->func_width; - mask = (1 << bank->func_width) -1 ; + shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC ]; + mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ;spin_lock_irqsave (&bank->slock, flags);
@@ -259,6 +269,7 @@ static void exynos_wkup_irq_ack(struct irq_data *irqd)static int exynos_wkup_irq_set_type (struct irq_data *irqd,unsigned int type) {struct samsung_pin_bank *bank =irq_data_get_irq_chip_data (irqd); +struct samsung_pin_bank_type *bank_type = bank->type;struct samsung_pinctrl_drv_data *d = bank->drvdata;unsigned int pin = irqd->hwirq;unsigned long reg_con = d->ctrl->weint_con + bank->eint_offset;
@@ -299,8 +310,8 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type)writel (con, d->virt_base + reg_con); reg_con = bank->pctl_offset; - shift = pin * bank->func_width; - mask = (1 << bank->func_width) -1 ; + shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC ]; + mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ;spin_lock_irqsave (&bank->slock, flags);
drivers/pinctrl/pinctrl-exynos.h +3 -13
@@ -48,26 +48,18 @@#define EXYNOS_PIN_BANK_EINTN (pins, reg, id) \ { \ + .type = &bank_type_off, \ .pctl_offset = reg, \ .nr_pins = pins, \ - .func_width = 4, \ - .pud_width = 2, \ - .drv_width = 2, \ - .conpdn_width = 2, \ - .pudpdn_width = 2, \ .eint_type = EINT_TYPE_NONE, \ .name = id \ }#define EXYNOS_PIN_BANK_EINTG (pins, reg, id, offs) \ { \ + .type = &bank_type_off, \ .pctl_offset = reg, \ .nr_pins = pins, \ - .func_width = 4, \ - .pud_width = 2, \ - .drv_width = 2, \ - .conpdn_width = 2, \ - .pudpdn_width = 2, \ .eint_type = EINT_TYPE_GPIO, \ .eint_offset = offs, \ .name = id \
@@ -75,11 +67,9 @@#define EXYNOS_PIN_BANK_EINTW (pins, reg, id, offs) \ { \ + .type = &bank_type_alive, \ .pctl_offset = reg, \ .nr_pins = pins, \ - .func_width = 4, \ - .pud_width = 2, \ - .drv_width = 2, \ .eint_type = EINT_TYPE_WKUP, \ .eint_offset = offs, \ .name = id \
drivers/pinctrl/pinctrl-samsung.c +15 -9
@@ -300,10 +300,13 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,* pin function number in the config register. */ for (cnt =0 ; cnt < drvdata->pin_groups[group].num_pins; cnt++) { +struct samsung_pin_bank_type *type; +pin_to_reg_bank (drvdata, pins[cnt] - drvdata->ctrl->base, ®, &pin_offset, &bank); - mask = (1 << bank->func_width) -1 ; - shift = pin_offset * bank->func_width; + type = bank->type; + mask = (1 << type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; + shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC ];spin_lock_irqsave (&bank->slock, flags);
@@ -340,6 +343,7 @@ static void samsung_pinmux_disable(struct pinctrl_dev *pctldev,static int samsung_pinmux_gpio_set_direction (struct pinctrl_dev *pctldev,struct pinctrl_gpio_range *range,unsigned offset,bool input) { +struct samsung_pin_bank_type *type;struct samsung_pin_bank *bank;struct samsung_pinctrl_drv_data *drvdata;void __iomem *reg;
@@ -347,13 +351,14 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,unsigned long flags; bank =gc_to_pin_bank (range->gc); + type = bank->type; drvdata =pinctrl_dev_get_drvdata (pctldev); pin_offset = offset - bank->pin_base; reg = drvdata->virt_base + bank->pctl_offset; - mask = (1 << bank->func_width) -1 ; - shift = pin_offset * bank->func_width; + mask = (1 << type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; + shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC ];spin_lock_irqsave (&bank->slock, flags);
@@ -383,6 +388,7 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin, unsigned long *config, bool set) {struct samsung_pinctrl_drv_data *drvdata; +struct samsung_pin_bank_type *type;struct samsung_pin_bank *bank;void __iomem *reg_base;enum pincfg_type cfg_type =PINCFG_UNPACK_TYPE (*config);
@@ -393,22 +399,19 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin, drvdata =pinctrl_dev_get_drvdata (pctldev);pin_to_reg_bank (drvdata, pin - drvdata->ctrl->base, ®_base, &pin_offset, &bank); + type = bank->type;switch (cfg_type) {case PINCFG_TYPE_PUD : - width = bank->pud_width; cfg_reg =PUD_REG ;break ;case PINCFG_TYPE_DRV : - width = bank->drv_width; cfg_reg =DRV_REG ;break ;case PINCFG_TYPE_CON_PDN : - width = bank->conpdn_width; cfg_reg =CONPDN_REG ;break ;case PINCFG_TYPE_PUD_PDN : - width = bank->pudpdn_width; cfg_reg =PUDPDN_REG ;break ;default :
@@ -416,9 +419,11 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin,return -EINVAL ; } -if (!width) +if (cfg_type >=PINCFG_TYPE_NUM || !type->fld_width[cfg_type])return -EINVAL ; + width = type->fld_width[cfg_type]; +spin_lock_irqsave (&bank->slock, flags); mask = (1 << width) -1 ;
@@ -497,6 +502,7 @@ static const struct pinconf_ops samsung_pinconf_ops = {static void samsung_gpio_set (struct gpio_chip *gc,unsigned offset,int value) {struct samsung_pin_bank *bank =gc_to_pin_bank (gc); +struct samsung_pin_bank_type *type = bank->type;unsigned long flags;void __iomem *reg;u32 data;
drivers/pinctrl/pinctrl-samsung.h +16 -10
@@ -37,16 +37,22 @@/** * enum pincfg_type - possible pin configuration types supported. +* @PINCFG_TYPE_FUNC: Function configuration. +* @PINCFG_TYPE_DAT: Pin value configuration. * @PINCFG_TYPE_PUD: Pull up/down configuration. * @PINCFG_TYPE_DRV: Drive strength configuration. * @PINCFG_TYPE_CON_PDN: Pin function in power down mode. * @PINCFG_TYPE_PUD_PDN: Pull up/down configuration in power down mode. */ enum pincfg_type { +PINCFG_TYPE_FUNC , +PINCFG_TYPE_DAT ,PINCFG_TYPE_PUD ,PINCFG_TYPE_DRV ,PINCFG_TYPE_CON_PDN ,PINCFG_TYPE_PUD_PDN , + +PINCFG_TYPE_NUM };/*
@@ -103,15 +109,19 @@ enum eint_type {struct samsung_pinctrl_drv_data ;/** +* struct samsung_pin_bank_type: pin bank type description +* @fld_width: widths of configuration bitfields (0 if unavailable) +*/ +struct samsung_pin_bank_type { +u8 fld_width[PINCFG_TYPE_NUM ]; +}; + +/** * struct samsung_pin_bank: represent a controller pin-bank. +* @type: type of the bank (register offsets and bitfield widths) * @pctl_offset: starting offset of the pin-bank registers. * @pin_base: starting pin number of the bank. * @nr_pins: number of pins included in this bank. -* @func_width: width of the function selector bit field. -* @pud_width: width of the pin pull up/down selector bit field. -* @drv_width: width of the pin driver strength selector bit field. -* @conpdn_width: width of the sleep mode function selector bin field. -* @pudpdn_width: width of the sleep mode pull up/down selector bit field. * @eint_type: type of the external interrupt supported by the bank. * @name: name to be prefixed for each pin in this pin bank. * @of_node: OF node of the bank.
@@ -122,14 +132,10 @@ struct samsung_pinctrl_drv_data;* @slock: spinlock protecting bank registers */ struct samsung_pin_bank { +struct samsung_pin_bank_type *type;u32 pctl_offset;u32 pin_base;u8 nr_pins; -u8 func_width; -u8 pud_width; -u8 drv_width; -u8 conpdn_width; -u8 pudpdn_width;enum eint_type eint_type;u32 eint_offset;char *name;
Signature · 1 line
1.8.1.5
PATCH 3/6 pinctrl: samsung: Split pin bank description into two structures
Quoted 10 lines · Tomasz Figa
This patch splits pin bank description into two structures, one describing bank type (currently only bitfield widths), which can be shared across multiple banks and second containing bank-specific parameters including a pointer to a bank type struct.
It is a prerequisite for further patch removing the statically hardcoded register offsets, making it impossible to support SoCs with different set and order of pin control registers.
Signed-off-by Tomasz Figa <[email protected]>
I'd like an ACK from Thomas Abraham on this patch.
Thanks,
Linus Walleij
PATCH 3/6 pinctrl: samsung: Split pin bank description into two structures
In reply to Tomasz FigaQuoted 10 lines · Tomasz Figa
This patch splits pin bank description into two structures, one describing bank type (currently only bitfield widths), which can be shared across multiple banks and second containing bank-specific parameters including a pointer to a bank type struct.
It is a prerequisite for further patch removing the statically hardcoded register offsets, making it impossible to support SoCs with different set and order of pin control registers.
Signed-off-by Tomasz Figa <[email protected]>
Patch applied.
Yours,
Linus Walleij
PATCH 4/6 pinctrl: samsung: Remove hardcoded register offsets
In reply to Tomasz FigaThis patch replaces statically hardcoded register offsets of Exynos SoCs with an array of register offsets in samsung_pin_bank_type struct.
Thanks to this change, support for SoCs with other set and order of registers can be added (e.g. S3C24xx and S3C64xx).
--- drivers/pinctrl/pinctrl-exynos.c | 6 ++++-- drivers/pinctrl/pinctrl-samsung.c | 37 +++++++++---------------------------- drivers/pinctrl/pinctrl-samsung.h | 9 ++------- 3 files changed, 15 insertions(+), 37 deletions(-)
drivers/pinctrl/pinctrl-exynos.c +4 -2
@@ -37,10 +37,12 @@static struct samsung_pin_bank_type bank_type_off = { .fld_width = {4 ,1 ,2 ,2 ,2 ,2 , }, + .reg_offset = {0x00 ,0x04 ,0x08 ,0x0c ,0x10 ,0x14 , }, };static struct samsung_pin_bank_type bank_type_alive = { .fld_width = {4 ,1 ,2 ,2 , }, + .reg_offset = {0x00 ,0x04 ,0x08 ,0x0c , }, };/* list of external wakeup controllers supported */
@@ -126,7 +128,7 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) con |= trig_type << shift;writel (con, d->virt_base + reg_con); - reg_con = bank->pctl_offset; + reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC ]; shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC ]; mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ;
@@ -309,7 +311,7 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type) con |= trig_type << shift;writel (con, d->virt_base + reg_con); - reg_con = bank->pctl_offset; + reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC ]; shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC ]; mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ;
drivers/pinctrl/pinctrl-samsung.c +9 -28
@@ -275,10 +275,6 @@ static void pin_to_reg_bank(struct samsung_pinctrl_drv_data *drvdata, *offset = pin - b->pin_base;if (bank) *bank = b; - -/* some banks have two config registers in a single bank */ -if (*offset * b->func_width >BITS_PER_LONG ) - *reg +=4 ; }/* enable or disable a pinmux function */
@@ -310,11 +306,11 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,spin_lock_irqsave (&bank->slock, flags); - data =readl (reg); + data =readl (reg + type->reg_offset[PINCFG_TYPE_FUNC ]); data &= ~(mask << shift);if (enable) data |= drvdata->pin_groups[group].func << shift; -writel (data, reg); +writel (data, reg + type->reg_offset[PINCFG_TYPE_FUNC ]);spin_unlock_irqrestore (&bank->slock, flags); }
@@ -355,7 +351,8 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev, drvdata =pinctrl_dev_get_drvdata (pctldev); pin_offset = offset - bank->pin_base; - reg = drvdata->virt_base + bank->pctl_offset; + reg = drvdata->virt_base + bank->pctl_offset + + type->reg_offset[PINCFG_TYPE_FUNC ]; mask = (1 << type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC ];
@@ -401,28 +398,11 @@ static int samsung_pinconf_rw(struct pinctrl_dev *pctldev, unsigned int pin, &pin_offset, &bank); type = bank->type; -switch (cfg_type) { -case PINCFG_TYPE_PUD : - cfg_reg =PUD_REG ; -break ; -case PINCFG_TYPE_DRV : - cfg_reg =DRV_REG ; -break ; -case PINCFG_TYPE_CON_PDN : - cfg_reg =CONPDN_REG ; -break ; -case PINCFG_TYPE_PUD_PDN : - cfg_reg =PUDPDN_REG ; -break ; -default : -WARN_ON (1 ); -return -EINVAL ; - } -if (cfg_type >=PINCFG_TYPE_NUM || !type->fld_width[cfg_type])return -EINVAL ; width = type->fld_width[cfg_type]; + cfg_reg = type->reg_offset[cfg_type];spin_lock_irqsave (&bank->slock, flags);
@@ -511,11 +491,11 @@ static void samsung_gpio_set(struct gpio_chip *gc, unsigned offset, int value)spin_lock_irqsave (&bank->slock, flags); - data =readl (reg +DAT_REG ); + data =readl (reg + type->reg_offset[PINCFG_TYPE_DAT ]); data &= ~(1 << offset);if (value) data |=1 << offset; -writel (data, reg +DAT_REG ); +writel (data, reg + type->reg_offset[PINCFG_TYPE_DAT ]);spin_unlock_irqrestore (&bank->slock, flags); }
@@ -526,10 +506,11 @@ static int samsung_gpio_get(struct gpio_chip *gc, unsigned offset)void __iomem *reg;u32 data;struct samsung_pin_bank *bank =gc_to_pin_bank (gc); +struct samsung_pin_bank_type *type = bank->type; reg = bank->drvdata->virt_base + bank->pctl_offset; - data =readl (reg +DAT_REG ); + data =readl (reg + type->reg_offset[PINCFG_TYPE_DAT ]); data >>= offset; data &=1 ;return data;
drivers/pinctrl/pinctrl-samsung.h +2 -7
@@ -25,13 +25,6 @@#include <linux/gpio.h> -/* register offsets within a pin bank */ -#define DAT_REG 0x4 -#define PUD_REG 0x8 -#define DRV_REG 0xC -#define CONPDN_REG 0x10 -#define PUDPDN_REG 0x14 -/* pinmux function number for pin as gpio output line */ #define FUNC_OUTPUT 0x1
@@ -111,9 +104,11 @@ struct samsung_pinctrl_drv_data;/** * struct samsung_pin_bank_type: pin bank type description * @fld_width: widths of configuration bitfields (0 if unavailable) +* @reg_offset: offsets of configuration registers (don't care of width is 0) */ struct samsung_pin_bank_type {u8 fld_width[PINCFG_TYPE_NUM ]; +u8 reg_offset[PINCFG_TYPE_NUM ]; };/**
Signature · 1 line
1.8.1.5
PATCH 4/6 pinctrl: samsung: Remove hardcoded register offsets
Quoted 7 lines · Tomasz Figa
This patch replaces statically hardcoded register offsets of Exynos SoCs with an array of register offsets in
samsung_pin_bank_typestruct.Thanks to this change, support for SoCs with other set and order of registers can be added (e.g. S3C24xx and S3C64xx).
Signed-off-by Tomasz Figa <[email protected]>
Patch applied.
Yours,
Linus Walleij
PATCH 5/6 pinctrl: samsung: Handle banks with two configuration registers
In reply to Tomasz FigaThis patch adds support for banks that have more than one function configuration registers, e.g. some of the banks of S3C64xx SoCs.
--- drivers/pinctrl/pinctrl-samsung.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pinctrl/pinctrl-samsung.c +10 -0
@@ -303,6 +303,11 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector, type = bank->type; mask = (1 << type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC ]; +if (shift >=32 ) { +/* Some banks have two config registers */ + shift -=32 ; + reg +=4 ; + }spin_lock_irqsave (&bank->slock, flags);
@@ -356,6 +361,11 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev, mask = (1 << type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC ]; +if (shift >=32 ) { +/* Some banks have two config registers */ + shift -=32 ; + reg +=4 ; + }spin_lock_irqsave (&bank->slock, flags);
Signature · 1 line
1.8.1.5
PATCH 5/6 pinctrl: samsung: Handle banks with two configuration registers
Quoted 4 lines · Tomasz Figa
This patch adds support for banks that have more than one function configuration registers, e.g. some of the banks of S3C64xx SoCs.
Signed-off-by Tomasz Figa <[email protected]>
Patch applied.
Yours,
Linus Walleij
PATCH 6/6 pinctrl: Add pinctrl-s3c64xx driver
In reply to Tomasz FigaThis patch adds pinctrl-s3c64xx driver which implements pin control interface for Samsung S3C64xx SoCs.
--- .../bindings/pinctrl/samsung-pinctrl.txt | 3 + drivers/pinctrl/Kconfig | 5 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-s3c64xx.c | 817 +++++++++++++++++++++ drivers/pinctrl/pinctrl-samsung.c | 4 + drivers/pinctrl/pinctrl-samsung.h | 5 + 6 files changed, 835 insertions(+) create mode 100644 drivers/pinctrl/pinctrl-s3c64xx.c
Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +3 -0
@@ -7,6 +7,7 @@ on-chip controllers onto these pads. Required Properties: - compatible: should be one of the following. + - "samsung,s3c64xx-pinctrl": for S3C64xx-compatible pin-controller, - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller. - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller. - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.
@@ -105,6 +106,8 @@ B. External Wakeup Interrupts: For supporting external wakeup interrupts, a - compatible: identifies the type of the external wakeup interrupt controller The possible values are: + - samsung,s3c64xx-wakeup-eint: represents wakeup interrupt controller + found on Samsung S3C64xx SoCs, - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller found on Samsung Exynos4210 SoC. - interrupt-parent: phandle of the interrupt parent to which the external
drivers/pinctrl/Kconfig +5 -0
@@ -227,6 +227,11 @@ config PINCTRL_EXYNOS5440 select PINMUX select PINCONF +config PINCTRL_S3C64XX + bool "Samsung S3C64XX SoC pinctrl driver" + depends on ARCH_S3C64XX + select PINCTRL_SAMSUNG + source "drivers/pinctrl/mvebu/Kconfig" source "drivers/pinctrl/sh-pfc/Kconfig" source "drivers/pinctrl/spear/Kconfig"
drivers/pinctrl/Makefile +1 -0
@@ -45,6 +45,7 @@ obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o obj-$(CONFIG_PINCTRL_EXYNOS) += pinctrl-exynos.o obj-$(CONFIG_PINCTRL_EXYNOS5440) += pinctrl-exynos5440.o +obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o
drivers/pinctrl/pinctrl-s3c64xx.c new file +817 -0
817 lines not on this page · raw message
drivers/pinctrl/pinctrl-samsung.c +4 -0
@@ -971,6 +971,10 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { { .compatible = "samsung,exynos4x12-pinctrl", .data = (void *)exynos4x12_pin_ctrl }, #endif +#ifdef CONFIG_PINCTRL_S3C64XX + { .compatible = "samsung,s3c64xx-pinctrl", + .data = s3c64xx_pin_ctrl }, +#endif {}, }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);
drivers/pinctrl/pinctrl-samsung.h +5 -0
@@ -117,7 +117,9 @@ struct samsung_pin_bank_type {* @pctl_offset: starting offset of the pin-bank registers. * @pin_base: starting pin number of the bank. * @nr_pins: number of pins included in this bank. +* @eint_func: function to set in CON register to configure pin as EINT. * @eint_type: type of the external interrupt supported by the bank. +* @eint_mask: bit mask of pins which support EINT function. * @name: name to be prefixed for each pin in this pin bank. * @of_node: OF node of the bank. * @drvdata: link to controller driver data
@@ -131,7 +133,9 @@ struct samsung_pin_bank {u32 pctl_offset;u32 pin_base;u8 nr_pins; +u8 eint_func;enum eint_type eint_type; +u32 eint_mask;u32 eint_offset;char *name;struct device_node *of_node;
@@ -240,5 +244,6 @@ struct samsung_pmx_func {/* list of all exported SoC specific data */ extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[]; +extern struct samsung_pin_ctrl s3c64xx_pin_ctrl[];#endif /* __PINCTRL_SAMSUNG_H */
Signature · 1 line
1.8.1.5
PATCH 6/6 pinctrl: Add pinctrl-s3c64xx driver
Quoted 4 lines · Tomasz Figa
This patch adds pinctrl-s3c64xx driver which implements pin control interface for Samsung S3C64xx SoCs.
Signed-off-by Tomasz Figa <[email protected]>
Yes it's long over due that we fix up the S3C family, thanks a lot for doing this Tomasz, and sorry for taking so long to review the patches.
Patch applied!
Yours,
Linus Walleij
cover pinctrl: Add support for pin control on S3C64xx
In reply to Tomasz FigaHi,
Quoted 26 lines · On Monday 18 of March 2013 22:31:49 Tomasz Figa wrote:
This series makes necessary preparations to add support for pin controller available on Samsung S3C64xx using pinctrl-samsung driver and then adds pinctrl-s3c64xx driver which implements SoC-specific part of the code.
It has been tested on a tiny6410 (mini6410-compatible) board with my patches for samsung-time cleanup and S3C64xx Device Tree support:
- http://thread.gmane.org/gmane.linux.kernel.samsung-soc/16664
-
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg16325. htmlJust the driver is added for now, as this is the part that can safely go through Linus' pinctrl tree. I will post appropriate enablement patches after all the dependencies get merged to Kgene's tree.
See particular patches for more detailed description of all changes.
Tomasz Figa (6):
pinctrl: samsung: Protect bank registers with a spinlock
pinctrl: samsung: Include pinctrl-exynos driver data conditionally
pinctrl: samsung: Split pin bank description into two structures
pinctrl: samsung: Remove hardcoded register offsets
pinctrl: samsung: Handle banks with two configuration registers
pinctrl: Add pinctrl-s3c64xx driver
Quoted 11 lines
.../bindings/pinctrl/samsung-pinctrl.txt | 3 + drivers/pinctrl/Kconfig | 5 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-exynos.c | 36 +- drivers/pinctrl/pinctrl-exynos.h | 16 +- drivers/pinctrl/pinctrl-s3c64xx.c | 817 +++++++++++++++++++++ drivers/pinctrl/pinctrl-samsung.c | 99 ++- drivers/pinctrl/pinctrl-samsung.h | 42 +- 8 files changed, 947 insertions(+), 72 deletions(-) create mode 100644 drivers/pinctrl/pinctrl-s3c64xx.c
Any comments about this series?
Best regards,
Tomasz