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

Merge branch 'samsung/pinctrl' into next/drivers

Browse Source 
A few fixups for the samsung pinctrl series

* samsung/pinctrl:
  pinctrl: exynos: Fix wakeup IRQ domain registration check
  pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
  pinctrl: exynos: Correct the detection of wakeup-eint node
  pinctrl: exynos: Mark exynos_irq_demux_eint as inline
  pinctrl: exynos: Handle only unmasked wakeup interrupts
  pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
  pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
This commit is contained in:
Olof Johansson
2012-09-21 22:56:52 -07:00
parent 78901d05e7 d3c977927b
commit 04ef037c92
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/pinctrl/pinctrl-exynos.c
View File

@ -58,7 +58,7 @@ static void exynos_gpio_irq_mask(struct irq_data *irqd)
unsigned long mask; unsigned long mask;
mask = readl(d->virt_base + reg_mask); mask = readl(d->virt_base + reg_mask);
mask |= ~(1 << edata->pin); mask |= 1 << edata->pin;
writel(mask, d->virt_base + reg_mask); writel(mask, d->virt_base + reg_mask);
} }
@ -76,9 +76,11 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
struct samsung_pinctrl_drv_data *d = irqd->domain->host_data; struct samsung_pinctrl_drv_data *d = irqd->domain->host_data;
struct samsung_pin_ctrl *ctrl = d->ctrl; struct samsung_pin_ctrl *ctrl = d->ctrl;
struct exynos_geint_data *edata = irq_data_get_irq_handler_data(irqd); struct exynos_geint_data *edata = irq_data_get_irq_handler_data(irqd);
struct samsung_pin_bank *bank = edata->bank;
unsigned int shift = EXYNOS_EINT_CON_LEN * edata->pin; unsigned int shift = EXYNOS_EINT_CON_LEN * edata->pin;
unsigned int con, trig_type; unsigned int con, trig_type;
unsigned long reg_con = ctrl->geint_con + edata->eint_offset; unsigned long reg_con = ctrl->geint_con + edata->eint_offset;
unsigned int mask;
switch (type) { switch (type) {
case IRQ_TYPE_EDGE_RISING: case IRQ_TYPE_EDGE_RISING:
@ -110,6 +112,16 @@ static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
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, d->virt_base + reg_con);
reg_con = bank->pctl_offset;
shift = edata->pin * bank->func_width;
mask = (1 << bank->func_width) - 1;
con = readl(d->virt_base + reg_con);
con &= ~(mask << shift);
con |= EXYNOS_EINT_FUNC << shift;
writel(con, d->virt_base + reg_con);
return 0; return 0;
} }
@ -278,7 +290,7 @@ static void exynos_wkup_irq_mask(struct irq_data *irqd)
unsigned long mask; unsigned long mask;
mask = readl(d->virt_base + reg_mask); mask = readl(d->virt_base + reg_mask);
mask &= ~(1 << pin); mask |= 1 << pin;
writel(mask, d->virt_base + reg_mask); writel(mask, d->virt_base + reg_mask);
} }
@ -364,7 +376,7 @@ static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
chained_irq_exit(chip, desc); chained_irq_exit(chip, desc);
} }
static void exynos_irq_demux_eint(int irq_base, unsigned long pend, static inline void exynos_irq_demux_eint(int irq_base, unsigned long pend,
struct irq_domain *domain) struct irq_domain *domain)
{ {
unsigned int irq; unsigned int irq;
@ -383,12 +395,15 @@ static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)
struct exynos_weint_data *eintd = irq_get_handler_data(irq); struct exynos_weint_data *eintd = irq_get_handler_data(irq);
struct samsung_pinctrl_drv_data *d = eintd->domain->host_data; struct samsung_pinctrl_drv_data *d = eintd->domain->host_data;
unsigned long pend; unsigned long pend;
unsigned long mask;
chained_irq_enter(chip, desc); chained_irq_enter(chip, desc);
pend = readl(d->virt_base + d->ctrl->weint_pend + 0x8); pend = readl(d->virt_base + d->ctrl->weint_pend + 0x8);
exynos_irq_demux_eint(16, pend, eintd->domain); mask = readl(d->virt_base + d->ctrl->weint_mask + 0x8);
exynos_irq_demux_eint(16, pend & ~mask, eintd->domain);
pend = readl(d->virt_base + d->ctrl->weint_pend + 0xC); pend = readl(d->virt_base + d->ctrl->weint_pend + 0xC);
exynos_irq_demux_eint(24, pend, eintd->domain); mask = readl(d->virt_base + d->ctrl->weint_mask + 0xC);
exynos_irq_demux_eint(24, pend & ~mask, eintd->domain);
chained_irq_exit(chip, desc); chained_irq_exit(chip, desc);
} }
@ -416,19 +431,23 @@ static const struct irq_domain_ops exynos_wkup_irqd_ops = {
static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
{ {
struct device *dev = d->dev; struct device *dev = d->dev;
struct device_node *wkup_np; struct device_node *wkup_np = NULL;
struct device_node *np;
struct exynos_weint_data *weint_data; struct exynos_weint_data *weint_data;
int idx, irq; int idx, irq;
wkup_np = of_find_matching_node(dev->of_node, exynos_wkup_irq_ids); for_each_child_of_node(dev->of_node, np) {
if (!wkup_np) { if (of_match_node(exynos_wkup_irq_ids, np)) {
dev_err(dev, "wakeup controller node not found\n"); wkup_np = np;
return -ENODEV; break;
}
} }
if (!wkup_np)
return -ENODEV;
d->wkup_irqd = irq_domain_add_linear(wkup_np, d->ctrl->nr_wint, d->wkup_irqd = irq_domain_add_linear(wkup_np, d->ctrl->nr_wint,
&exynos_wkup_irqd_ops, d); &exynos_wkup_irqd_ops, d);
if (!d->gpio_irqd) { if (!d->wkup_irqd) {
dev_err(dev, "wakeup irq domain allocation failed\n"); dev_err(dev, "wakeup irq domain allocation failed\n");
return -ENXIO; return -ENXIO;
} }

1
drivers/pinctrl/pinctrl-exynos.h
View File

@ -144,6 +144,7 @@ enum exynos4210_gpio_xc_start {
#define EXYNOS_WKUP_EMASK_OFFSET 0xF00 #define EXYNOS_WKUP_EMASK_OFFSET 0xF00
#define EXYNOS_WKUP_EPEND_OFFSET 0xF40 #define EXYNOS_WKUP_EPEND_OFFSET 0xF40
#define EXYNOS_SVC_OFFSET 0xB08 #define EXYNOS_SVC_OFFSET 0xB08
#define EXYNOS_EINT_FUNC 0xF
/* helpers to access interrupt service register */ /* helpers to access interrupt service register */
#define EXYNOS_SVC_GROUP_SHIFT 3 #define EXYNOS_SVC_GROUP_SHIFT 3

2
drivers/pinctrl/pinctrl-samsung.c
View File

@ -776,7 +776,7 @@ static int __init samsung_gpiolib_unregister(struct platform_device *pdev,
static const struct of_device_id samsung_pinctrl_dt_match[]; static const struct of_device_id samsung_pinctrl_dt_match[];
/* retrieve the soc specific data */ /* retrieve the soc specific data */
static inline struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data( static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data(
struct platform_device *pdev) struct platform_device *pdev)
{ {
int id; int id;