iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: lynxpoint: Reuse struct intel_pinctrl in the driver

Browse Source 
We may use now available struct intel_pinctrl in the driver.
No functional change implied.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Andy Shevchenko 2019-11-25 20:49:44 +02:00
parent cecddda7ca
commit 18213ad418
1 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/pinctrl/intel/pinctrl-lynxpoint.c
View File

@ -168,13 +168,6 @@ static const struct intel_pinctrl_soc_data lptlp_soc_data = {
#define GPINDIS_BIT BIT(2) /* disable input sensing */ #define GPINDIS_BIT BIT(2) /* disable input sensing */
#define GPIWP_BIT (BIT(0) | BIT(1)) /* weak pull options */ #define GPIWP_BIT (BIT(0) | BIT(1)) /* weak pull options */
struct lp_gpio {
struct gpio_chip chip;
struct device *dev;
raw_spinlock_t lock;
void __iomem *regs;
};
/* /*
* Lynxpoint gpios are controlled through both bitmapped registers and * Lynxpoint gpios are controlled through both bitmapped registers and
* per gpio specific registers. The bitmapped registers are in chunks of * per gpio specific registers. The bitmapped registers are in chunks of
@ -204,12 +197,34 @@ struct lp_gpio {
* LP94_CONFIG2 (gpio 94) ... * LP94_CONFIG2 (gpio 94) ...
*/ */
static struct intel_community *lp_get_community(struct intel_pinctrl *lg,
unsigned int pin)
{
struct intel_community *comm;
int i;
for (i = 0; i < lg->ncommunities; i++) {
comm = &lg->communities[i];
if (pin < comm->pin_base + comm->npins && pin >= comm->pin_base)
return comm;
}
return NULL;
}
static void __iomem *lp_gpio_reg(struct gpio_chip *chip, unsigned int offset, static void __iomem *lp_gpio_reg(struct gpio_chip *chip, unsigned int offset,
int reg) int reg)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
struct intel_community *comm;
int reg_offset; int reg_offset;
comm = lp_get_community(lg, offset);
if (!comm)
return NULL;
offset -= comm->pin_base;
if (reg == LP_CONFIG1 || reg == LP_CONFIG2) if (reg == LP_CONFIG1 || reg == LP_CONFIG2)
/* per gpio specific config registers */ /* per gpio specific config registers */
reg_offset = offset * 8; reg_offset = offset * 8;
@ -217,10 +232,10 @@ static void __iomem *lp_gpio_reg(struct gpio_chip *chip, unsigned int offset,
/* bitmapped registers */ /* bitmapped registers */
reg_offset = (offset / 32) * 4; reg_offset = (offset / 32) * 4;
return lg->regs + reg + reg_offset; return comm->regs + reg_offset + reg;
} }
static bool lp_gpio_acpi_use(struct lp_gpio *lg, unsigned int pin) static bool lp_gpio_acpi_use(struct intel_pinctrl *lg, unsigned int pin)
{ {
void __iomem *acpi_use; void __iomem *acpi_use;
@ -233,7 +248,7 @@ static bool lp_gpio_acpi_use(struct lp_gpio *lg, unsigned int pin)
static int lp_gpio_request(struct gpio_chip *chip, unsigned int offset) static int lp_gpio_request(struct gpio_chip *chip, unsigned int offset)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1); void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1);
void __iomem *conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2); void __iomem *conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2);
u32 value; u32 value;
@ -259,7 +274,7 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned int offset)
static void lp_gpio_free(struct gpio_chip *chip, unsigned int offset) static void lp_gpio_free(struct gpio_chip *chip, unsigned int offset)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2); void __iomem *conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2);
/* disable input sensing */ /* disable input sensing */
@ -276,7 +291,7 @@ static int lp_gpio_get(struct gpio_chip *chip, unsigned int offset)
static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value) static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1); void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1);
unsigned long flags; unsigned long flags;
@ -292,7 +307,7 @@ static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1); void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1);
unsigned long flags; unsigned long flags;
@ -306,7 +321,7 @@ static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
int value) int value)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1); void __iomem *reg = lp_gpio_reg(chip, offset, LP_CONFIG1);
unsigned long flags; unsigned long flags;
@ -333,7 +348,7 @@ static void lp_gpio_irq_handler(struct irq_desc *desc)
{ {
struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_data *data = irq_desc_get_irq_data(desc);
struct gpio_chip *gc = irq_desc_get_handler_data(desc); struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct lp_gpio *lg = gpiochip_get_data(gc); struct intel_pinctrl *lg = gpiochip_get_data(gc);
struct irq_chip *chip = irq_data_get_irq_chip(data); struct irq_chip *chip = irq_data_get_irq_chip(data);
void __iomem *reg, *ena; void __iomem *reg, *ena;
unsigned long pending; unsigned long pending;
@ -360,7 +375,7 @@ static void lp_gpio_irq_handler(struct irq_desc *desc)
static void lp_irq_ack(struct irq_data *d) static void lp_irq_ack(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct lp_gpio *lg = gpiochip_get_data(gc); struct intel_pinctrl *lg = gpiochip_get_data(gc);
u32 hwirq = irqd_to_hwirq(d); u32 hwirq = irqd_to_hwirq(d);
void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_STAT); void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_STAT);
unsigned long flags; unsigned long flags;
@ -381,7 +396,7 @@ static void lp_irq_mask(struct irq_data *d)
static void lp_irq_enable(struct irq_data *d) static void lp_irq_enable(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct lp_gpio *lg = gpiochip_get_data(gc); struct intel_pinctrl *lg = gpiochip_get_data(gc);
u32 hwirq = irqd_to_hwirq(d); u32 hwirq = irqd_to_hwirq(d);
void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_ENABLE); void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_ENABLE);
unsigned long flags; unsigned long flags;
@ -394,7 +409,7 @@ static void lp_irq_enable(struct irq_data *d)
static void lp_irq_disable(struct irq_data *d) static void lp_irq_disable(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct lp_gpio *lg = gpiochip_get_data(gc); struct intel_pinctrl *lg = gpiochip_get_data(gc);
u32 hwirq = irqd_to_hwirq(d); u32 hwirq = irqd_to_hwirq(d);
void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_ENABLE); void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_INT_ENABLE);
unsigned long flags; unsigned long flags;
@ -407,7 +422,7 @@ static void lp_irq_disable(struct irq_data *d)
static int lp_irq_set_type(struct irq_data *d, unsigned int type) static int lp_irq_set_type(struct irq_data *d, unsigned int type)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct lp_gpio *lg = gpiochip_get_data(gc); struct intel_pinctrl *lg = gpiochip_get_data(gc);
u32 hwirq = irqd_to_hwirq(d); u32 hwirq = irqd_to_hwirq(d);
void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_CONFIG1); void __iomem *reg = lp_gpio_reg(&lg->chip, hwirq, LP_CONFIG1);
unsigned long flags; unsigned long flags;
@ -466,7 +481,7 @@ static struct irq_chip lp_irqchip = {
static int lp_gpio_irq_init_hw(struct gpio_chip *chip) static int lp_gpio_irq_init_hw(struct gpio_chip *chip)
{ {
struct lp_gpio *lg = gpiochip_get_data(chip); struct intel_pinctrl *lg = gpiochip_get_data(chip);
void __iomem *reg; void __iomem *reg;
unsigned int base; unsigned int base;
@ -484,18 +499,32 @@ static int lp_gpio_irq_init_hw(struct gpio_chip *chip)
static int lp_gpio_probe(struct platform_device *pdev) static int lp_gpio_probe(struct platform_device *pdev)
{ {
struct lp_gpio *lg; const struct intel_pinctrl_soc_data *soc;
struct intel_pinctrl *lg;
struct gpio_chip *gc; struct gpio_chip *gc;
struct resource *io_rc, *irq_rc; struct resource *io_rc, *irq_rc;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
void __iomem *regs; void __iomem *regs;
unsigned int i;
int ret; int ret;
soc = (const struct intel_pinctrl_soc_data *)device_get_match_data(dev);
if (!soc)
return -ENODEV;
lg = devm_kzalloc(dev, sizeof(*lg), GFP_KERNEL); lg = devm_kzalloc(dev, sizeof(*lg), GFP_KERNEL);
if (!lg) if (!lg)
return -ENOMEM; return -ENOMEM;
lg->dev = dev; lg->dev = dev;
lg->soc = soc;
lg->ncommunities = lg->soc->ncommunities;
lg->communities = devm_kcalloc(dev, lg->ncommunities,
sizeof(*lg->communities), GFP_KERNEL);
if (!lg->communities)
return -ENOMEM;
platform_set_drvdata(pdev, lg); platform_set_drvdata(pdev, lg);
io_rc = platform_get_resource(pdev, IORESOURCE_IO, 0); io_rc = platform_get_resource(pdev, IORESOURCE_IO, 0);
@ -510,7 +539,14 @@ static int lp_gpio_probe(struct platform_device *pdev)
return -EBUSY; return -EBUSY;
} }
lg->regs = regs; for (i = 0; i < lg->soc->ncommunities; i++) {
struct intel_community *comm = &lg->communities[i];
*comm = lg->soc->communities[i];
comm->regs = regs;
comm->pad_regs = regs + 0x100;
}
raw_spin_lock_init(&lg->lock); raw_spin_lock_init(&lg->lock);
@ -578,7 +614,7 @@ static int lp_gpio_runtime_resume(struct device *dev)
static int lp_gpio_resume(struct device *dev) static int lp_gpio_resume(struct device *dev)
{ {
struct lp_gpio *lg = dev_get_drvdata(dev); struct intel_pinctrl *lg = dev_get_drvdata(dev);
void __iomem *reg; void __iomem *reg;
int i; int i;