From: Rob Herring <robherring2@gmail.com> To: "Heiko Stübner" <heiko@sntech.de> Cc: Kukjin Kim <kgene.kim@samsung.com>, linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Rob Herring <rob.herring@calxeda.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 6/6] irqchip: s3c24xx: add s3c2450 interrupt definitions Date: Mon, 18 Mar 2013 10:54:03 -0500 [thread overview] Message-ID: <5147389B.5060105@gmail.com> (raw) In-Reply-To: <201303171409.07774.heiko@sntech.de> On 03/17/2013 08:09 AM, Heiko Stübner wrote: > The s3c2450 is special in that it shares the cpu identification with the > s3c2416 but provides more interrupts for its additional components. > > It also shares the layout of the main interrupt register with the s3c2443 > and therefore reuses this definition. > > As no non-dt boards are present, the s3c2450 irqs will only be > accessible thru devicetree. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/irqchip/irq-s3c24xx.c | 62 +++++++++++++++++++++++++++++++++++++++- > 1 files changed, 60 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c > index 55cb363..7ddf8e8 100644 > --- a/drivers/irqchip/irq-s3c24xx.c > +++ b/drivers/irqchip/irq-s3c24xx.c > @@ -852,6 +852,51 @@ static struct s3c_irq_data init_s3c2416_second[32] = { > { .type = S3C_IRQTYPE_EDGE }, /* I2S0 */ > }; > > +static struct s3c_irq_data init_s3c2450subint[32] = { > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-ERR */ > + { .type = S3C_IRQTYPE_EDGE, .parent_irq = 31 }, /* TC */ > + { .type = S3C_IRQTYPE_EDGE, .parent_irq = 31 }, /* ADC */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 6 }, /* CAM_C */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 6 }, /* CAM_P */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD2 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD3 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD4 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA0 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA1 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA2 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA3 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA4 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA5 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 9 }, /* WDT */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 9 }, /* AC97 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA6 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA7 */ This all seems like information that should come from DT. > +}; > + > +static struct s3c_irq_data init_s3c2450second[32] = { > + { .type = S3C_IRQTYPE_EDGE }, /* 2D */ > + { .type = S3C_IRQTYPE_EDGE }, /* IIC1 */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_EDGE }, /* PCM0 */ > + { .type = S3C_IRQTYPE_EDGE }, /* PCM1 */ > + { .type = S3C_IRQTYPE_EDGE }, /* I2S0 */ > + { .type = S3C_IRQTYPE_EDGE }, /* I2S1 */ > +}; > + > void __init s3c2416_init_irq(void) > { > struct s3c_irq_intc *main_intc; > @@ -1024,7 +1069,7 @@ void __init s3c2442_init_irq(void) > } > #endif > > -#ifdef CONFIG_CPU_S3C2443 > +#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416) > static struct s3c_irq_data init_s3c2443base[32] = { > { .type = S3C_IRQTYPE_EINT, }, /* EINT0 */ > { .type = S3C_IRQTYPE_EINT, }, /* EINT1 */ > @@ -1059,8 +1104,9 @@ static struct s3c_irq_data init_s3c2443base[32] = { > { .type = S3C_IRQTYPE_EDGE, }, /* RTC */ > { .type = S3C_IRQTYPE_LEVEL, }, /* ADCPARENT */ > }; > +#endif > > - > +#ifdef CONFIG_CPU_S3C2443 > static struct s3c_irq_data init_s3c2443subint[32] = { > { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-RX */ > { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-TX */ > @@ -1172,6 +1218,17 @@ struct s3c24xx_irq_of_data s3c2416_irq_data = { > .irq_ctrl = s3c2416_ctrl, > .num_ctrl = ARRAY_SIZE(s3c2416_ctrl), > }; > + > +static struct s3c24xx_irq_of_ctrl s3c2450_ctrl[] = { > + S3C24XX_IRQCTRL("intc", 0, init_s3c2443base, &main_intc, NULL), > + S3C24XX_IRQCTRL("subintc", 0x18, init_s3c2450subint, NULL, &main_intc), > + S3C24XX_IRQCTRL("intc2", 0x40, init_s3c2450second, &main_intc2, NULL), > +}; > + > +static struct s3c24xx_irq_of_data s3c2450_irq_data = { > + .irq_ctrl = s3c2450_ctrl, > + .num_ctrl = ARRAY_SIZE(s3c2450_ctrl), > +}; > #endif > > #ifdef CONFIG_CPU_S3C2440 > @@ -1219,6 +1276,7 @@ static const struct of_device_id intc_list[] = { > #endif > #ifdef CONFIG_CPU_S3C2416 > { .compatible = "samsung,s3c2416-irq", .data = &s3c2416_irq_data }, > + { .compatible = "samsung,s3c2450-irq", .data = &s3c2450_irq_data }, Why are you not using IRQCHIP_OF_DECLARE? Rob
WARNING: multiple messages have this Message-ID (diff)
From: robherring2@gmail.com (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 6/6] irqchip: s3c24xx: add s3c2450 interrupt definitions Date: Mon, 18 Mar 2013 10:54:03 -0500 [thread overview] Message-ID: <5147389B.5060105@gmail.com> (raw) In-Reply-To: <201303171409.07774.heiko@sntech.de> On 03/17/2013 08:09 AM, Heiko St?bner wrote: > The s3c2450 is special in that it shares the cpu identification with the > s3c2416 but provides more interrupts for its additional components. > > It also shares the layout of the main interrupt register with the s3c2443 > and therefore reuses this definition. > > As no non-dt boards are present, the s3c2450 irqs will only be > accessible thru devicetree. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/irqchip/irq-s3c24xx.c | 62 +++++++++++++++++++++++++++++++++++++++- > 1 files changed, 60 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c > index 55cb363..7ddf8e8 100644 > --- a/drivers/irqchip/irq-s3c24xx.c > +++ b/drivers/irqchip/irq-s3c24xx.c > @@ -852,6 +852,51 @@ static struct s3c_irq_data init_s3c2416_second[32] = { > { .type = S3C_IRQTYPE_EDGE }, /* I2S0 */ > }; > > +static struct s3c_irq_data init_s3c2450subint[32] = { > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 23 }, /* UART1-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 15 }, /* UART2-ERR */ > + { .type = S3C_IRQTYPE_EDGE, .parent_irq = 31 }, /* TC */ > + { .type = S3C_IRQTYPE_EDGE, .parent_irq = 31 }, /* ADC */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 6 }, /* CAM_C */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 6 }, /* CAM_P */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD2 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD3 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 16 }, /* LCD4 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA0 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA1 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA2 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA3 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA4 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA5 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-RX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-TX */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 18 }, /* UART3-ERR */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 9 }, /* WDT */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 9 }, /* AC97 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA6 */ > + { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 17 }, /* DMA7 */ This all seems like information that should come from DT. > +}; > + > +static struct s3c_irq_data init_s3c2450second[32] = { > + { .type = S3C_IRQTYPE_EDGE }, /* 2D */ > + { .type = S3C_IRQTYPE_EDGE }, /* IIC1 */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_NONE }, /* reserved */ > + { .type = S3C_IRQTYPE_EDGE }, /* PCM0 */ > + { .type = S3C_IRQTYPE_EDGE }, /* PCM1 */ > + { .type = S3C_IRQTYPE_EDGE }, /* I2S0 */ > + { .type = S3C_IRQTYPE_EDGE }, /* I2S1 */ > +}; > + > void __init s3c2416_init_irq(void) > { > struct s3c_irq_intc *main_intc; > @@ -1024,7 +1069,7 @@ void __init s3c2442_init_irq(void) > } > #endif > > -#ifdef CONFIG_CPU_S3C2443 > +#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416) > static struct s3c_irq_data init_s3c2443base[32] = { > { .type = S3C_IRQTYPE_EINT, }, /* EINT0 */ > { .type = S3C_IRQTYPE_EINT, }, /* EINT1 */ > @@ -1059,8 +1104,9 @@ static struct s3c_irq_data init_s3c2443base[32] = { > { .type = S3C_IRQTYPE_EDGE, }, /* RTC */ > { .type = S3C_IRQTYPE_LEVEL, }, /* ADCPARENT */ > }; > +#endif > > - > +#ifdef CONFIG_CPU_S3C2443 > static struct s3c_irq_data init_s3c2443subint[32] = { > { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-RX */ > { .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-TX */ > @@ -1172,6 +1218,17 @@ struct s3c24xx_irq_of_data s3c2416_irq_data = { > .irq_ctrl = s3c2416_ctrl, > .num_ctrl = ARRAY_SIZE(s3c2416_ctrl), > }; > + > +static struct s3c24xx_irq_of_ctrl s3c2450_ctrl[] = { > + S3C24XX_IRQCTRL("intc", 0, init_s3c2443base, &main_intc, NULL), > + S3C24XX_IRQCTRL("subintc", 0x18, init_s3c2450subint, NULL, &main_intc), > + S3C24XX_IRQCTRL("intc2", 0x40, init_s3c2450second, &main_intc2, NULL), > +}; > + > +static struct s3c24xx_irq_of_data s3c2450_irq_data = { > + .irq_ctrl = s3c2450_ctrl, > + .num_ctrl = ARRAY_SIZE(s3c2450_ctrl), > +}; > #endif > > #ifdef CONFIG_CPU_S3C2440 > @@ -1219,6 +1276,7 @@ static const struct of_device_id intc_list[] = { > #endif > #ifdef CONFIG_CPU_S3C2416 > { .compatible = "samsung,s3c2416-irq", .data = &s3c2416_irq_data }, > + { .compatible = "samsung,s3c2450-irq", .data = &s3c2450_irq_data }, Why are you not using IRQCHIP_OF_DECLARE? Rob
next prev parent reply other threads:[~2013-03-18 15:54 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-17 13:04 [PATCH v3 0/6] move s3c24xx-irq to drivers/irqchip and add dt support Heiko Stübner 2013-03-17 13:04 ` Heiko Stübner [not found] ` <201303171404.06146.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2013-03-17 13:04 ` [PATCH v3 1/6] ARM: S3C24XX: move irq driver to drivers/irqchip Heiko Stübner 2013-03-17 13:04 ` Heiko Stübner 2013-03-17 13:05 ` [PATCH v3 2/6] irqchip: s3c24xx: fix comments on some camera interrupts Heiko Stübner 2013-03-17 13:05 ` Heiko Stübner 2013-03-17 13:06 ` [PATCH v3 3/6] irqchip: s3c24xx: fix irqlist of second s3c2416 controller Heiko Stübner 2013-03-17 13:06 ` Heiko Stübner 2013-03-17 13:07 ` [PATCH v3 4/6] irqchip: s3c24xx: use irq_create_mapping for parent irqs Heiko Stübner 2013-03-17 13:07 ` Heiko Stübner 2013-03-17 13:07 ` [PATCH v3 5/6] irqchip: s3c24xx: add devicetree support Heiko Stübner 2013-03-17 13:07 ` Heiko Stübner 2013-03-17 22:37 ` Heiko Stübner 2013-03-17 22:37 ` Heiko Stübner 2013-03-18 18:59 ` Rob Herring 2013-03-18 18:59 ` Rob Herring 2013-03-17 13:09 ` [PATCH v3 6/6] irqchip: s3c24xx: add s3c2450 interrupt definitions Heiko Stübner 2013-03-17 13:09 ` Heiko Stübner 2013-03-18 15:54 ` Rob Herring [this message] 2013-03-18 15:54 ` Rob Herring 2013-03-18 16:53 ` Heiko Stübner 2013-03-18 16:53 ` Heiko Stübner [not found] ` <201303181753.16547.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2013-03-18 22:14 ` Rob Herring 2013-03-18 22:14 ` Rob Herring 2013-03-18 22:21 ` Arnd Bergmann 2013-03-18 22:21 ` Arnd Bergmann [not found] ` <514791DC.9070600-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2013-03-18 23:34 ` Heiko Stübner 2013-03-18 23:34 ` Heiko Stübner 2013-03-19 2:28 ` Rob Herring 2013-03-19 2:28 ` Rob Herring 2013-03-19 18:38 ` Heiko Stübner 2013-03-19 18:38 ` Heiko Stübner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5147389B.5060105@gmail.com \ --to=robherring2@gmail.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=heiko@sntech.de \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=rob.herring@calxeda.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.