ARM: S5P: Add support for gpio interrupts
Subsystems (3)
PATCH v3 1/1 ARM: S5P: Add support for gpio interrupts
Hello,
This patch series adds support for gpio interrupts on Samsung S5P SoC series (S5PC100 and S5PC110/S5PV210). It is based on the previous version created by Joonyoung Shim (which is available from the "[PATCH v2 0/4] ARM: S5P: Support gpio interrupts" thread:
http://comments.gmane.org/gmane.linux.kernel.samsung-soc/1662 ).
This version has been redesigned to assign irq numbers dynamically to reduce resource waste. Such idea has proposed by Ben Dooks some time ago (see "[PATCH] ARM: S5P: Dynamicly numbered GPIO interrupt support"
thread: http://comments.gmane.org/gmane.linux.kernel.samsung-soc/1198 ).
The last patch in this series is an example how to use the dynamically registered gpio interrupt. The QT602240 touch screen device on Goni machine requires it.
The patch series has been rebased onto latest kgene/for-next kernel tree.
The complete list of patches:
[PATCH 1/6] ARM: Samsung: Add common s5p gpio interrupt support [PATCH 2/6] ARM: S5PC110: add support for gpio interrupts [PATCH 3/6] ARM: S5PC100: Use generic S5P gpio interrupts interface [PATCH 4/6] ARM: S5PC100: Move external interrupt defines [PATCH 5/6] ARM: Samsung: Add common samsung_gpiolib_to_irq function [PATCH 6/6] ARM: S5PC110: GONI: Add support for QT602240 TS driver
Best regards
Signature · 2 lines
Marek Szyprowski Samsung Poland R&D Center
PATCH 1/6 ARM: Samsung: Add common s5p gpio interrupt support
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the s5p_register_gpio_interrupt() function.
--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 5 + arch/arm/plat-s5p/irq-gpioint.c | 243 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-s5p/Kconfig +5 -0
@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than external interrupts.) + config S5P_DEV_FIMC0 bool help
arch/arm/plat-s5p/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devices
arch/arm/plat-s5p/include/plat/irqs.h +5 -0
@@ -94,4 +94,9 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) + 16 - S5P_EINT_BASE2)) +/* GPIO interrupt (registered by s5p_register_gpio_interrupt) */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8 +#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT * S5P_GPIOINT_GROUP_SIZE) +#endif /* __ASM_PLAT_S5P_IRQS_H */
arch/arm/plat-s5p/irq-gpioint.c new file +243 -0
243 lines not on this page · raw message
arch/arm/plat-samsung/include/plat/gpio-cfg.h +18 -0
@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);*/ extern int s5p_gpio_set_drvstr (unsigned int pin,s5p_gpio_drvstr_t drvstr); +/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio group +* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series. Registering +* irq support for all of them would be a resource waste. Because of that the +* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been registered +* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the group +* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */
arch/arm/plat-samsung/include/plat/gpio-core.h +4 -0
@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper for specific implementation of gpio * @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. +* @group: The group register number for gpio interrupt support. +* @irq_base: The base irq number. * @config: special function and pull-resistor control information. * @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support.
@@ -63,6 +65,8 @@ struct s3c_gpio_chip {struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +int irq_base; +int group;spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ];
Signature · 1 line
1.7.2.2
PATCH 1/6 ARM: Samsung: Add common s5p gpio interrupt support
Quoted 8 lines · Marek Szyprowski
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the
s5p_register_gpio_interrupt()function.
Hi,
I checked only S5PV210/S5PC110 GPIO interrupt.
Quoted 20 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 5 + arch/arm/plat-s5p/irq-gpioint.c | 243 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/Kconfig +0
-0
arch/arm/plat-s5p/Kconfig config S5P_EXT_INT · line 38
Quoted 7 lines
arch/arm/plat-s5p/Kconfig +4
-0@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than external
interrupts.)
Quoted 22 lines
arch/arm/plat-s5p/Kconfig +1
-0+ config S5P_DEV_FIMC0 bool helparch/arm/plat-s5p/Makefile +1
-0@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devicesarch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 3fb3a3a..50bcf1e 100644
arch/arm/plat-s5p/include/plat/irqs.h line 100
Quoted 7 lines
arch/arm/plat-s5p/include/plat/irqs.h +3
-0@@ -94,4 +94,9 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) + 16 - S5P_EINT_BASE2)) +/* GPIO interrupt (registered by s5p_register_gpio_interrupt) */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8
Is it possible to support S5P SoCs GPIO interrupt with only 4-GROUPs?
Review
Quoted 5 lines
arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT *
S5P_GPIOINT_GROUP_SIZE)arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#endif /* __ASM_PLAT_S5P_IRQS_H */ (quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-s5p/irq-gpioint.c line 8
Quoted 13 lines
new file mode 100644
index 0000000..7409ae0arch/arm/plat-s5p/irq-gpioint.c new file +8
-0@@ -0,0 +1,243 @@ +/* linux/arch/arm/plat-s5p/irq-gpioint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* Author: Kyungmin Park <[email protected]> +* Author: Joonyoung Shim <[email protected]> +* Author: Marek Szyprowski <[email protected]> +* +* This program is free software; you can redistribute it and/or modify
it
arch/arm/plat-s5p/irq-gpioint.c line 9
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* under the terms of the GNU General Public License as published by
the
arch/arm/plat-s5p/irq-gpioint.c line 10
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* Free Software Foundation; either version 2 of the License, or (at
your
Quoted 15 lines
arch/arm/plat-s5p/irq-gpioint.c new file +15
-0+* option) any later version. +* +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/gpio.h> + +#include <mach/map.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> + +#define S5P_GPIOREG (x) (S5P_VA_GPIO + (x))
arch/arm/plat-s5p/irq-gpioint.c line 35
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+ +#define GPIOINT_CON_OFFSET 0x700 +#define GPIOINT_MASK_OFFSET 0x900 +#define GPIOINT_PEND_OFFSET 0xA00 + +#define GPIOINT_LEVEL_LOW 0x0 +#define GPIOINT_LEVEL_HIGH 0x1 +#define GPIOINT_EDGE_FALLING 0x2 +#define GPIOINT_EDGE_RISING 0x3 +#define GPIOINT_EDGE_BOTH 0x4
I remember Kyungmin's patch about interrupt polarity of GPIO Interrupt and GPIO External Interrupt.
How about merging them into plat-s5p/include
Hmm...let's think the proper name...
arch/arm/plat-s5p/irq-gpioint.c line 37
Quoted 2 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ +static struct s3c_gpio_chip *irq_chips[S5P_GPIOINT_GROUP_MAXNR ];
Where is the definition of S5P_GPIOINT_GROUP_MAXNR?
Quoted 98 lines
arch/arm/plat-s5p/irq-gpioint.c new file +34
-0+ +static int s5p_gpioint_get_group (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); +int group; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) +if (s3c_chip == irq_chips[group]) +break ; + +return group; +} + +static int s5p_gpioint_get_offset (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return irq - s3c_chip->irq_base; +} + +static void s5p_gpioint_ack (unsigned int irq) +{ +int group, offset, pend_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + pend_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_mask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_unmask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value &= ~(1 << offset); + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +28
-0+} + +static void s5p_gpioint_mask_ack (unsigned int irq) +{ +s5p_gpioint_mask (irq); +s5p_gpioint_ack (irq); +} + +static int s5p_gpioint_set_type (unsigned int irq,unsigned int type) +{ +int group, offset, con_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + con_offset = group <<2 ; + +switch (type) { +case IRQ_TYPE_NONE : +printk (KERN_WARNING "No irq type\n" ); +return -EINVAL ; +case IRQ_TYPE_EDGE_RISING : + type =GPIOINT_EDGE_RISING ; +break ; +case IRQ_TYPE_EDGE_FALLING : + type =GPIOINT_EDGE_FALLING ; +break ; +case IRQ_TYPE_EDGE_BOTH :
arch/arm/plat-s5p/irq-gpioint.c line 139
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+ type =GPIOINT_EDGE_BOTH ; +break ; +case IRQ_TYPE_LEVEL_HIGH : + type =GPIOINT_LEVEL_HIGH ; +break ; +case IRQ_TYPE_LEVEL_LOW : + type =GPIOINT_LEVEL_LOW ; +break ; +default : +BUG ();
how about merging IRQ_TYPE_NONE and 'default'?
And basically, rerely happened exception case, so it's better move IRQ_TYPE_NONE to later in switch case.
arch/arm/plat-s5p/irq-gpioint.c line 143
Quoted 5 lines
arch/arm/plat-s5p/irq-gpioint.c new file +3
-0+ } + + value = __raw_readl(S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+ value &= ~(0xf << (offset *0x4 ));
0x7 is enough on S5PV210...but need to check another S5P SoCs.
arch/arm/plat-s5p/irq-gpioint.c line 151
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |= (type << (offset *0x4 )); + __raw_writel(value, S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +6
-0+ +return 0 ; +} + +struct irq_chip s5p_gpioint = { + .name ="GPIO" ,
how about s5p-gpioint?
Quoted 18 lines
arch/arm/plat-s5p/irq-gpioint.c new file +18
-0+ .ack = s5p_gpioint_ack, + .mask = s5p_gpioint_mask, + .mask_ack = s5p_gpioint_mask_ack, + .unmask = s5p_gpioint_unmask, + .set_type = s5p_gpioint_set_type, +}; + +static void s5p_gpioint_handler (unsigned int irq,struct irq_desc *desc) +{ +int group, offset, pend_offset, mask_offset; +int real_irq; +unsigned int pend, mask; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) { + pend_offset = group <<2 ; + pend =__raw_readl (S5P_GPIOREG (GPIOINT_PEND_OFFSET ) + + pend_offset); +if (!pend)
arch/arm/plat-s5p/irq-gpioint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+continue ; + + mask_offset = group <<2 ; + mask =__raw_readl (S5P_GPIOREG (GPIOINT_MASK_OFFSET ) + + mask_offset); + pend &= ~mask; + +for (offset =0 ; offset <8 ; offset++) { +if (pend & (1 << offset)) { + struct s3c_gpio_chip *chip =
irq_chips[group];
Quoted 11 lines
arch/arm/plat-s5p/irq-gpioint.c new file +11
-0+if (chip) { + real_irq = chip->irq_base + offset; +generic_handle_irq (real_irq); + } + } + } + } +} + +static __init int s5p_gpioint_add (struct s3c_gpio_chip *chip) +{
arch/arm/plat-s5p/irq-gpioint.c line 200
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+static int used_gpioint_groups =0 ; +static bool handler_registered =0 ; +int irq, group = chip->group; +int i; + +if (used_gpioint_groups >=S5P_GPIOINT_GROUP_COUNT ) +return -ENOMEM ; + + chip->irq_base =S5P_GPIOINT_BASE + + used_gpioint_groups *S5P_GPIOINT_GROUP_SIZE ;
Where is S5P_GPIOINT_BASE?
arch/arm/plat-s5p/irq-gpioint.c line 204
Quoted 4 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+ used_gpioint_groups++; + +if (!handler_registered) { +set_irq_chained_handler (IRQ_GPIOINT , s5p_gpioint_handler);
As you know, IRQ_GPIOINT defined only in the mach-s5p6442, mach-s5pc100 and mach-s5pv210.
It means can be happend build error with mach-s5p64x0 or mach-s5pv310.
arch/arm/plat-s5p/irq-gpioint.c line 212
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c new file +8
-0+ handler_registered =1 ; + } + + irq_chips[group] = chip; +for (i =0 ; i < chip->chip.ngpio; i++) { + irq = chip->irq_base + i; +set_irq_chip (irq, &s5p_gpioint); +set_irq_data (irq, &chip->chip);
Do we really need set_irq_data?
Review
Quoted 33 lines
arch/arm/plat-s5p/irq-gpioint.c new file +26
-0+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } +return 0 ; +} + +int __init s5p_register_gpio_interrupt(int pin) +{ + struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); + int offset, group; + int ret; + + if (!my_chip) + return -EINVAL; + + offset = pin - my_chip->chip.base; + group = my_chip->group; + + /* check if the group has been already registered */ + if (my_chip->irq_base) + return my_chip->irq_base + offset; + + /* register gpio group */ + ret = s5p_gpioint_add(my_chip); + if (ret == 0) { + printk(KERN_INFO "Registered interrupt support for gpiogroup %d.\n",
arch/arm/plat-s5p/irq-gpioint.c new file +5
-0+ group); +return my_chip->irq_base + offset; + } +return ret; +}(quoted diff) +0
-0
b/arch/arm/plat-
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 171
Quoted 8 lines
samsung/include/plat/gpio-cfg.h
index db4112c..41479a0 100644arch/arm/plat-samsung/include/plat/gpio-cfg.h +0
-0@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsignedint pin); */ extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t
drvstr);
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 173
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio
group
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +6
-0+* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series.
Registering
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 180
Quoted 1 line
arch/arm/plat-samsung/include/plat/gpio-cfg.h +1
-0+* irq support for all of them would be a resource waste. Because of that
the
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +3
-0+* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been
registered
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 185
Quoted 2 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the
group
Review
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +4
-0+* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */ (quoted diff) +0
-0
b/arch/arm/plat-
Quoted 14 lines
samsung/include/plat/gpio-core.h
index e358c7d..c22c27c 100644arch/arm/plat-samsung/include/plat/gpio-core.h +2
-0@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper for specific implementation of gpio * @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. +* @group: The group register number for gpio interrupt support. +* @irq_base: The base irq number. * @config: special function and pull-resistor control information. * @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support.
arch/arm/plat-samsung/include/plat/gpio-core.h struct s3c_gpio_chip {
Quoted 9 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +2
-1@@ -63,6 +65,8 @@ struct s3c_gpio_chip {struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +int irq_base; +int group;spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ]; --
I need sleeping :-)
Will continue tomorrow.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 1/6 ARM: Samsung: Add common s5p gpio interrupt support
Hello,
Quoted 68 lines · Kukjin Kim
Quoted 8 lines · Marek Szyprowski
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the
s5p_register_gpio_interrupt()function.Hi,
I checked only S5PV210/S5PC110 GPIO interrupt.
Quoted 20 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 5 + arch/arm/plat-s5p/irq-gpioint.c | 243 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/Kconfig +0
-0arch/arm/plat-s5p/Kconfig config S5P_EXT_INT · line 38
Quoted 7 lines
arch/arm/plat-s5p/Kconfig +4
-0@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than externalinterrupts.)
Quoted 26 lines
arch/arm/plat-s5p/Kconfig +1
-0+ config S5P_DEV_FIMC0 bool helparch/arm/plat-s5p/Makefile +1
-0@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devicesarch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 3fb3a3a..50bcf1e 100644arch/arm/plat-s5p/include/plat/irqs.h +0
-0@@ -94,4 +94,9 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) +16 - S5P_EINT_BASE2))
Quoted 5 lines
arch/arm/plat-s5p/include/plat/irqs.h line 99
Quoted 3 lines
arch/arm/plat-s5p/include/plat/irqs.h +3
-0+/* GPIO interrupt (registered by s5p_register_gpio_interrupt) */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8Is it possible to support S5P SoCs GPIO interrupt with only 4-GROUPs?
Yes, it won't be a problem. Just 4 interrupt slots will be wasted. Not a bit problem imho.
Quoted 46 lines
Review
Quoted 6 lines
arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT *
S5P_GPIOINT_GROUP_SIZE)arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#endif /* __ASM_PLAT_S5P_IRQS_H */ (quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/irq-gpioint.c line 8
Quoted 13 lines
new file mode 100644
index 0000000..7409ae0arch/arm/plat-s5p/irq-gpioint.c new file +8
-0@@ -0,0 +1,243 @@ +/* linux/arch/arm/plat-s5p/irq-gpioint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* Author: Kyungmin Park <[email protected]> +* Author: Joonyoung Shim <[email protected]> +* Author: Marek Szyprowski <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it
arch/arm/plat-s5p/irq-gpioint.c line 9
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* under the terms of the GNU General Public License as published by the
arch/arm/plat-s5p/irq-gpioint.c line 10
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* Free Software Foundation; either version 2 of the License, or (at your
Quoted 21 lines
arch/arm/plat-s5p/irq-gpioint.c new file +21
-0+* option) any later version. +* +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/gpio.h> + +#include <mach/map.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> + +#define S5P_GPIOREG (x) (S5P_VA_GPIO + (x)) + +#define GPIOINT_CON_OFFSET 0x700 +#define GPIOINT_MASK_OFFSET 0x900 +#define GPIOINT_PEND_OFFSET 0xA00 + +#define GPIOINT_LEVEL_LOW 0x0
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 35
Quoted 4 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+#define GPIOINT_LEVEL_HIGH 0x1 +#define GPIOINT_EDGE_FALLING 0x2 +#define GPIOINT_EDGE_RISING 0x3 +#define GPIOINT_EDGE_BOTH 0x4I remember Kyungmin's patch about interrupt polarity of GPIO Interrupt and GPIO External Interrupt.
How about merging them into plat-s5p/include
I'm ok with this.
Quoted 6 lines
Hmm...let's think the proper name...
arch/arm/plat-s5p/irq-gpioint.c line 37
Quoted 2 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ +static struct s3c_gpio_chip *irq_chips[S5P_GPIOINT_GROUP_MAXNR ];Where is the definition of
S5P_GPIOINT_GROUP_MAXNR?
It will be defined by the proper user of the common irq-gpioint.c code. See the next commit ("ARM: S5PC110: add support for gpio interrupts"). To avoid any build breaks irq-gpioint.c code is compiled conditionally if selected by the machine that requires/uses it.
Quoted 104 lines
Quoted 104 lines
arch/arm/plat-s5p/irq-gpioint.c new file +34
-0+ +static int s5p_gpioint_get_group (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); +int group; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) +if (s3c_chip == irq_chips[group]) +break ; + +return group; +} + +static int s5p_gpioint_get_offset (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return irq - s3c_chip->irq_base; +} + +static void s5p_gpioint_ack (unsigned int irq) +{ +int group, offset, pend_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + pend_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_mask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_unmask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value &= ~(1 << offset); + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +34
-0+} + +static void s5p_gpioint_mask_ack (unsigned int irq) +{ +s5p_gpioint_mask (irq); +s5p_gpioint_ack (irq); +} + +static int s5p_gpioint_set_type (unsigned int irq,unsigned int type) +{ +int group, offset, con_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + con_offset = group <<2 ; + +switch (type) { +case IRQ_TYPE_NONE : +printk (KERN_WARNING "No irq type\n" ); +return -EINVAL ; +case IRQ_TYPE_EDGE_RISING : + type =GPIOINT_EDGE_RISING ; +break ; +case IRQ_TYPE_EDGE_FALLING : + type =GPIOINT_EDGE_FALLING ; +break ; +case IRQ_TYPE_EDGE_BOTH : + type =GPIOINT_EDGE_BOTH ; +break ; +case IRQ_TYPE_LEVEL_HIGH : + type =GPIOINT_LEVEL_HIGH ; +break ; +case IRQ_TYPE_LEVEL_LOW :
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 139
Quoted 4 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+ type =GPIOINT_LEVEL_LOW ; +break ; +default : +BUG ();how about merging
IRQ_TYPE_NONEand 'default'?
And basically, rerely happened exception case, so it's better moveIRQ_TYPE_NONEto later in switch case.
Ok, I can change this.
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 143
Quoted 5 lines
arch/arm/plat-s5p/irq-gpioint.c new file +3
-0+ } + + value = __raw_readl(S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+ value &= ~(0xf << (offset *0x4 ));
0x7is enough on S5PV210...but need to check another S5P SoCs.
Quoted 11 lines
arch/arm/plat-s5p/irq-gpioint.c line 151
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |= (type << (offset *0x4 )); + __raw_writel(value, S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +6
-0+ +return 0 ; +} + +struct irq_chip s5p_gpioint = { + .name ="GPIO" ,how about s5p-gpioint?
ok, no problem.
Quoted 45 lines
Quoted 19 lines
arch/arm/plat-s5p/irq-gpioint.c new file +18
-0+ .ack = s5p_gpioint_ack, + .mask = s5p_gpioint_mask, + .mask_ack = s5p_gpioint_mask_ack, + .unmask = s5p_gpioint_unmask, + .set_type = s5p_gpioint_set_type, +}; + +static void s5p_gpioint_handler (unsigned int irq,struct irq_desc *desc) +{ +int group, offset, pend_offset, mask_offset; +int real_irq; +unsigned int pend, mask; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) { + pend_offset = group <<2 ; + pend =__raw_readl (S5P_GPIOREG (GPIOINT_PEND_OFFSET ) + + pend_offset); +if (!pend)arch/arm/plat-s5p/irq-gpioint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+continue ; + + mask_offset = group <<2 ; + mask =__raw_readl (S5P_GPIOREG (GPIOINT_MASK_OFFSET ) + + mask_offset); + pend &= ~mask; + +for (offset =0 ; offset <8 ; offset++) { +if (pend & (1 << offset)) { + struct s3c_gpio_chip *chip =irq_chips[group];
Quoted 15 lines
arch/arm/plat-s5p/irq-gpioint.c new file +15
-0+if (chip) { + real_irq = chip->irq_base + offset; +generic_handle_irq (real_irq); + } + } + } + } +} + +static __init int s5p_gpioint_add (struct s3c_gpio_chip *chip) +{ +static int used_gpioint_groups =0 ; +static bool handler_registered =0 ; +int irq, group = chip->group; +int i;
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 200
Quoted 6 lines
arch/arm/plat-s5p/irq-gpioint.c new file +6
-0+ +if (used_gpioint_groups >=S5P_GPIOINT_GROUP_COUNT ) +return -ENOMEM ; + + chip->irq_base =S5P_GPIOINT_BASE + + used_gpioint_groups *S5P_GPIOINT_GROUP_SIZE ;Where is
S5P_GPIOINT_BASE?
see the next commit...
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c line 204
Quoted 5 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+ used_gpioint_groups++; + +if (!handler_registered) { +set_irq_chained_handler (IRQ_GPIOINT , s5p_gpioint_handler);As you know,
IRQ_GPIOINTdefined only in the mach-s5p6442, mach-s5pc100 and mach-s5pv210.
It means can be happend build error with mach-s5p64x0 or mach-s5pv310.
Nope, this code is compiled conditionally only if the platform requires/supports it.
Quoted 11 lines
arch/arm/plat-s5p/irq-gpioint.c line 212
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c new file +8
-0+ handler_registered =1 ; + } + + irq_chips[group] = chip; +for (i =0 ; i < chip->chip.ngpio; i++) { + irq = chip->irq_base + i; +set_irq_chip (irq, &s5p_gpioint); +set_irq_data (irq, &chip->chip);Do we really need
set_irq_data?
Yes, to get the gpio bank group number in s5p_gpioint_get_group() function.
Quoted 89 lines
Review
Quoted 34 lines
arch/arm/plat-s5p/irq-gpioint.c new file +26
-0+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } +return 0 ; +} + +int __init s5p_register_gpio_interrupt(int pin) +{ + struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); + int offset, group; + int ret; + + if (!my_chip) + return -EINVAL; + + offset = pin - my_chip->chip.base; + group = my_chip->group; + + /* check if the group has been already registered */ + if (my_chip->irq_base) + return my_chip->irq_base + offset; + + /* register gpio group */ + ret = s5p_gpioint_add(my_chip); + if (ret == 0) { + printk(KERN_INFO "Registered interrupt support for gpiogroup %d.\n",
arch/arm/plat-s5p/irq-gpioint.c new file +5
-0+ group); +return my_chip->irq_base + offset; + } +return ret; +}(quoted diff) +0
-0b/arch/arm/plat-
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 171
Quoted 8 lines
samsung/include/plat/gpio-cfg.h
index db4112c..41479a0 100644arch/arm/plat-samsung/include/plat/gpio-cfg.h +0
-0@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsignedint pin); */ extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_tdrvstr);
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 173
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio group
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +6
-0+* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series. Registering
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 180
Quoted 1 line
arch/arm/plat-samsung/include/plat/gpio-cfg.h +1
-0+* irq support for all of them would be a resource waste. Because of that the
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +3
-0+* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been registered
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 185
Quoted 2 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the group
Review
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +4
-0+* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */ (quoted diff) +0
-0b/arch/arm/plat-
Quoted 18 lines
samsung/include/plat/gpio-core.h
index e358c7d..c22c27c 100644arch/arm/plat-samsung/include/plat/gpio-core.h +3
-0@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper for specific implementation of gpio * @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. +* @group: The group register number for gpio interrupt support. +* @irq_base: The base irq number. * @config: special function and pull-resistor control information. * @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support. @@ -63,6 +65,8 @@ struct s3c_gpio_chip {struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +int irq_base;
Quoted 8 lines
arch/arm/plat-samsung/include/plat/gpio-core.h struct s3c_gpio_chip {
Quoted 5 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +1
-1+int group;spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ]; --I need sleeping :-)
Will continue tomorrow.
Ok.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 1/6 ARM: Samsung: Add common s5p gpio interrupt support
Hi Marek,
On Sep 28, 2010 11:24 PM, "Marek Szyprowski"
<[email protected]> wrote:> Hello,
Quoted 284 lines · Kukjin Kim
Quoted 69 lines
Quoted 8 lines · Marek Szyprowski
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the
s5p_register_gpio_interrupt()function.Hi,
I checked only S5PV210/S5PC110 GPIO interrupt.
Quoted 20 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 5 + arch/arm/plat-s5p/irq-gpioint.c | 243 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/Kconfig +0
-0arch/arm/plat-s5p/Kconfig config S5P_EXT_INT · line 38
Quoted 7 lines
arch/arm/plat-s5p/Kconfig +4
-0@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than externalinterrupts.)
Quoted 26 lines
arch/arm/plat-s5p/Kconfig +1
-0+ config S5P_DEV_FIMC0 bool helparch/arm/plat-s5p/Makefile +1
-0@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devicesarch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 3fb3a3a..50bcf1e 100644arch/arm/plat-s5p/include/plat/irqs.h +0
-0@@ -94,4 +94,9 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) +16 - S5P_EINT_BASE2))Quoted 5 lines
arch/arm/plat-s5p/include/plat/irqs.h line 99
Quoted 3 lines
arch/arm/plat-s5p/include/plat/irqs.h +3
-0+/* GPIO interrupt (registered by s5p_register_gpio_interrupt) */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8Is it possible to support S5P SoCs GPIO interrupt with only 4-GROUPs?
Yes, it won't be a problem. Just 4 interrupt slots will be wasted. Not a bit problem imho.
Quoted 46 lines
Review
Quoted 6 lines
arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT *
S5P_GPIOINT_GROUP_SIZE)arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#endif /* __ASM_PLAT_S5P_IRQS_H */ (quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/irq-gpioint.c line 8
Quoted 13 lines
new file mode 100644
index 0000000..7409ae0arch/arm/plat-s5p/irq-gpioint.c new file +8
-0@@ -0,0 +1,243 @@ +/* linux/arch/arm/plat-s5p/irq-gpioint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* Author: Kyungmin Park <[email protected]> +* Author: Joonyoung Shim <[email protected]> +* Author: Marek Szyprowski <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it
arch/arm/plat-s5p/irq-gpioint.c line 9
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* under the terms of the GNU General Public License as published by the
arch/arm/plat-s5p/irq-gpioint.c line 10
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* Free Software Foundation; either version 2 of the License, or (at your
Quoted 21 lines
arch/arm/plat-s5p/irq-gpioint.c new file +21
-0+* option) any later version. +* +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/gpio.h> + +#include <mach/map.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> + +#define S5P_GPIOREG (x) (S5P_VA_GPIO + (x)) + +#define GPIOINT_CON_OFFSET 0x700 +#define GPIOINT_MASK_OFFSET 0x900 +#define GPIOINT_PEND_OFFSET 0xA00 + +#define GPIOINT_LEVEL_LOW 0x0Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 35
Quoted 4 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+#define GPIOINT_LEVEL_HIGH 0x1 +#define GPIOINT_EDGE_FALLING 0x2 +#define GPIOINT_EDGE_RISING 0x3 +#define GPIOINT_EDGE_BOTH 0x4I remember Kyungmin's patch about interrupt polarity of GPIO Interrupt and GPIO External Interrupt.
How about merging them into plat-s5p/includeI'm ok with this.
Quoted 6 lines
Hmm...let's think the proper name...
arch/arm/plat-s5p/irq-gpioint.c line 37
Quoted 2 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ +static struct s3c_gpio_chip *irq_chips[S5P_GPIOINT_GROUP_MAXNR ];Where is the definition of
S5P_GPIOINT_GROUP_MAXNR?It will be defined by the proper user of the common
irq-gpioint.ccode. See the next commit ("ARM: S5PC110: add support for gpio interrupts"). To avoid any build breaksirq-gpioint.ccode is compiled conditionally if selected by the machine that requires/uses it.Quoted 104 lines
Quoted 104 lines
arch/arm/plat-s5p/irq-gpioint.c new file +34
-0+ +static int s5p_gpioint_get_group (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); +int group; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) +if (s3c_chip == irq_chips[group]) +break ; + +return group; +} + +static int s5p_gpioint_get_offset (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return irq - s3c_chip->irq_base; +} + +static void s5p_gpioint_ack (unsigned int irq) +{ +int group, offset, pend_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + pend_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_mask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_unmask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value &= ~(1 << offset); + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +34
-0+} + +static void s5p_gpioint_mask_ack (unsigned int irq) +{ +s5p_gpioint_mask (irq); +s5p_gpioint_ack (irq); +} + +static int s5p_gpioint_set_type (unsigned int irq,unsigned int type) +{ +int group, offset, con_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + con_offset = group <<2 ; + +switch (type) { +case IRQ_TYPE_NONE : +printk (KERN_WARNING "No irq type\n" ); +return -EINVAL ; +case IRQ_TYPE_EDGE_RISING : + type =GPIOINT_EDGE_RISING ; +break ; +case IRQ_TYPE_EDGE_FALLING : + type =GPIOINT_EDGE_FALLING ; +break ; +case IRQ_TYPE_EDGE_BOTH : + type =GPIOINT_EDGE_BOTH ; +break ; +case IRQ_TYPE_LEVEL_HIGH : + type =GPIOINT_LEVEL_HIGH ; +break ; +case IRQ_TYPE_LEVEL_LOW :Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 139
Quoted 4 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+ type =GPIOINT_LEVEL_LOW ; +break ; +default : +BUG ();how about merging
IRQ_TYPE_NONEand 'default'?
And basically, rerely happened exception case, so it's better moveIRQ_TYPE_NONEto later in switch case.Ok, I can change this.
Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 143
Quoted 5 lines
arch/arm/plat-s5p/irq-gpioint.c new file +3
-0+ } + + value = __raw_readl(S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+ value &= ~(0xf << (offset *0x4 ));
0x7is enough on S5PV210...but need to check another S5P SoCs.Quoted 11 lines
arch/arm/plat-s5p/irq-gpioint.c line 151
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |= (type << (offset *0x4 )); + __raw_writel(value, S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +6
-0+ +return 0 ; +} + +struct irq_chip s5p_gpioint = { + .name ="GPIO" ,how about s5p-gpioint?
Quoted 1 line
ok, no problem.
Please use the GPIO as is, I don't like s5p- prefix.
It's not major issue. I want to use normal way like VIC, GIC, PIC and so on. It's displayed at /proc/interrupts so no need to add *int suffix.
Thank you
Kyungmin Park
Quoted 161 lines
Quoted 46 lines
Quoted 20 lines
arch/arm/plat-s5p/irq-gpioint.c new file +18
-0+ .ack = s5p_gpioint_ack, + .mask = s5p_gpioint_mask, + .mask_ack = s5p_gpioint_mask_ack, + .unmask = s5p_gpioint_unmask, + .set_type = s5p_gpioint_set_type, +}; + +static void s5p_gpioint_handler (unsigned int irq,struct irq_desc *desc) +{ +int group, offset, pend_offset, mask_offset; +int real_irq; +unsigned int pend, mask; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) { + pend_offset = group <<2 ; + pend =__raw_readl (S5P_GPIOREG (GPIOINT_PEND_OFFSET ) + + pend_offset); +if (!pend)arch/arm/plat-s5p/irq-gpioint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+continue ; + + mask_offset = group <<2 ; + mask =__raw_readl (S5P_GPIOREG (GPIOINT_MASK_OFFSET ) + + mask_offset); + pend &= ~mask; + +for (offset =0 ; offset <8 ; offset++) { +if (pend & (1 << offset)) { + struct s3c_gpio_chip *chip =irq_chips[group];
Quoted 15 lines
arch/arm/plat-s5p/irq-gpioint.c new file +15
-0+if (chip) { + real_irq = chip->irq_base + offset; +generic_handle_irq (real_irq); + } + } + } + } +} + +static __init int s5p_gpioint_add (struct s3c_gpio_chip *chip) +{ +static int used_gpioint_groups =0 ; +static bool handler_registered =0 ; +int irq, group = chip->group; +int i;Quoted 8 lines
arch/arm/plat-s5p/irq-gpioint.c line 200
Quoted 6 lines
arch/arm/plat-s5p/irq-gpioint.c new file +6
-0+ +if (used_gpioint_groups >=S5P_GPIOINT_GROUP_COUNT ) +return -ENOMEM ; + + chip->irq_base =S5P_GPIOINT_BASE + + used_gpioint_groups *S5P_GPIOINT_GROUP_SIZE ;Where is
S5P_GPIOINT_BASE?see the next commit...
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c line 204
Quoted 5 lines
arch/arm/plat-s5p/irq-gpioint.c new file +4
-0+ used_gpioint_groups++; + +if (!handler_registered) { +set_irq_chained_handler (IRQ_GPIOINT , s5p_gpioint_handler);As you know,
IRQ_GPIOINTdefined only in the mach-s5p6442, mach-s5pc100 and mach-s5pv210.
It means can be happend build error with mach-s5p64x0 or mach-s5pv310.Nope, this code is compiled conditionally only if the platform requires/supports it.
Quoted 11 lines
arch/arm/plat-s5p/irq-gpioint.c line 212
Quoted 9 lines
arch/arm/plat-s5p/irq-gpioint.c new file +8
-0+ handler_registered =1 ; + } + + irq_chips[group] = chip; +for (i =0 ; i < chip->chip.ngpio; i++) { + irq = chip->irq_base + i; +set_irq_chip (irq, &s5p_gpioint); +set_irq_data (irq, &chip->chip);Do we really need
set_irq_data?Yes, to get the gpio bank group number in
s5p_gpioint_get_group()function.Quoted 77 lines
Review
Quoted 34 lines
arch/arm/plat-s5p/irq-gpioint.c new file +26
-0+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } +return 0 ; +} + +int __init s5p_register_gpio_interrupt(int pin) +{ + struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); + int offset, group; + int ret; + + if (!my_chip) + return -EINVAL; + + offset = pin - my_chip->chip.base; + group = my_chip->group; + + /* check if the group has been already registered */ + if (my_chip->irq_base) + return my_chip->irq_base + offset; + + /* register gpio group */ + ret = s5p_gpioint_add(my_chip); + if (ret == 0) { + printk(KERN_INFO "Registered interrupt support for gpiogroup %d.\n",
arch/arm/plat-s5p/irq-gpioint.c new file +5
-0+ group); +return my_chip->irq_base + offset; + } +return ret; +}(quoted diff) +0
-0b/arch/arm/plat-
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 171
Quoted 8 lines
samsung/include/plat/gpio-cfg.h
index db4112c..41479a0 100644arch/arm/plat-samsung/include/plat/gpio-cfg.h +0
-0@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsignedint pin); */ extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_tdrvstr);
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 173
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio group
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +6
-0+* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series. Registering
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 180
Quoted 1 line
arch/arm/plat-samsung/include/plat/gpio-cfg.h +1
-0+* irq support for all of them would be a resource waste. Because of that the
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +3
-0+* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been registered
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 185
Quoted 2 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the group
Review
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +4
-0+* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */ (quoted diff) +0
-0b/arch/arm/plat-
Quoted 6 lines
samsung/include/plat/gpio-core.h
index e358c7d..c22c27c 100644arch/arm/plat-samsung/include/plat/gpio-core.h +0
-0@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper
PATCH v4 1/1 ARM: Samsung: Add common s5p gpio interrupt support
In reply to Marek SzyprowskiThis patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the s5p_register_gpio_interrupt() function.
---
Changes since v3:
- merged default and IRQ_TYPE_NONE cases in s5p_gpioint_set_type function
- fixed mask in GPIOINT_CON_OFFSET register from 0xf to 0x7
- renamed the chip to s5p_gpioint to match the s5p_extint style
- extended comments in plat/irqs.h
--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 9 + arch/arm/plat-s5p/irq-gpioint.c | 242 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 279 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-s5p/Kconfig +5 -0
@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440 and S5P6450. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than external interrupts.) + config S5P_DEV_FIMC0 bool help
arch/arm/plat-s5p/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devices
arch/arm/plat-s5p/include/plat/irqs.h +9 -0
@@ -94,4 +94,13 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) + 16 - S5P_EINT_BASE2)) +/* Typically only a few gpio chips require gpio interrupt support. +To avoid memory waste irq descriptors are allocated only for +S5P_GPIOINT_GROUP_COUNT chips, each with total number of +S5P_GPIOINT_GROUP_SIZE pins/irqs. Each GPIOINT group can be assiged +to any gpio chip with the s5p_register_gpio_interrupt() function */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8 +#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT * S5P_GPIOINT_GROUP_SIZE) +#endif /* __ASM_PLAT_S5P_IRQS_H */
arch/arm/plat-s5p/irq-gpioint.c new file +242 -0
242 lines not on this page · raw message
arch/arm/plat-samsung/include/plat/gpio-cfg.h +18 -0
@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);*/ extern int s5p_gpio_set_drvstr (unsigned int pin,s5p_gpio_drvstr_t drvstr); +/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio group +* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series. Registering +* irq support for all of them would be a resource waste. Because of that the +* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been registered +* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the group +* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */
arch/arm/plat-samsung/include/plat/gpio-core.h +4 -0
@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper for specific implementation of gpio * @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. +* @group: The group register number for gpio interrupt support. +* @irq_base: The base irq number. * @config: special function and pull-resistor control information. * @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support.
@@ -63,6 +65,8 @@ struct s3c_gpio_chip {struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +int irq_base; +int group;spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ];
Signature · 1 line
1.7.1.569.g6f426
PATCH v4 1/1 ARM: Samsung: Add common s5p gpio interrupt support
Quoted 37 lines · Marek Szyprowski
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the
s5p_register_gpio_interrupt()function.Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes since v3:
- merged default andIRQ_TYPE_NONEcases ins5p_gpioint_set_typefunction
- fixed mask inGPIOINT_CON_OFFSETregister from0xfto0x7
- renamed the chip tos5p_gpiointto match thes5p_extintstyle
- extended comments inplat/irqs.h--- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/irqs.h | 9 + arch/arm/plat-s5p/irq-gpioint.c | 242 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 18 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 4 + 6 files changed, 279 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/Kconfig +0
-0
arch/arm/plat-s5p/Kconfig config S5P_EXT_INT · line 38
Quoted 7 lines
arch/arm/plat-s5p/Kconfig +4
-0@@ -32,6 +32,11 @@ config S5P_EXT_INT Use the external interrupts (other than GPIO interrupts.) Note: Do not choose this for S5P6440 and S5P6450. +config S5P_GPIO_INT + bool + help + Common code for the GPIO interrupts (other than external
interrupts.)
Review
Quoted 38 lines
arch/arm/plat-s5p/Kconfig +1
-0+ config S5P_DEV_FIMC0 bool helparch/arm/plat-s5p/Makefile +1
-0@@ -18,6 +18,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o # devicesarch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 3fb3a3a..5a7bf96 100644arch/arm/plat-s5p/include/plat/irqs.h +8
-0@@ -94,4 +94,13 @@ ((irq) - S5P_EINT_BASE1) : \ ((irq) + 16 - S5P_EINT_BASE2)) +/* Typically only a few gpio chips require gpio interrupt support. +To avoid memory waste irq descriptors are allocated only for +S5P_GPIOINT_GROUP_COUNT chips, each with total number of +S5P_GPIOINT_GROUP_SIZE pins/irqs. Each GPIOINT group can be assiged +to any gpio chip with the s5p_register_gpio_interrupt() function */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE 8 +#define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT *
S5P_GPIOINT_GROUP_SIZE)arch/arm/plat-s5p/include/plat/irqs.h +1
-0+#endif /* __ASM_PLAT_S5P_IRQS_H */ (quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-s5p/irq-gpioint.c line 8
Quoted 13 lines
new file mode 100644
index 0000000..32263a3arch/arm/plat-s5p/irq-gpioint.c new file +8
-0@@ -0,0 +1,242 @@ +/* linux/arch/arm/plat-s5p/irq-gpioint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* Author: Kyungmin Park <[email protected]> +* Author: Joonyoung Shim <[email protected]> +* Author: Marek Szyprowski <[email protected]> +* +* This program is free software; you can redistribute it and/or modify
it
arch/arm/plat-s5p/irq-gpioint.c line 9
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* under the terms of the GNU General Public License as published by
the
arch/arm/plat-s5p/irq-gpioint.c line 10
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* Free Software Foundation; either version 2 of the License, or (at
your
Quoted 166 lines
arch/arm/plat-s5p/irq-gpioint.c new file +61
-0+* option) any later version. +* +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/gpio.h> + +#include <mach/map.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> + +#define S5P_GPIOREG (x) (S5P_VA_GPIO + (x)) + +#define GPIOINT_CON_OFFSET 0x700 +#define GPIOINT_MASK_OFFSET 0x900 +#define GPIOINT_PEND_OFFSET 0xA00 + +#define GPIOINT_LEVEL_LOW 0x0 +#define GPIOINT_LEVEL_HIGH 0x1 +#define GPIOINT_EDGE_FALLING 0x2 +#define GPIOINT_EDGE_RISING 0x3 +#define GPIOINT_EDGE_BOTH 0x4 + +static struct s3c_gpio_chip *irq_chips[S5P_GPIOINT_GROUP_MAXNR ]; + +static int s5p_gpioint_get_group (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); +int group; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) +if (s3c_chip == irq_chips[group]) +break ; + +return group; +} + +static int s5p_gpioint_get_offset (unsigned int irq) +{ +struct gpio_chip *chip =get_irq_data (irq); +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return irq - s3c_chip->irq_base; +} + +static void s5p_gpioint_ack (unsigned int irq) +{ +int group, offset, pend_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + pend_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_mask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value |=1 << offset; + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_unmask (unsigned int irq) +{ +int group, offset, mask_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + mask_offset = group <<2 ; + + value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +2
-0+ value &= ~(1 << offset); + __raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +40
-0+} + +static void s5p_gpioint_mask_ack (unsigned int irq) +{ +s5p_gpioint_mask (irq); +s5p_gpioint_ack (irq); +} + +static int s5p_gpioint_set_type (unsigned int irq,unsigned int type) +{ +int group, offset, con_offset; +unsigned int value; + + group =s5p_gpioint_get_group (irq); + offset =s5p_gpioint_get_offset (irq); + con_offset = group <<2 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + type =GPIOINT_EDGE_RISING ; +break ; +case IRQ_TYPE_EDGE_FALLING : + type =GPIOINT_EDGE_FALLING ; +break ; +case IRQ_TYPE_EDGE_BOTH : + type =GPIOINT_EDGE_BOTH ; +break ; +case IRQ_TYPE_LEVEL_HIGH : + type =GPIOINT_LEVEL_HIGH ; +break ; +case IRQ_TYPE_LEVEL_LOW : + type =GPIOINT_LEVEL_LOW ; +break ; +case IRQ_TYPE_NONE : +default : +printk (KERN_WARNING "No irq type\n" ); +return -EINVAL ; + } + + value = __raw_readl(S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +3
-0+ value &= ~(0x7 << (offset *0x4 )); + value |= (type << (offset *0x4 )); + __raw_writel(value, S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +24
-0+ +return 0 ; +} + +struct irq_chip s5p_gpioint = { + .name ="s5p_gpioint" , + .ack = s5p_gpioint_ack, + .mask = s5p_gpioint_mask, + .mask_ack = s5p_gpioint_mask_ack, + .unmask = s5p_gpioint_unmask, + .set_type = s5p_gpioint_set_type, +}; + +static void s5p_gpioint_handler (unsigned int irq,struct irq_desc *desc) +{ +int group, offset, pend_offset, mask_offset; +int real_irq; +unsigned int pend, mask; + +for (group =0 ; group <S5P_GPIOINT_GROUP_MAXNR ; group++) { + pend_offset = group <<2 ; + pend =__raw_readl (S5P_GPIOREG (GPIOINT_PEND_OFFSET ) + + pend_offset); +if (!pend)
arch/arm/plat-s5p/irq-gpioint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+continue ; + + mask_offset = group <<2 ; + mask =__raw_readl (S5P_GPIOREG (GPIOINT_MASK_OFFSET ) + + mask_offset); + pend &= ~mask; + +for (offset =0 ; offset <8 ; offset++) { +if (pend & (1 << offset)) { + struct s3c_gpio_chip *chip =
irq_chips[group];
Review
Quoted 66 lines
arch/arm/plat-s5p/irq-gpioint.c new file +59
-0+if (chip) { + real_irq = chip->irq_base + offset; +generic_handle_irq (real_irq); + } + } + } + } +} + +static __init int s5p_gpioint_add (struct s3c_gpio_chip *chip) +{ +static int used_gpioint_groups =0 ; +static bool handler_registered =0 ; +int irq, group = chip->group; +int i; + +if (used_gpioint_groups >=S5P_GPIOINT_GROUP_COUNT ) +return -ENOMEM ; + + chip->irq_base =S5P_GPIOINT_BASE + + used_gpioint_groups *S5P_GPIOINT_GROUP_SIZE ; + used_gpioint_groups++; + +if (!handler_registered) { +set_irq_chained_handler (IRQ_GPIOINT , s5p_gpioint_handler); + handler_registered =1 ; + } + + irq_chips[group] = chip; +for (i =0 ; i < chip->chip.ngpio; i++) { + irq = chip->irq_base + i; +set_irq_chip (irq, &s5p_gpioint); +set_irq_data (irq, &chip->chip); +set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } +return 0 ; +} + +int __init s5p_register_gpio_interrupt(int pin) +{ + struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); + int offset, group; + int ret; + + if (!my_chip) + return -EINVAL; + + offset = pin - my_chip->chip.base; + group = my_chip->group; + + /* check if the group has been already registered */ + if (my_chip->irq_base) + return my_chip->irq_base + offset; + + /* register gpio group */ + ret = s5p_gpioint_add(my_chip); + if (ret == 0) { + printk(KERN_INFO "Registered interrupt support for gpiogroup %d.\n",
arch/arm/plat-s5p/irq-gpioint.c new file +5
-0+ group); +return my_chip->irq_base + offset; + } +return ret; +}(quoted diff) +0
-0
b/arch/arm/plat-
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 171
Quoted 8 lines
samsung/include/plat/gpio-cfg.h
index 1c6b929..5b43b95 100644arch/arm/plat-samsung/include/plat/gpio-cfg.h +0
-0@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsignedint pin); */ extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t
drvstr);
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 173
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+/** +* s5p_register_gpio_interrupt() - register interrupt support for a gpio
group
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +6
-0+* @pin: The pin number from the group to be registered +* +* This function registers gpio interrupt support for the group that the +* specified pin belongs to. +* +* The total number of gpio pins is quite large ob s5p series.
Registering
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 180
Quoted 1 line
arch/arm/plat-samsung/include/plat/gpio-cfg.h +1
-0+* irq support for all of them would be a resource waste. Because of that
the
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +3
-0+* interrupt support for standard gpio pins is registered dynamically. +* +* It will return the irq number of the interrupt that has been
registered
arch/arm/plat-samsung/include/plat/gpio-cfg.h extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned · line 185
Quoted 2 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+* or -ENOMEM if no more gpio interrupts can be registered. It is allowed +* to call this function more than once for the same gpio group (the
group
Review
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-cfg.h +4
-0+* will be registered only once). +*/ +extern int s5p_register_gpio_interrupt (int pin); +#endif /* __PLAT_GPIO_CFG_H */ (quoted diff) +0
-0
b/arch/arm/plat-
Quoted 14 lines
samsung/include/plat/gpio-core.h
index e358c7d..c22c27c 100644arch/arm/plat-samsung/include/plat/gpio-core.h +2
-0@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;* struct s3c_gpio_chip - wrapper for specific implementation of gpio * @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. +* @group: The group register number for gpio interrupt support. +* @irq_base: The base irq number. * @config: special function and pull-resistor control information. * @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support.
arch/arm/plat-samsung/include/plat/gpio-core.h struct s3c_gpio_chip {
Quoted 9 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +2
-1@@ -63,6 +65,8 @@ struct s3c_gpio_chip {struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +int irq_base; +int group;spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ]; --
Looks ok to me...will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH v4 1/1 ARM: Samsung: Add common s5p gpio interrupt support
Quoted 400 lines · Kukjin Kim
Quoted 40 lines · Marek Szyprowski
This patch adds common code to enable support of gpio interrupts on s5p series.
The total number of gpio pins is quite large on s5p series. Registering irq support for all of them would be a resource waste. Because of that the interrupt support for standard gpio pins is registered dynamically by the
s5p_register_gpio_interrupt()function.Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes since v3:
- merged default andIRQ_TYPE_NONEcases ins5p_gpioint_set_typefunction
- fixed mask inGPIOINT_CON_OFFSETregister from0xfto0x7
- renamed the chip tos5p_gpiointto match thes5p_extintstyle
- extended comments inplat/irqs.h---
?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ? ? ? ?| ? ?5 + ?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? | ? ?1 + ?arch/arm/plat-s5p/include/plat/irqs.h ? ? ? ? ?| ? ?9 + ?arch/arm/plat-s5p/irq-gpioint.c ? ? ? ? ? ? ? ?| ?242++++++++++++++++++++++++
?arch/arm/plat-samsung/include/plat/gpio-cfg.h ?| ? 18 ++ ?arch/arm/plat-samsung/include/plat/gpio-core.h | ? ?4 + ?6 files changed, 279 insertions(+), 0 deletions(-) ?create mode 100644arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/Kconfig +0
-0@@ -32,6 +32,11 @@ config S5P_EXT_INT ? ? ? ? Use the external interrupts (other than GPIO interrupts.)? ? ? ? Note: Do not choose this for S5P6440 and S5P6450.
Quoted 4 lines
+config
S5P_GPIO_INT
+ ? ? bool
+ ? ? help
+ ? ? ? Common code for the GPIO interrupts (other than externalinterrupts.)
Quoted 37 lines
+
?configS5P_DEV_FIMC0
? ? ? bool
? ? ? helparch/arm/plat-s5p/Makefile +0
-0@@ -18,6 +18,7 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += cpu.o?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o
?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o
+obj-$(CONFIG_S5P_GPIO_INT) ? += irq-gpioint.o?# devices
arch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 3fb3a3a..5a7bf96 100644arch/arm/plat-s5p/include/plat/irqs.h +0
-0@@ -94,4 +94,13 @@ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ((irq) - S5P_EINT_BASE1) : \? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ((irq) + 16 -
S5P_EINT_BASE2))arch/arm/plat-s5p/include/plat/irqs.h +8
-0+/* Typically only a few gpio chips require gpio interrupt support. +? To avoid memory waste irq descriptors are allocated only for +? S5P_GPIOINT_GROUP_COUNT chips, each with total number of +? S5P_GPIOINT_GROUP_SIZE pins/irqs. Each GPIOINT group can be assiged +? to any gpio chip with the s5p_register_gpio_interrupt() function */ +#define S5P_GPIOINT_GROUP_COUNT 4 +#define S5P_GPIOINT_GROUP_SIZE ? ? ? 8 +#define S5P_GPIOINT_COUNT ? ?(S5P_GPIOINT_GROUP_COUNT *
S5P_GPIOINT_GROUP_SIZE)
+
?#endif /*__ASM_PLAT_S5P_IRQS_H*/Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.carch/arm/plat-s5p/irq-gpioint.c line 8
Quoted 13 lines
new file mode 100644
index 0000000..32263a3arch/arm/plat-s5p/irq-gpioint.c new file +8
-0@@ -0,0 +1,242 @@ +/* linux/arch/arm/plat-s5p/irq-gpioint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* Author: Kyungmin Park <[email protected]> +* Author: Joonyoung Shim <[email protected]> +* Author: Marek Szyprowski <[email protected]> +* +* ?This program is free software; you can redistribute ?it and/or modify it
arch/arm/plat-s5p/irq-gpioint.c line 9
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* ?under ?the terms of ?the GNU General ?Public License as published by the
arch/arm/plat-s5p/irq-gpioint.c line 10
Quoted 1 line
arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+* ?Free Software Foundation; ?either version 2 of the ?License, or (at your
Quoted 166 lines
arch/arm/plat-s5p/irq-gpioint.c new file +61
-0+* ?option) any later version. +* +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/gpio.h> + +#include <mach/map.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> + +#define S5P_GPIOREG (x) ? ? ? ? ? ? ? ? ? ? ? (S5P_VA_GPIO + (x)) + +#define GPIOINT_CON_OFFSET ? ? ? ? ? 0x700 +#define GPIOINT_MASK_OFFSET ? ? ? ? ?0x900 +#define GPIOINT_PEND_OFFSET ? ? ? ? ?0xA00 + +#define GPIOINT_LEVEL_LOW ? ? ? ? ? ?0x0 +#define GPIOINT_LEVEL_HIGH ? ? ? ? ? 0x1 +#define GPIOINT_EDGE_FALLING ? ? ? ? 0x2 +#define GPIOINT_EDGE_RISING ? ? ? ? ?0x3 +#define GPIOINT_EDGE_BOTH ? ? ? ? ? ?0x4 + +static struct s3c_gpio_chip *irq_chips[S5P_GPIOINT_GROUP_MAXNR ]; + +static int s5p_gpioint_get_group (unsigned int irq) +{ + ? ? struct gpio_chip *chip = get_irq_data(irq); + ? ? struct s3c_gpio_chip *s3c_chip = container_of(chip, + ? ? ? ? ? ? ? ? ? ? struct s3c_gpio_chip, chip); + ? ? int group; + + ? ? for (group = 0; group < S5P_GPIOINT_GROUP_MAXNR; group++) + ? ? ? ? ? ? if (s3c_chip == irq_chips[group]) + ? ? ? ? ? ? ? ? ? ? break; + + ? ? return group; +} + +static int s5p_gpioint_get_offset (unsigned int irq) +{ + ? ? struct gpio_chip *chip = get_irq_data(irq); + ? ? struct s3c_gpio_chip *s3c_chip = container_of(chip, + ? ? ? ? ? ? ? ? ? ? struct s3c_gpio_chip, chip); + + ? ? return irq - s3c_chip->irq_base; +} + +static void s5p_gpioint_ack (unsigned int irq) +{ + ? ? int group, offset, pend_offset; + ? ? unsigned int value; + + ? ? group = s5p_gpioint_get_group(irq); + ? ? offset = s5p_gpioint_get_offset(irq); + ? ? pend_offset = group << 2; + + ? ? value = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) +
pend_offset);
+ ? ? value |= 1 << offset;
+ ? ?__raw_writel(value, S5P_GPIOREG(GPIOINT_PEND_OFFSET) + pend_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_mask (unsigned int irq) +{ + ? ? int group, offset, mask_offset; + ? ? unsigned int value; + + ? ? group = s5p_gpioint_get_group(irq); + ? ? offset = s5p_gpioint_get_offset(irq); + ? ? mask_offset = group << 2; + + ? ? value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);
+ ? ? value |= 1 << offset;
+ ? ?__raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) + mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +12
-0+} + +static void s5p_gpioint_unmask (unsigned int irq) +{ + ? ? int group, offset, mask_offset; + ? ? unsigned int value; + + ? ? group = s5p_gpioint_get_group(irq); + ? ? offset = s5p_gpioint_get_offset(irq); + ? ? mask_offset = group << 2; + + ? ? value = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) +
mask_offset);
+ ? ? value &= ~(1 << offset);
+ ? ?__raw_writel(value, S5P_GPIOREG(GPIOINT_MASK_OFFSET) + mask_offset);arch/arm/plat-s5p/irq-gpioint.c new file +40
-0+} + +static void s5p_gpioint_mask_ack (unsigned int irq) +{ + ? ? s5p_gpioint_mask(irq); + ? ? s5p_gpioint_ack(irq); +} + +static int s5p_gpioint_set_type (unsigned int irq,unsigned int type) +{ + ? ? int group, offset, con_offset; + ? ? unsigned int value; + + ? ? group = s5p_gpioint_get_group(irq); + ? ? offset = s5p_gpioint_get_offset(irq); + ? ? con_offset = group << 2; + + ? ? switch (type) { + ? ? case IRQ_TYPE_EDGE_RISING: + ? ? ? ? ? ? type = GPIOINT_EDGE_RISING; + ? ? ? ? ? ? break; + ? ? case IRQ_TYPE_EDGE_FALLING: + ? ? ? ? ? ? type = GPIOINT_EDGE_FALLING; + ? ? ? ? ? ? break; + ? ? case IRQ_TYPE_EDGE_BOTH: + ? ? ? ? ? ? type = GPIOINT_EDGE_BOTH; + ? ? ? ? ? ? break; + ? ? case IRQ_TYPE_LEVEL_HIGH: + ? ? ? ? ? ? type = GPIOINT_LEVEL_HIGH; + ? ? ? ? ? ? break; + ? ? case IRQ_TYPE_LEVEL_LOW: + ? ? ? ? ? ? type = GPIOINT_LEVEL_LOW; + ? ? ? ? ? ? break; + ? ? case IRQ_TYPE_NONE: + ? ? default: + ? ? ? ? ? ? printk(KERN_WARNING "No irq type\n"); + ? ? ? ? ? ? return -EINVAL; + ? ? } + + ? ? value = __raw_readl(S5P_GPIOREG(GPIOINT_CON_OFFSET) +
con_offset);
+ ? ? value &= ~(0x7 << (offset *0x4));
+ ? ? value |= (type << (offset *0x4));
+ ? ?__raw_writel(value, S5P_GPIOREG(GPIOINT_CON_OFFSET) + con_offset);arch/arm/plat-s5p/irq-gpioint.c new file +24
-0+ + ? ? return 0; +} + +struct irq_chip s5p_gpioint = { + ? ? .name ? ? ? ? ? = "s5p_gpioint", + ? ? .ack ? ? ? ? ? ?= s5p_gpioint_ack, + ? ? .mask ? ? ? ? ? = s5p_gpioint_mask, + ? ? .mask_ack ? ? ? = s5p_gpioint_mask_ack, + ? ? .unmask ? ? ? ? = s5p_gpioint_unmask, + ? ? .set_type ? ? ? = s5p_gpioint_set_type, +}; + +static void s5p_gpioint_handler (unsigned int irq,struct irq_desc *desc) +{ + ? ? int group, offset, pend_offset, mask_offset; + ? ? int real_irq; + ? ? unsigned int pend, mask; + + ? ? for (group = 0; group < S5P_GPIOINT_GROUP_MAXNR; group++) { + ? ? ? ? ? ? pend_offset = group << 2; + ? ? ? ? ? ? pend = __raw_readl(S5P_GPIOREG(GPIOINT_PEND_OFFSET) + + ? ? ? ? ? ? ? ? ? ? ? ? ? ? pend_offset); + ? ? ? ? ? ? if (!pend)arch/arm/plat-s5p/irq-gpioint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-gpioint.c new file +10
-0+ ? ? ? ? ? ? ? ? ? ? continue; + + ? ? ? ? ? ? mask_offset = group << 2; + ? ? ? ? ? ? mask = __raw_readl(S5P_GPIOREG(GPIOINT_MASK_OFFSET) + + ? ? ? ? ? ? ? ? ? ? ? ? ? ? mask_offset); + ? ? ? ? ? ? pend &= ~mask; + + ? ? ? ? ? ? for (offset = 0; offset < 8; offset++) { + ? ? ? ? ? ? ? ? ? ? if (pend & (1 << offset)) { + ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct s3c_gpio_chip *chip =irq_chips[group];
Review
Quoted 66 lines
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (chip) {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?real_irq=chip->irq_base+ offset;
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?generic_handle_irq(real_irq);
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? }
+ ? ? }arch/arm/plat-s5p/irq-gpioint.c new file +52
-0+} + +static __init int s5p_gpioint_add (struct s3c_gpio_chip *chip) +{ + ? ? static int used_gpioint_groups = 0; + ? ? static bool handler_registered = 0; + ? ? int irq, group = chip->group; + ? ? int i; + + ? ? if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT) + ? ? ? ? ? ? return -ENOMEM; + + ? ? chip->irq_base = S5P_GPIOINT_BASE + + ? ? ? ? ? ? ? ? ? ? ?used_gpioint_groups * S5P_GPIOINT_GROUP_SIZE; + ? ? used_gpioint_groups++; + + ? ? if (!handler_registered) { + ? ? ? ? ? ? set_irq_chained_handler(IRQ_GPIOINT, s5p_gpioint_handler); + ? ? ? ? ? ? handler_registered = 1; + ? ? } + + ? ? irq_chips[group] = chip; + ? ? for (i = 0; i < chip->chip.ngpio; i++) { + ? ? ? ? ? ? irq = chip->irq_base + i; + ? ? ? ? ? ? set_irq_chip(irq, &s5p_gpioint); + ? ? ? ? ? ? set_irq_data(irq, &chip->chip); + ? ? ? ? ? ? set_irq_handler(irq, handle_level_irq); + ? ? ? ? ? ? set_irq_flags(irq, IRQF_VALID); + ? ? } + ? ? return 0; +} + +int __init s5p_register_gpio_interrupt(int pin) +{ + ? ? struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); + ? ? int offset, group; + ? ? int ret; + + ? ? if (!my_chip) + ? ? ? ? ? ? return -EINVAL; + + ? ? offset = pin - my_chip->chip.base; + ? ? group = my_chip->group; + + ? ? /* check if the group has been already registered */ + ? ? if (my_chip->irq_base) + ? ? ? ? ? ? return my_chip->irq_base + offset; + + ? ? /* register gpio group */ + ? ? ret = s5p_gpioint_add(my_chip); + ? ? if (ret == 0) { + ? ? ? ? ? ? printk(KERN_INFO "Registered interrupt support for gpiogroup %d.\n",
+ ? ? ? ? ? ? ? ? ? ?group);
+ ? ? ? ? ? ? returnmy_chip->irq_base+ offset;
+ ? ? }
+ ? ? return ret;arch/arm/plat-s5p/irq-gpioint.c new file +1
-0+}(quoted diff) +0
-0b/arch/arm/plat-
Quoted 8 lines
samsung/include/plat/gpio-cfg.h
index 1c6b929..5b43b95 100644arch/arm/plat-samsung/include/plat/gpio-cfg.h +0
-0@@ -169,4 +169,22 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);?*/
?extern int s5p_gpio_set_drvstr(unsigned int pin,s5p_gpio_drvstr_tdrvstr);
Quoted 3 lines
+/**
+ *s5p_register_gpio_interrupt()- register interrupt support for a gpiogroup
Quoted 6 lines
+ * @pin: The pin number from the group to be registered
+ *
+ * This function registers gpio interrupt support for the group that the
+ * specified pin belongs to.
+ *
+ * The total number of gpio pins is quite large ob s5p series.Registering
Quoted 1 line
+ * irq support for all of them would be a resource waste. Because of that
the
Quoted 3 lines
+ * interrupt support for standard gpio pins is registered dynamically.
+ *
+ * It will return the irq number of the interrupt that has beenregistered
Quoted 2 lines
+ * or
-ENOMEMif no more gpio interrupts can be registered. It is allowed
+ * to call this function more than once for the same gpio group (thegroup
Review
Quoted 6 lines
+ * will be registered only once).
+ */arch/arm/plat-samsung/include/plat/gpio-cfg.h +2
-0+extern int s5p_register_gpio_interrupt (int pin); +?#endif /*
__PLAT_GPIO_CFG_H*/(quoted diff) +0
-0b/arch/arm/plat-
Quoted 17 lines
samsung/include/plat/gpio-core.h
index e358c7d..c22c27c 100644arch/arm/plat-samsung/include/plat/gpio-core.h +0
-0@@ -43,6 +43,8 @@ struct s3c_gpio_cfg;? * struct
s3c_gpio_chip- wrapper for specific implementation of gpio ? * @chip: The chip structure to be exported via gpiolib.
? * @base: The base pointer to the gpio configuration registers.
+ * @group: The group register number for gpio interrupt support.
+ * @irq_base: The base irq number.
? * @config: special function and pull-resistor control information. ? * @lock: Lock for exclusive access to this gpio bank.
? * @pm_save: Save information for suspend/resume support.arch/arm/plat-samsung/include/plat/gpio-core.h +0
-0@@ -63,6 +65,8 @@ struct s3c_gpio_chip { ? ? ? struct s3c_gpio_cfg ? ? *config; ? ? ? struct s3c_gpio_pm ? ? ?*pm; ? ? ? void __iomem ? ? ? ? ? ?*base;
Quoted 8 lines
Quoted 6 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +2
-0+ ? ? int ? ? ? ? ? ? ? ? ? ? irq_base; + ? ? int ? ? ? ? ? ? ? ? ? ? group; ? ? ? spinlock_t ? ? ? ? ? ? ? lock;?#ifdef
CONFIG_PM
? ? ? u32 ? ? ? ? ? ? ? ? ? ? pm_save[4];
--Looks ok to me...will apply.
I hope I want to see the applied patches tomorrow since there are more patches.
One more, what's going on s5pc110 features. especially suspend & resume. If you need I'll add Ack-by that patches.
Thank you,
Kyungmin Park
Quoted 14 lines
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
PATCH 2/6 ARM: S5PC110: add support for gpio interrupts
In reply to Marek SzyprowskiS5PV210/S5PC110 series can use common s5p gpio interrupt code. This patch adds required defines and code to make use of it.
--- arch/arm/mach-s5pv210/gpiolib.c | 6 +++++- arch/arm/mach-s5pv210/include/mach/irqs.h | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-s5pv210/gpiolib.c +5 -1
@@ -150,6 +150,7 @@ static struct s3c_gpio_chip s5pv210_gpio_4bit[] = { .label = "GPG3", }, }, { + .config = &gpio_cfg_noint, .chip = { .base = S5PV210_GPI(0), .ngpio = S5PV210_GPIO_I_NR,
@@ -259,11 +260,14 @@ static __init int s5pv210_gpiolib_init(void) {struct s3c_gpio_chip *chip = s5pv210_gpio_4bit;int nr_chips =ARRAY_SIZE (s5pv210_gpio_4bit); +int gpioint_group =0 ;int i =0 ;for (i =0 ; i < nr_chips; i++, chip++) { -if (chip->config ==NULL ) +if (chip->config ==NULL ) { chip->config = &gpio_cfg; + chip->group = gpioint_group++; + }if (chip->base ==NULL ) chip->base =S5PV210_BANK_BASE (i); }
arch/arm/mach-s5pv210/include/mach/irqs.h +5 -1
@@ -121,8 +121,12 @@#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0))#define S5P_EINT_BASE2 (IRQ_VIC_END + 1) +/* GPIO interrupt */ +#define S5P_GPIOINT_BASE (IRQ_EINT(31) + 1) +#define S5P_GPIOINT_GROUP_MAXNR 22 +/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1)/* Compatibility */ #define IRQ_LCD_FIFO IRQ_LCD0
Signature · 1 line
1.7.2.2
PATCH 3/6 ARM: S5PC100: Use generic S5P gpio interrupts interface
In reply to Marek SzyprowskiFrom: Joonyoung Shim <[email protected]>
S5PC100 series can use common s5p gpio interrupt code. This patch removes specific s5pc100 gpio interrupts code and adds required defines and code to make use of common s5p code.
--- arch/arm/mach-s5pc100/Makefile | 2 +- arch/arm/mach-s5pc100/gpiolib.c | 45 ++---- arch/arm/mach-s5pc100/include/mach/irqs.h | 9 +- arch/arm/mach-s5pc100/irq-gpio.c | 266 ----------------------------- 4 files changed, 17 insertions(+), 305 deletions(-) delete mode 100644 arch/arm/mach-s5pc100/irq-gpio.c
arch/arm/mach-s5pc100/Makefile +1 -1
@@ -11,7 +11,7 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpiolib.o irq-gpio.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpiolib.o obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o obj-$(CONFIG_CPU_S5PC100) += dma.o
arch/arm/mach-s5pc100/gpiolib.c +11 -34
93 lines not on this page · raw message
arch/arm/mach-s5pc100/include/mach/irqs.h +5 -4
@@ -100,11 +100,12 @@#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0))#define S5P_EINT_BASE2 (IRQ_VIC_END + 1) -#define S3C_IRQ_GPIO_BASE (IRQ_EINT(31) + 1) -#define S3C_IRQ_GPIO (x) (S3C_IRQ_GPIO_BASE + (x)) +/* GPIO interrupt */ +#define S5P_GPIOINT_BASE (IRQ_EINT(31) + 1) +#define S5P_GPIOINT_GROUP_MAXNR 21 -/* Until MP04 Groups -> 40 (exactly 39) Groups * 8 ~= 320 GPIOs */ -#define NR_IRQS (S3C_IRQ_GPIO(320) + 1) +/* Set the default NR_IRQS */ +#define NR_IRQS (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1)/* Compatibility */ #define IRQ_LCD_FIFO IRQ_LCD0
arch/arm/mach-s5pc100/irq-gpio.c deleted +0 -266
266 lines not on this page · raw message
Signature · 1 line
1.7.2.2
PATCH 4/6 ARM: S5PC100: Move external interrupt defines
In reply to Marek SzyprowskiFrom: Joonyoung Shim <[email protected]>
This patch moves external interrupt defines from gpio.h to regs-gpio.h for consistency with s5pv210.
--- arch/arm/mach-s5pc100/include/mach/gpio.h | 7 ------- arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/mach-s5pc100/include/mach/gpio.h +0 -7
@@ -146,13 +146,6 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range */ #define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#define EINT_MODE S3C_GPIO_SFN(0x2) - -#define EINT_GPIO_0 (x) S5PC100_GPH0(x) -#define EINT_GPIO_1 (x) S5PC100_GPH1(x) -#define EINT_GPIO_2 (x) S5PC100_GPH2(x) -#define EINT_GPIO_3 (x) S5PC100_GPH3(x) -#include <asm-generic/gpio.h> #endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-s5pc100/include/mach/regs-gpio.h +7 -0
@@ -71,5 +71,12 @@#define S5P_EXTINT_RISEEDGE (0x03)#define S5P_EXTINT_BOTHEDGE (0x04) +#define EINT_MODE S3C_GPIO_SFN(0x2) + +#define EINT_GPIO_0 (x) S5PC100_GPH0(x) +#define EINT_GPIO_1 (x) S5PC100_GPH1(x) +#define EINT_GPIO_2 (x) S5PC100_GPH2(x) +#define EINT_GPIO_3 (x) S5PC100_GPH3(x) +#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */
Signature · 1 line
1.7.2.2
PATCH 4/6 ARM: S5PC100: Move external interrupt defines
Quoted 20 lines · Marek Szyprowski
From: Joonyoung Shim <[email protected]>
This patch moves external interrupt defines from
gpio.htoregs-gpio.hfor consistency with s5pv210.Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Marek Szyprowski <[email protected]>--- arch/arm/mach-s5pc100/include/mach/gpio.h | 7 ------- arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 71ae1f5..29a8a12 100644
arch/arm/mach-s5pc100/include/mach/gpio.h enum s5p_gpio_number { · line 146
Quoted 1 line
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0@@ -146,13 +146,6 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range
*/
Review
Quoted 13 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-7#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#define EINT_MODE S3C_GPIO_SFN(0x2) - -#define EINT_GPIO_0 (x) S5PC100_GPH0(x) -#define EINT_GPIO_1 (x) S5PC100_GPH1(x) -#define EINT_GPIO_2 (x) S5PC100_GPH2(x) -#define EINT_GPIO_3 (x) S5PC100_GPH3(x) -#include <asm-generic/gpio.h> #endif /* __ASM_ARCH_GPIO_H */ (quoted diff) +0
-0
b/arch/arm/mach-
Quoted 8 lines
s5pc100/include/mach/regs-gpio.h
index dd6295e..6abe481 100644arch/arm/mach-s5pc100/include/mach/regs-gpio.h +0
-0@@ -71,5 +71,12 @@#define S5P_EXTINT_RISEEDGE (0x03)#define S5P_EXTINT_BOTHEDGE (0x04)
arch/arm/mach-s5pc100/include/mach/regs-gpio.h
Quoted 10 lines
arch/arm/mach-s5pc100/include/mach/regs-gpio.h +7
-1+#define EINT_MODE S3C_GPIO_SFN(0x2) + +#define EINT_GPIO_0 (x) S5PC100_GPH0(x) +#define EINT_GPIO_1 (x) S5PC100_GPH1(x) +#define EINT_GPIO_2 (x) S5PC100_GPH2(x) +#define EINT_GPIO_3 (x) S5PC100_GPH3(x) +#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */ --
This is ok to me, will apply.
And will check other regarding gpio interrupt in this weekend ;-)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 4/6 ARM: S5PC100: Move external interrupt defines
Hello,
Quoted 54 lines · Kukjin Kim
Quoted 20 lines · Marek Szyprowski
From: Joonyoung Shim <[email protected]>
This patch moves external interrupt defines from
gpio.htoregs-gpio.hfor consistency with s5pv210.Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Marek Szyprowski <[email protected]>--- arch/arm/mach-s5pc100/include/mach/gpio.h | 7 ------- arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 71ae1f5..29a8a12 100644arch/arm/mach-s5pc100/include/mach/gpio.h enum s5p_gpio_number { · line 146
Quoted 1 line
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0@@ -146,13 +146,6 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range */
Review
Quoted 13 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-7#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#define EINT_MODE S3C_GPIO_SFN(0x2) - -#define EINT_GPIO_0 (x) S5PC100_GPH0(x) -#define EINT_GPIO_1 (x) S5PC100_GPH1(x) -#define EINT_GPIO_2 (x) S5PC100_GPH2(x) -#define EINT_GPIO_3 (x) S5PC100_GPH3(x) -#include <asm-generic/gpio.h> #endif /* __ASM_ARCH_GPIO_H */ (quoted diff) +0
-0b/arch/arm/mach-
Quoted 17 lines
s5pc100/include/mach/regs-gpio.h
index dd6295e..6abe481 100644arch/arm/mach-s5pc100/include/mach/regs-gpio.h +7
-0@@ -71,5 +71,12 @@#define S5P_EXTINT_RISEEDGE (0x03)#define S5P_EXTINT_BOTHEDGE (0x04) +#define EINT_MODE S3C_GPIO_SFN(0x2) + +#define EINT_GPIO_0 (x) S5PC100_GPH0(x) +#define EINT_GPIO_1 (x) S5PC100_GPH1(x) +#define EINT_GPIO_2 (x) S5PC100_GPH2(x) +#define EINT_GPIO_3 (x) S5PC100_GPH3(x) +#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */
Quoted 5 lines
Quoted 1 line
--
This is ok to me, will apply.
And will check other regarding gpio interrupt in this weekend ;-)
Is there any progress on gpio interrupts? Over 2 weeks passed since I posted the patches...
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 5/6 ARM: Samsung: Add common samsung_gpiolib_to_irq function
In reply to Marek SzyprowskiFrom: Joonyoung Shim <[email protected]>
This patch adds a common callback for gpio_to_irq() for external and gpio interrupts for Samsung SoCs.
--- arch/arm/mach-s3c64xx/gpiolib.c | 8 +---- arch/arm/mach-s5pc100/gpiolib.c | 31 ++++++----------------- arch/arm/mach-s5pv210/gpiolib.c | 8 ++++++ arch/arm/plat-s3c24xx/gpiolib.c | 8 +---- arch/arm/plat-s5p/irq-gpioint.c | 1 + arch/arm/plat-samsung/gpiolib.c | 8 ++++++ arch/arm/plat-samsung/include/plat/gpio-core.h | 11 ++++++++ 7 files changed, 40 insertions(+), 35 deletions(-)
arch/arm/mach-s3c64xx/gpiolib.c +2 -6
@@ -195,11 +195,6 @@ static struct s3c_gpio_cfg gpio_2bit_cfg_eint11 = { .get_pull = s3c_gpio_getpull_updown, }; -int s3c64xx_gpio2int_gpn (struct gpio_chip *chip,unsigned pin) -{ -return IRQ_EINT (0 ) + pin; -} -static struct s3c_gpio_chip gpio_2bit[] = { { .base =S3C64XX_GPF_BASE ,
@@ -227,12 +222,13 @@ static struct s3c_gpio_chip gpio_2bit[] = { }, }, { .base = S3C64XX_GPN_BASE, + .irq_base = IRQ_EINT(0), .config = &gpio_2bit_cfg_eint10, .chip = { .base = S3C64XX_GPN(0), .ngpio = S3C64XX_GPIO_N_NR, .label = "GPN", - .to_irq = s3c64xx_gpio2int_gpn, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S3C64XX_GPO_BASE,
arch/arm/mach-s5pc100/gpiolib.c +8 -23
@@ -61,25 +61,6 @@* L3 8 4Bit None */ -static int s5pc100_gpiolib_to_eint (struct gpio_chip *chip,unsigned int offset) -{ -int base; - - base = chip->base -S5PC100_GPH0 (0 ); -if (base ==0 ) -return IRQ_EINT (offset); - base = chip->base -S5PC100_GPH1 (0 ); -if (base ==0 ) -return IRQ_EINT (8 + offset); - base = chip->base -S5PC100_GPH2 (0 ); -if (base ==0 ) -return IRQ_EINT (16 + offset); - base = chip->base -S5PC100_GPH3 (0 ); -if (base ==0 ) -return IRQ_EINT (24 + offset); -return -EINVAL ; -} -static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, .set_pull = s3c_gpio_setpull_updown,
@@ -223,38 +204,42 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { }, { .base = S5PC100_GPH0_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(0), .chip = { .base = S5PC100_GPH0(0), .ngpio = S5PC100_GPIO_H0_NR, .label = "GPH0", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH1_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(8), .chip = { .base = S5PC100_GPH1(0), .ngpio = S5PC100_GPIO_H1_NR, .label = "GPH1", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH2_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(16), .chip = { .base = S5PC100_GPH2(0), .ngpio = S5PC100_GPIO_H2_NR, .label = "GPH2", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH3_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(24), .chip = { .base = S5PC100_GPH3(0), .ngpio = S5PC100_GPIO_H3_NR, .label = "GPH3", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPI_BASE,
arch/arm/mach-s5pv210/gpiolib.c +8 -0
@@ -224,34 +224,42 @@ static struct s3c_gpio_chip s5pv210_gpio_4bit[] = { }, { .base = (S5P_VA_GPIO + 0xC00), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(0), .chip = { .base = S5PV210_GPH0(0), .ngpio = S5PV210_GPIO_H0_NR, .label = "GPH0", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC20), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(8), .chip = { .base = S5PV210_GPH1(0), .ngpio = S5PV210_GPIO_H1_NR, .label = "GPH1", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC40), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(16), .chip = { .base = S5PV210_GPH2(0), .ngpio = S5PV210_GPIO_H2_NR, .label = "GPH2", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC60), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(24), .chip = { .base = S5PV210_GPH3(0), .ngpio = S5PV210_GPIO_H3_NR, .label = "GPH3", + .to_irq = samsung_gpiolib_to_irq, }, }, };
arch/arm/plat-s3c24xx/gpiolib.c +2 -6
@@ -74,11 +74,6 @@ static int s3c24xx_gpiolib_bankf_toirq(struct gpio_chip *chip, unsigned offset)return -EINVAL ; } -static int s3c24xx_gpiolib_bankg_toirq (struct gpio_chip *chip,unsigned offset) -{ -return IRQ_EINT8 + offset; -} -static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { .set_config = s3c_gpio_setcfg_s3c24xx_a, .get_config = s3c_gpio_getcfg_s3c24xx_a,
@@ -157,12 +152,13 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { [6] = { .base = S3C2410_GPGCON, .pm = __gpio_pm(&s3c_gpio_pm_2bit), + .irq_base = IRQ_EINT8, .chip = { .base = S3C2410_GPG(0), .owner = THIS_MODULE, .label = "GPIOG", .ngpio = 16, - .to_irq = s3c24xx_gpiolib_bankg_toirq, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S3C2410_GPHCON,
arch/arm/plat-s5p/irq-gpioint.c +1 -0
@@ -235,6 +235,7 @@ int __init s5p_register_gpio_interrupt(int pin)/* register gpio group */ ret =s5p_gpioint_add (my_chip);if (ret ==0 ) { + my_chip->chip.to_irq = samsung_gpiolib_to_irq;printk (KERN_INFO "Registered interrupt support for gpio group %d.\n" , group);return my_chip->irq_base + offset;
arch/arm/plat-samsung/gpiolib.c +8 -0
@@ -197,3 +197,11 @@ void __init samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,s3c_gpiolib_add (chip); } } + +int samsung_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) +{ +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return s3c_chip->irq_base + offset; +}
arch/arm/plat-samsung/include/plat/gpio-core.h +11 -0
@@ -122,6 +122,17 @@ extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,extern void samsung_gpiolib_add_4bit (struct s3c_gpio_chip *chip);extern void samsung_gpiolib_add_4bit2 (struct s3c_gpio_chip *chip); + +/** +* samsung_gpiolib_to_irq - convert gpio pin to irq number +* @chip: The gpio chip that the pin belongs to. +* @offset: The offset of the pin in the chip. +* +* This helper returns the irq number calculated from the chip->irq_base and +* the provided offset. +*/ +extern int samsung_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset); +/* exported for core SoC support to change */ extern struct s3c_gpio_cfg s3c24xx_gpiocfg_default;
Signature · 1 line
1.7.2.2
PATCH 5/6 ARM: Samsung: Add common samsung_gpiolib_to_irq function
Quoted 6 lines · Marek Szyprowski
From: Joonyoung Shim <[email protected]>
This patch adds a common callback for
gpio_to_irq()for external and gpio interrupts for Samsung SoCs.
Quoted 6 lines
Signed-off-by Joonyoung Shim <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Marek Szyprowski <[email protected]>--- arch/arm/mach-s3c64xx/gpiolib.c | 8 +---- arch/arm/mach-s5pc100/gpiolib.c | 31
++++++-----------------
Review
Quoted 8 lines
arch/arm/mach-s5pv210/gpiolib.c | 8 ++++++ arch/arm/plat-s3c24xx/gpiolib.c | 8 +---- arch/arm/plat-s5p/irq-gpioint.c | 1 + arch/arm/plat-samsung/gpiolib.c | 8 ++++++ arch/arm/plat-samsung/include/plat/gpio-core.h | 11 ++++++++ 7 files changed, 40 insertions(+), 35 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-s3c64xx/gpiolib.c
Review
Quoted 31 lines
index 300dee4..fd99a82 100644
arch/arm/mach-s3c64xx/gpiolib.c +2
-6@@ -195,11 +195,6 @@ static struct s3c_gpio_cfg gpio_2bit_cfg_eint11 = { .get_pull = s3c_gpio_getpull_updown, }; -int s3c64xx_gpio2int_gpn (struct gpio_chip *chip,unsigned pin) -{ -return IRQ_EINT (0 ) + pin; -} -static struct s3c_gpio_chip gpio_2bit[] = { { .base =S3C64XX_GPF_BASE ,@@ -227,12 +222,13 @@ static struct s3c_gpio_chip gpio_2bit[] = { }, }, { .base = S3C64XX_GPN_BASE, + .irq_base = IRQ_EINT(0), .config = &gpio_2bit_cfg_eint10, .chip = { .base = S3C64XX_GPN(0), .ngpio = S3C64XX_GPIO_N_NR, .label = "GPN", - .to_irq = s3c64xx_gpio2int_gpn, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S3C64XX_GPO_BASE,(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/gpiolib.c
arch/arm/mach-s5pc100/gpiolib.c line 64
Quoted 8 lines
index 5811578..def4ff8 100644
arch/arm/mach-s5pc100/gpiolib.c +0
-1@@ -61,25 +61,6 @@* L3 8 4Bit None */ -static int s5pc100_gpiolib_to_eint(struct gpio_chip *chip, unsigned int
offset)
Review
Quoted 69 lines
arch/arm/mach-s5pc100/gpiolib.c +8
-22-{ -int base; - - base = chip->base -S5PC100_GPH0 (0 ); -if (base ==0 ) -return IRQ_EINT (offset); - base = chip->base -S5PC100_GPH1 (0 ); -if (base ==0 ) -return IRQ_EINT (8 + offset); - base = chip->base -S5PC100_GPH2 (0 ); -if (base ==0 ) -return IRQ_EINT (16 + offset); - base = chip->base -S5PC100_GPH3 (0 ); -if (base ==0 ) -return IRQ_EINT (24 + offset); -return -EINVAL ; -} -static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, .set_pull = s3c_gpio_setpull_updown,@@ -223,38 +204,42 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { }, { .base = S5PC100_GPH0_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(0), .chip = { .base = S5PC100_GPH0(0), .ngpio = S5PC100_GPIO_H0_NR, .label = "GPH0", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH1_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(8), .chip = { .base = S5PC100_GPH1(0), .ngpio = S5PC100_GPIO_H1_NR, .label = "GPH1", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH2_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(16), .chip = { .base = S5PC100_GPH2(0), .ngpio = S5PC100_GPIO_H2_NR, .label = "GPH2", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPH3_BASE, .config = &gpio_cfg_eint, + .irq_base = IRQ_EINT(24), .chip = { .base = S5PC100_GPH3(0), .ngpio = S5PC100_GPIO_H3_NR, .label = "GPH3", - .to_irq = s5pc100_gpiolib_to_eint, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S5PC100_GPI_BASE,(quoted diff) +0
-0
b/arch/arm/mach-s5pv210/gpiolib.c
Review
Quoted 47 lines
index 29dfb89..ab673ef 100644
arch/arm/mach-s5pv210/gpiolib.c +8
-0@@ -224,34 +224,42 @@ static struct s3c_gpio_chip s5pv210_gpio_4bit[] = { }, { .base = (S5P_VA_GPIO + 0xC00), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(0), .chip = { .base = S5PV210_GPH0(0), .ngpio = S5PV210_GPIO_H0_NR, .label = "GPH0", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC20), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(8), .chip = { .base = S5PV210_GPH1(0), .ngpio = S5PV210_GPIO_H1_NR, .label = "GPH1", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC40), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(16), .chip = { .base = S5PV210_GPH2(0), .ngpio = S5PV210_GPIO_H2_NR, .label = "GPH2", + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = (S5P_VA_GPIO + 0xC60), .config = &gpio_cfg_noint, + .irq_base = IRQ_EINT(24), .chip = { .base = S5PV210_GPH3(0), .ngpio = S5PV210_GPIO_H3_NR, .label = "GPH3", + .to_irq = samsung_gpiolib_to_irq, }, }, };(quoted diff) +0
-0
b/arch/arm/plat-s3c24xx/gpiolib.c
arch/arm/plat-s3c24xx/gpiolib.c static int s3c24xx_gpiolib_bankf_toirq(struct gpio_chip · line 78
Quoted 9 lines
index 4c0896f..243b641 100644
arch/arm/plat-s3c24xx/gpiolib.c +0
-1@@ -74,11 +74,6 @@ static int s3c24xx_gpiolib_bankf_toirq(struct gpio_chip *chip, unsigned offset)return -EINVAL ; } -static int s3c24xx_gpiolib_bankg_toirq(struct gpio_chip *chip, unsigned
offset)
Review
Quoted 24 lines
arch/arm/plat-s3c24xx/gpiolib.c +0
-4-{ -return IRQ_EINT8 + offset; -} -static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { .set_config = s3c_gpio_setcfg_s3c24xx_a,arch/arm/plat-s3c24xx/gpiolib.c +2
-1.get_config = s3c_gpio_getcfg_s3c24xx_a,@@ -157,12 +152,13 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { [6 ] = { .base =S3C2410_GPGCON , .pm =__gpio_pm (&s3c_gpio_pm_2bit), + .irq_base =IRQ_EINT8 , .chip = { .base =S3C2410_GPG (0 ), .owner =THIS_MODULE , .label ="GPIOG" , .ngpio =16 , - .to_irq = s3c24xx_gpiolib_bankg_toirq, + .to_irq = samsung_gpiolib_to_irq, }, }, {arch/arm/plat-s3c24xx/gpiolib.c +0
-0.base = S3C2410_GPHCON,(quoted diff) +0
-0
b/arch/arm/plat-s5p/irq-gpioint.c
Review
Quoted 13 lines
index 7409ae0..5b735b1 100644
arch/arm/plat-s5p/irq-gpioint.c +1
-0@@ -235,6 +235,7 @@ int __init s5p_register_gpio_interrupt(int pin)/* register gpio group */ ret =s5p_gpioint_add (my_chip);if (ret ==0 ) { + my_chip->chip.to_irq = samsung_gpiolib_to_irq; printk(KERN_INFO "Registered interrupt support for gpio group %d.\n", group);arch/arm/plat-s5p/irq-gpioint.c +0
-0return my_chip->irq_base + offset;(quoted diff) +0
-0
b/arch/arm/plat-samsung/gpiolib.c
Quoted 6 lines
index c354089..f2dc389 100644
arch/arm/plat-samsung/gpiolib.c +0
-0@@ -197,3 +197,11 @@ void __init samsung_gpiolib_add_4bit2_chips(structs3c_gpio_chip *chip,s3c_gpiolib_add (chip );
arch/arm/plat-samsung/gpiolib.c void __init samsung_gpiolib_add_4bit2_chips(struct · line 207
Quoted 10 lines
arch/arm/plat-samsung/gpiolib.c +8
-0} } + +int samsung_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) +{ +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return s3c_chip->irq_base + offset; +}
Hi,
Following is for your information...
Moved samsung_gpiolib_to_irq() into plat-samsung/gpio.c because happened build error like following after applying this.
arch/arm/plat-s3c24xx/built-in.o:(.data+0x11c4): undefined reference to `samsung_gpiolib_to_irq'
The reason is that plat-samsung/gpiolib.c is not required for s3c24xx...applied anyway with modifying.
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/plat-
Quoted 6 lines
samsung/include/plat/gpio-core.h
index c22c27c..13a22b8 100644arch/arm/plat-samsung/include/plat/gpio-core.h +0
-0@@ -122,6 +122,17 @@ extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,
arch/arm/plat-samsung/include/plat/gpio-core.h extern void samsung_gpiolib_add_4bit2_chips(struct · line 132
Quoted 10 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +7
-0extern void samsung_gpiolib_add_4bit (struct s3c_gpio_chip *chip);extern void samsung_gpiolib_add_4bit2 (struct s3c_gpio_chip *chip); + +/** +* samsung_gpiolib_to_irq - convert gpio pin to irq number +* @chip: The gpio chip that the pin belongs to. +* @offset: The offset of the pin in the chip. +* +* This helper returns the irq number calculated from the chip->irq_base
and
arch/arm/plat-samsung/include/plat/gpio-core.h extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,
Quoted 3 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +3
-0+* the provided offset. +*/ +extern int samsung_gpiolib_to_irq(struct gpio_chip *chip, unsigned int
offset);
arch/arm/plat-samsung/include/plat/gpio-core.h extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,
Quoted 5 lines
arch/arm/plat-samsung/include/plat/gpio-core.h +1
-1+/* exported for core SoC support to change */ extern struct s3c_gpio_cfg s3c24xx_gpiocfg_default; --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 5/6 ARM: Samsung: Add common samsung_gpiolib_to_irq function
Hello,
On Friday, October 01, 2010 6:49 AM Kukjin Kim wrote:
...
Quoted 23 lines
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/plat-samsung/gpiolib.cQuoted 6 lines
index c354089..f2dc389 100644
arch/arm/plat-samsung/gpiolib.c +0
-0@@ -197,3 +197,11 @@ void __init samsung_gpiolib_add_4bit2_chips(structs3c_gpio_chip *chip,s3c_gpiolib_add (chip );arch/arm/plat-samsung/gpiolib.c void __init samsung_gpiolib_add_4bit2_chips(struct · line 207
Quoted 10 lines
arch/arm/plat-samsung/gpiolib.c +8
-0} } + +int samsung_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) +{ +struct s3c_gpio_chip *s3c_chip =container_of (chip, + struct s3c_gpio_chip, chip); + +return s3c_chip->irq_base + offset; +}Hi,
Following is for your information...
Quoted 8 lines
Moved
samsung_gpiolib_to_irq()intoplat-samsung/gpio.cbecause happened build error like following after applying this.arch/arm/plat-s3c24xx/built-in.o:(.data+0x11c4): undefined reference to `samsung_gpiolib_to_irq'
The reason is that
plat-samsung/gpiolib.cis not required for s3c24xx...applied anyway with modifying.
I must have missed that plat-samsung/gpiolib.c is not used for s3c-24xx. Thank You for the fix!
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 6/6 ARM: S5PC110: GONI: Add support for QT602240 TS driver
In reply to Marek SzyprowskiFrom: Kyungmin Park <[email protected]>
Add required platform definitions for QT602240 touchscreen on I2C2 bus.
--- arch/arm/mach-s5pv210/Kconfig | 3 ++ arch/arm/mach-s5pv210/mach-goni.c | 56 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/Kconfig +3 -0
@@ -76,6 +76,7 @@ config MACH_GONI bool "GONI" select CPU_S5PV210 select ARCH_SPARSEMEM_ENABLE + select S5P_GPIO_INT select S3C_DEV_FB select S5P_DEV_FIMC0 select S5P_DEV_FIMC1
@@ -83,8 +84,10 @@ config MACH_GONI select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 + select S3C_DEV_I2C2 select S5P_DEV_ONENAND select S5PV210_SETUP_FB_24BPP + select S5PV210_SETUP_I2C2 select S5PV210_SETUP_SDHCI help Machine support for Samsung GONI board
arch/arm/mach-s5pv210/mach-goni.c +56 -0
86 lines not on this page · raw message
Signature · 1 line
1.7.2.2
PATCH RESEND 1/1 ARM: S5PC110: GONI: Add support for QT602240 TS driver
Add required platform definitions for QT602240 touchscreen on I2C2 bus.
---
Hello,
This is just a resend of the previous version rebased onto the latest kgene/for-next branch.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
--- arch/arm/mach-s5pv210/Kconfig | 3 ++ arch/arm/mach-s5pv210/mach-goni.c | 54 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/Kconfig +3 -0
@@ -73,6 +73,7 @@ config MACH_AQUILA config MACH_GONI bool "GONI" select CPU_S5PV210 + select S5P_GPIO_INT select S3C_DEV_FB select S5P_DEV_FIMC0 select S5P_DEV_FIMC1
@@ -80,10 +81,12 @@ config MACH_GONI select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 + select S3C_DEV_I2C2 select S3C_DEV_USB_HSOTG select S5P_DEV_ONENAND select SAMSUNG_DEV_KEYPAD select S5PV210_SETUP_FB_24BPP + select S5PV210_SETUP_I2C2 select S5PV210_SETUP_KEYPAD select S5PV210_SETUP_SDHCI help
arch/arm/mach-s5pv210/mach-goni.c +54 -0
78 lines not on this page · raw message
Signature · 1 line
1.7.1.569.g6f426
PATCH RESEND 1/1 ARM: S5PC110: GONI: Add support for QT602240 TS driver
Review
Quoted 49 lines · Marek Szyprowski
Add required platform definitions for QT602240 touchscreen on I2C2 bus.
Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Marek Szyprowski <[email protected]>---
Hello,
This is just a resend of the previous version rebased onto the latest kgene/for-next branch.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center--- arch/arm/mach-s5pv210/Kconfig | 3 ++ arch/arm/mach-s5pv210/mach-goni.c | 54 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-)arch/arm/mach-s5pv210/Kconfig +3
-0@@ -73,6 +73,7 @@ config MACH_AQUILA config MACH_GONI bool "GONI" select CPU_S5PV210 + select S5P_GPIO_INT select S3C_DEV_FB select S5P_DEV_FIMC0 select S5P_DEV_FIMC1@@ -80,10 +81,12 @@ config MACH_GONI select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 + select S3C_DEV_I2C2 select S3C_DEV_USB_HSOTG select S5P_DEV_ONENAND select SAMSUNG_DEV_KEYPAD select S5PV210_SETUP_FB_24BPP + select S5PV210_SETUP_I2C2 select S5PV210_SETUP_KEYPAD select S5PV210_SETUP_SDHCI help(quoted diff) +0
-0
b/arch/arm/mach-s5pv210/mach-
arch/arm/mach-s5pv210/mach-goni.c static struct platform_device *goni_devices[]
Quoted 67 lines
goni.c
index 30ad59f..aa20875 100644arch/arm/mach-s5pv210/mach-goni.c +46
-0@@ -15,6 +15,7 @@#include <linux/fb.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> +#include <linux/i2c/qt602240_ts.h> #include <linux/mfd/max8998.h> #include <linux/regulator/fixed.h> #include <linux/gpio_keys.h> @@ -135,6 +136,51 @@ static struct samsung_keypad_platdata keypad_data__initdata = { .cols =3 , }; +/* TSP */ +static struct qt602240_platform_data qt602240_platform_data = { + .x_line =17 , + .y_line =11 , + .x_size =800 , + .y_size =480 , + .blen =0x21 , + .threshold =0x28 , + .voltage =2800000 ,/* 2.8V */ + .orient =QT602240_DIAGONAL , +}; + +static struct s3c2410_platform_i2c i2c2_data__initdata = { + .flags =0 , + .bus_num =2 , + .slave_addr =0x10 , + .frequency =400 *1000 , + .sda_delay =100 , +}; + +static struct i2c_board_info i2c2_devs[]__initdata = { + { +I2C_BOARD_INFO ("qt602240_ts" ,0x4a ), + .platform_data = &qt602240_platform_data, + }, +}; + +static void __init goni_tsp_init (void ) +{ +int gpio; + + gpio =S5PV210_GPJ1 (3 );/* XMSMADDR_11 */ +gpio_request (gpio,"TSP_LDO_ON" ); +gpio_direction_output (gpio,1 ); +gpio_export (gpio,0 ); + + gpio =S5PV210_GPJ0 (5 );/* XMSMADDR_5 */ +gpio_request (gpio,"TSP_INT" ); + +s5p_register_gpio_interrupt (gpio); +s3c_gpio_cfgpin (gpio,S3C_GPIO_SFN (0xf )); +s3c_gpio_setpull (gpio,S3C_GPIO_PULL_UP ); + i2c2_devs[0 ].irq =gpio_to_irq (gpio); +} +/* MAX8998 regulators */ #if defined(CONFIG_REGULATOR_MAX8998) ||
defined(CONFIG_REGULATOR_MAX8998_MODULE)arch/arm/mach-s5pv210/mach-goni.c +0
-0@@ -524,6 +570,7 @@ static struct platform_device *goni_devices[]
__initdata = {
Quoted 21 lines
arch/arm/mach-s5pv210/mach-goni.c +8
-0&s3c_device_hsmmc2, &s3c_device_usb_hsotg, &samsung_device_keypad, + &s3c_device_i2c2, };static void __init goni_map_io (void )@@ -535,6 +582,13 @@ static void __init goni_map_io(void)static void __init goni_machine_init (void ) { +/* TSP: call before I2C 2 registeration */ +goni_tsp_init (); + +/* I2C2 */ +s3c_i2c2_set_platdata (&i2c2_data); +i2c_register_board_info (2 , i2c2_devs,ARRAY_SIZE (i2c2_devs)); +/* PMIC */ goni_pmic_init (); i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4,
Quoted 2 lines
i2c_gpio_pmic_devs,
--
Looks ok...will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH v3 1/1 ARM: S5P: Add support for gpio interrupts
In reply to Marek SzyprowskiQuoted 3 lines · Marek Szyprowski
Hello,
Hi :-)
Quoted 18 lines
This patch series adds support for gpio interrupts on Samsung S5P SoC series (S5PC100 and S5PC110/S5PV210). It is based on the previous version created by Joonyoung Shim (which is available from the "[PATCH v2 0/4] ARM: S5P: Support gpio interrupts" thread:
http://comments.gmane.org/gmane.linux.kernel.samsung-soc/1662 ).This version has been redesigned to assign irq numbers dynamically to reduce resource waste. Such idea has proposed by Ben Dooks some time ago (see "[PATCH] ARM: S5P: Dynamicly numbered GPIO interrupt support"
thread: http://comments.gmane.org/gmane.linux.kernel.samsung-soc/1198 ).The last patch in this series is an example how to use the dynamically registered gpio interrupt. The QT602240 touch screen device on Goni machine requires it.
The patch series has been rebased onto latest kgene/for-next kernel tree.
Quoted 9 lines
The complete list of patches:
[PATCH 1/6] ARM: Samsung: Add common s5p gpio interrupt support [PATCH 2/6] ARM: S5PC110: add support for gpio interrupts [PATCH 3/6] ARM: S5PC100: Use generic S5P gpio interrupts interface [PATCH 4/6] ARM: S5PC100: Move external interrupt defines [PATCH 5/6] ARM: Samsung: Add common
samsung_gpiolib_to_irqfunction [PATCH 6/6] ARM: S5PC110: GONI: Add support for QT602240 TS driver
Ok...initial reading your 2nd to 5th patches, looks ok to me...will apply. Others, will check/review soon.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.