ARM: S3C24XX: integrate special s3c2412 eint handling
Subsystems (4)
cover ARM: S3C24XX: integrate special s3c2412 eint handling
This series is meant to go on top of the recent basic integration of the s3c2412, s3c2440 and s3c2442 and implements the last necessary change by making the overrides of the eints 0 to 3 on the s3c2412 unnecessary.
After this everything is handled using the new structure.
Heiko Stuebner (3):
ARM: S3C24XX: include first 4 bits of the eint register in irq mapping
ARM: S3C24XX: add soc_is_s3c2412 option
ARM: S3C24XX: handle s3c2412 eints using new infrastructure
arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +++++++------ arch/arm/mach-s3c24xx/irq.c | 127 +++++++++-------------------- arch/arm/plat-samsung/include/plat/cpu.h | 10 +++ drivers/gpio/gpio-samsung.c | 5 +- 4 files changed, 83 insertions(+), 117 deletions(-)
Signature · 1 line
1.7.2.3
PATCH 1/3 ARM: S3C24XX: include first 4 bits of the eint register in irq mapping
This patch moves the irq numbers starting with EINT4 4 points down to enable the inclusion of the first 4 bits of EINT register into the mapping removing the need for special offset handling.
For most S3C24XX architectures this will simply create 4 additional unused interrupts, but enables the S3C2412 to make use of the new infrastructure to realize its special handling of the EINT0 to EINT3 interrupts.
All affected parts of the Samsung code (arch + drivers) seem to use the real interrupt defines (IRQ_something) and not any form of S3C2410_IRQ(x) whose numbering is changed here starting from S3C2410_IRQ(32).
This patch was runtime-tested on a s3c2416 based board.
--- arch/arm/mach-s3c24xx/include/mach/irqs.h | 54 ++++++++++++++-------------- arch/arm/mach-s3c24xx/irq.c | 9 +---- 2 files changed, 29 insertions(+), 34 deletions(-)
arch/arm/mach-s3c24xx/include/mach/irqs.h +27 -27
@@ -59,49 +59,49 @@#define IRQ_ADCPARENT S3C2410_IRQ(31)/* interrupts generated from the external interrupts sources */ -#define IRQ_EINT4 S3C2410_IRQ(32)/* 48 */ -#define IRQ_EINT5 S3C2410_IRQ(33) -#define IRQ_EINT6 S3C2410_IRQ(34) -#define IRQ_EINT7 S3C2410_IRQ(35) -#define IRQ_EINT8 S3C2410_IRQ(36) -#define IRQ_EINT9 S3C2410_IRQ(37) -#define IRQ_EINT10 S3C2410_IRQ(38) -#define IRQ_EINT11 S3C2410_IRQ(39) -#define IRQ_EINT12 S3C2410_IRQ(40) -#define IRQ_EINT13 S3C2410_IRQ(41) -#define IRQ_EINT14 S3C2410_IRQ(42) -#define IRQ_EINT15 S3C2410_IRQ(43) -#define IRQ_EINT16 S3C2410_IRQ(44) -#define IRQ_EINT17 S3C2410_IRQ(45) -#define IRQ_EINT18 S3C2410_IRQ(46) -#define IRQ_EINT19 S3C2410_IRQ(47) -#define IRQ_EINT20 S3C2410_IRQ(48)/* 64 */ -#define IRQ_EINT21 S3C2410_IRQ(49) -#define IRQ_EINT22 S3C2410_IRQ(50) -#define IRQ_EINT23 S3C2410_IRQ(51) +#define IRQ_EINT4 S3C2410_IRQ(36)/* 52 */ +#define IRQ_EINT5 S3C2410_IRQ(37) +#define IRQ_EINT6 S3C2410_IRQ(38) +#define IRQ_EINT7 S3C2410_IRQ(39) +#define IRQ_EINT8 S3C2410_IRQ(40) +#define IRQ_EINT9 S3C2410_IRQ(41) +#define IRQ_EINT10 S3C2410_IRQ(42) +#define IRQ_EINT11 S3C2410_IRQ(43) +#define IRQ_EINT12 S3C2410_IRQ(44) +#define IRQ_EINT13 S3C2410_IRQ(45) +#define IRQ_EINT14 S3C2410_IRQ(46) +#define IRQ_EINT15 S3C2410_IRQ(47) +#define IRQ_EINT16 S3C2410_IRQ(48) +#define IRQ_EINT17 S3C2410_IRQ(49) +#define IRQ_EINT18 S3C2410_IRQ(50) +#define IRQ_EINT19 S3C2410_IRQ(51) +#define IRQ_EINT20 S3C2410_IRQ(52)/* 68 */ +#define IRQ_EINT21 S3C2410_IRQ(53) +#define IRQ_EINT22 S3C2410_IRQ(54) +#define IRQ_EINT23 S3C2410_IRQ(55)#define IRQ_EINT_BIT (x) ((x) - IRQ_EINT4 + 4)#define IRQ_EINT (x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x))) -#define IRQ_LCD_FIFO S3C2410_IRQ(52) -#define IRQ_LCD_FRAME S3C2410_IRQ(53) +#define IRQ_LCD_FIFO S3C2410_IRQ(56) +#define IRQ_LCD_FRAME S3C2410_IRQ(57)/* IRQs for the interal UARTs, and ADC * these need to be ordered in number of appearance in the * SUBSRC mask register */ -#define S3C2410_IRQSUB (x) S3C2410_IRQ((x)+54) +#define S3C2410_IRQSUB (x) S3C2410_IRQ((x)+58) -#define IRQ_S3CUART_RX0 S3C2410_IRQSUB(0)/* 70 */ +#define IRQ_S3CUART_RX0 S3C2410_IRQSUB(0)/* 74 */ #define IRQ_S3CUART_TX0 S3C2410_IRQSUB(1)#define IRQ_S3CUART_ERR0 S3C2410_IRQSUB(2) -#define IRQ_S3CUART_RX1 S3C2410_IRQSUB(3)/* 73 */ +#define IRQ_S3CUART_RX1 S3C2410_IRQSUB(3)/* 77 */ #define IRQ_S3CUART_TX1 S3C2410_IRQSUB(4)#define IRQ_S3CUART_ERR1 S3C2410_IRQSUB(5) -#define IRQ_S3CUART_RX2 S3C2410_IRQSUB(6)/* 76 */ +#define IRQ_S3CUART_RX2 S3C2410_IRQSUB(6)/* 80 */ #define IRQ_S3CUART_TX2 S3C2410_IRQSUB(7)#define IRQ_S3CUART_ERR2 S3C2410_IRQSUB(8)
@@ -136,7 +136,7 @@/* second interrupt-register of s3c2416/s3c2450 */ -#define S3C2416_IRQ (x) S3C2410_IRQ((x) + 54 + 29) +#define S3C2416_IRQ (x) S3C2410_IRQ((x) + 58 + 29)#define IRQ_S3C2416_2D S3C2416_IRQ(0)#define IRQ_S3C2416_IIC1 S3C2416_IRQ(1)#define IRQ_S3C2416_RESERVED2 S3C2416_IRQ(2)
arch/arm/mach-s3c24xx/irq.c +2 -7
@@ -452,7 +452,6 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np,void __iomem *base = (void *)0xf6000000 ;/* static mapping */ int irq_num;int irq_start; -int irq_offset;int ret; intc =kzalloc (sizeof (struct s3c_irq_intc ),GFP_KERNEL );
@@ -476,7 +475,6 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, intc->reg_intpnd = base +0x10 ; irq_num =32 ; irq_start =S3C2410_IRQ (0 ); - irq_offset =0 ;break ;case 0x4a000018 :pr_debug ("irq: found subintc\n" );
@@ -484,7 +482,6 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, intc->reg_mask = base +0x1c ; irq_num =29 ; irq_start =S3C2410_IRQSUB (0 ); - irq_offset =0 ;break ;case 0x4a000040 :pr_debug ("irq: found intc2\n" );
@@ -493,7 +490,6 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, intc->reg_intpnd = base +0x50 ; irq_num =8 ; irq_start =S3C2416_IRQ (0 ); - irq_offset =0 ;break ;case 0x560000a4 :pr_debug ("irq: found eintc\n" );
@@ -501,9 +497,8 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, intc->reg_mask = base +0xa4 ; intc->reg_pending = base +0x08 ; - irq_num =20 ; + irq_num =24 ; irq_start =S3C2410_IRQ (32 ); - irq_offset =4 ;break ;default :pr_err ("irq: unsupported controller address\n" );
@@ -514,7 +509,7 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np,/* now that all the data is complete, init the irq-domain */ s3c24xx_clear_intc (intc); intc->domain =irq_domain_add_legacy (np, irq_num, irq_start, - irq_offset, &s3c24xx_irq_ops, +0 , &s3c24xx_irq_ops, intc);if (!intc->domain) {pr_err ("irq: could not create irq-domain\n" );
Signature · 1 line
1.7.2.3
PATCH 2/3 ARM: S3C24XX: add soc_is_s3c2412 option
In reply to Heiko StübnerMakes it possible to identify s3c2412 SoCs.
--- arch/arm/plat-samsung/include/plat/cpu.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/plat-samsung/include/plat/cpu.h +10 -0
@@ -23,6 +23,9 @@ extern unsigned long samsung_cpu_id;#define S3C24XX_CPU_ID 0x32400000#define S3C24XX_CPU_MASK 0xFFF00000 +#define S3C2412_CPU_ID 0x32412000 +#define S3C2412_CPU_MASK 0xFFFFF000 +#define S3C6400_CPU_ID 0x36400000#define S3C6410_CPU_ID 0x36410000#define S3C64XX_CPU_MASK 0xFFFFF000
@@ -53,6 +56,7 @@ static inline int is_samsung_##name(void) \ } IS_SAMSUNG_CPU(s3c24xx, S3C24XX_CPU_ID, S3C24XX_CPU_MASK) +IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK) IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK) IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK)IS_SAMSUNG_CPU (s5p6440,S5P6440_CPU_ID ,S5P64XX_CPU_MASK )
@@ -74,6 +78,12 @@ IS_SAMSUNG_CPU(exynos5440, EXYNOS5440_SOC_ID, EXYNOS5_SOC_MASK)# define soc_is_s3c24xx () 0#endif +#if defined(CONFIG_CPU_S3C2412 ) +# define soc_is_s3c2412 () is_samsung_s3c2412() +#else +# define soc_is_s3c2412 () 0 +#endif +#if defined(CONFIG_CPU_S3C6400 ) || defined(CONFIG_CPU_S3C6410 )# define soc_is_s3c64xx () (is_samsung_s3c6400() || is_samsung_s3c6410())#else
Signature · 1 line
1.7.2.3
PATCH 3/3 ARM: S3C24XX: handle s3c2412 eints using new infrastructure
In reply to Heiko StübnerThe s3c2412 handles the eints 0 to 3 different than all the other SoCs of the 24xx range. These eints must be acked and masked in the regular bits as well as the bits 0 to 3 of the eint registers, which are unused on the other SoCs.
This of course can be realized using the new infrastructure with the eint bits in the main register being the parent interrupts of the same bits in the eint register.
The s3c2412 therefore gets its own IRQ_EINT0 to 4 constants that reside in the newly created gap before IRQ_EINT4. gpio-samsung, as the only user of these is modified to return the correct values when handling gpio_to_irq requests on s3c2412 based machines.
Due to lack of hardware this is compile tested only, but should hopefully work as intended.
--- arch/arm/mach-s3c24xx/include/mach/irqs.h | 4 + arch/arm/mach-s3c24xx/irq.c | 118 +++++++++-------------------- drivers/gpio/gpio-samsung.c | 5 +- 3 files changed, 44 insertions(+), 83 deletions(-)
arch/arm/mach-s3c24xx/include/mach/irqs.h +4 -0
@@ -59,6 +59,10 @@#define IRQ_ADCPARENT S3C2410_IRQ(31)/* interrupts generated from the external interrupts sources */ +#define IRQ_EINT0_2412 S3C2410_IRQ(32) +#define IRQ_EINT1_2412 S3C2410_IRQ(33) +#define IRQ_EINT2_2412 S3C2410_IRQ(34) +#define IRQ_EINT3_2412 S3C2410_IRQ(35)#define IRQ_EINT4 S3C2410_IRQ(36)/* 52 */ #define IRQ_EINT5 S3C2410_IRQ(37)#define IRQ_EINT6 S3C2410_IRQ(38)
arch/arm/mach-s3c24xx/irq.c +36 -82
152 lines not on this page · raw message
drivers/gpio/gpio-samsung.c +4 -1
@@ -1123,7 +1123,10 @@ int samsung_gpiolib_to_irq(struct gpio_chip *chip, unsigned int offset)static int s3c24xx_gpiolib_fbank_to_irq (struct gpio_chip *chip,unsigned offset) {if (offset <4 ) -return IRQ_EINT0 + offset; +if (soc_is_s3c2412 ()) +return IRQ_EINT0_2412 + offset; +else +return IRQ_EINT0 + offset;if (offset <8 )return IRQ_EINT4 + offset -4 ;
Signature · 1 line
1.7.2.3
PATCH 3/3 ARM: S3C24XX: handle s3c2412 eints using new infrastructure
Quoted 14 lines · Heiko St?bner
The s3c2412 handles the eints 0 to 3 different than all the other SoCs of the 24xx range. These eints must be acked and masked in the regular bits as well as the bits 0 to 3 of the eint registers, which are unused on the other SoCs.
This of course can be realized using the new infrastructure with the eint bits in the main register being the parent interrupts of the same bits in the eint register.
The s3c2412 therefore gets its own
IRQ_EINT0to 4 constants that reside in the newly created gap beforeIRQ_EINT4. gpio-samsung, as the only user of these is modified to return the correct values when handlinggpio_to_irqrequests on s3c2412 based machines.
Quoted 4 lines
Due to lack of hardware this is compile tested only, but should hopefully work as intended.
Signed-off-by Heiko Stuebner <[email protected]>
We definately need an ACK from some Samsung maintainer for this patch...
Yours,
Linus Walleij
PATCH 3/3 ARM: S3C24XX: handle s3c2412 eints using new infrastructure
Am Freitag, 15. Februar 2013, 15:48:52 schrieb Linus Walleij:
Quoted 15 lines · Heiko St?bner
Quoted 14 lines
The s3c2412 handles the eints 0 to 3 different than all the other SoCs of the 24xx range. These eints must be acked and masked in the regular bits as well as the bits 0 to 3 of the eint registers, which are unused on the other SoCs.
This of course can be realized using the new infrastructure with the eint bits in the main register being the parent interrupts of the same bits in the eint register.
The s3c2412 therefore gets its own
IRQ_EINT0to 4 constants that reside in the newly created gap beforeIRQ_EINT4. gpio-samsung, as the only user of these is modified to return the correct values when handlinggpio_to_irqrequests on s3c2412 based machines.
Quoted 7 lines
Quoted 4 lines
Due to lack of hardware this is compile tested only, but should hopefully work as intended.
Signed-off-by Heiko Stuebner <[email protected]>We definately need an ACK from some Samsung maintainer for this patch...
Kukjin has already included these patches [0], but did only reply to the previous series (which handles s3c2440 specific stuff) that he included both [1].
Heiko
[0] http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=shortlog;h=refs/heads/next/irq-s3c24xx-2
[1] http://permalink.gmane.org/gmane.linux.kernel.samsung-soc/16074
PATCH 3/3 ARM: S3C24XX: handle s3c2412 eints using new infrastructure
In reply to Linus WalleijQuoted 16 lines · Linus Walleij
Quoted 14 lines · Heiko St??bner
The s3c2412 handles the eints 0 to 3 different than all the other SoCs of the 24xx range. These eints must be acked and masked in the regular bits as well as the bits 0 to 3 of the eint registers, which are unused on the other SoCs.
This of course can be realized using the new infrastructure with the eint bits in the main register being the parent interrupts of the same bits in the eint register.
The s3c2412 therefore gets its own
IRQ_EINT0to 4 constants that reside in the newly created gap beforeIRQ_EINT4. gpio-samsung, as the only user of these is modified to return the correct values when handlinggpio_to_irqrequests on s3c2412 based machines.
Quoted 7 lines
Quoted 4 lines
Due to lack of hardware this is compile tested only, but should hopefully work as intended.
Signed-off-by Heiko Stuebner <[email protected]>We definately need an ACK from some Samsung maintainer for this patch...
Pish, I'm not taking this. It's all arch/arm code with a 6 line drivers/gpio change. Instead:
g.