| Message ID | 1245713126-18312-1-git-send-email-vikram.pandita@ti.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 577736be2190198b88c9f3868b75f8de3b98e3e6 |
| Delegated to: | Tony Lindgren |
| Headers | show |
* Vikram Pandita <vikram.pandita@ti.com> [090623 02:29]: > Pass irqflags to 8250 driver from zoom2 board file > Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq > > This patch is dependent on 8250 driver changes getting accepted upstream: > Refer: http://patchwork.kernel.org/patch/31884/ FYI, I'll archive this for now, please resubmit once the related changes are integrated. Or if resubmitting the related changes, please submit this too via the serial list. Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> > --- > > Warning: > could cause compilation break if 8250 patch is not integrated first > > arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ > arch/arm/mach-omap2/serial.c | 2 +- > 2 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c > index bac5c43..f546063 100644 > --- a/arch/arm/mach-omap2/board-zoom-debugboard.c > +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c > @@ -12,6 +12,7 @@ > #include <linux/gpio.h> > #include <linux/serial_8250.h> > #include <linux/smsc911x.h> > +#include <linux/interrupt.h> > > #include <mach/gpmc.h> > > @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { > .mapbase = 0x10000000, > .irq = OMAP_GPIO_IRQ(102), > .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, > + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, > .iotype = UPIO_MEM, > .regshift = 1, > .uartclk = QUART_CLK, > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index b094c15..45d4884 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) > omap_ctrl_writew(v, uart->padconf); > } > > - p->flags |= UPF_SHARE_IRQ; > + p->irqflags |= IRQF_SHARED; > ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, > "serial idle", (void *)uart); > WARN_ON(ret); > -- > 1.6.0.3.613.g9f8f13 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>-----Original Message----- >From: Tony Lindgren [mailto:tony@atomide.com] >Sent: Monday, August 10, 2009 11:39 AM >To: Pandita, Vikram >Cc: linux-omap@vger.kernel.org >Subject: Re: [PATCH v2] OMAP2: Zoom2: Pass irqflags to 8250 driver > >* Vikram Pandita <vikram.pandita@ti.com> [090623 02:29]: >> Pass irqflags to 8250 driver from zoom2 board file >> Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq >> >> This patch is dependent on 8250 driver changes getting accepted upstream: >> Refer: http://patchwork.kernel.org/patch/31884/ > >FYI, I'll archive this for now, please resubmit once the related changes >are integrated. Or if resubmitting the related changes, please submit this >too via the serial list. Looks like the dependency patch is already in linux-next tree at [1]. The dependency patch is already lined up stream. So looks like you can line this irqflag change for zoom2. [1] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7 > >Acked-by: Tony Lindgren <tony@atomide.com> > > >> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> >> --- >> >> Warning: >> could cause compilation break if 8250 patch is not integrated first >> >> arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ >> arch/arm/mach-omap2/serial.c | 2 +- >> 2 files changed, 3 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom- >debugboard.c >> index bac5c43..f546063 100644 >> --- a/arch/arm/mach-omap2/board-zoom-debugboard.c >> +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c >> @@ -12,6 +12,7 @@ >> #include <linux/gpio.h> >> #include <linux/serial_8250.h> >> #include <linux/smsc911x.h> >> +#include <linux/interrupt.h> >> >> #include <mach/gpmc.h> >> >> @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { >> .mapbase = 0x10000000, >> .irq = OMAP_GPIO_IRQ(102), >> .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, >> + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, >> .iotype = UPIO_MEM, >> .regshift = 1, >> .uartclk = QUART_CLK, >> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c >> index b094c15..45d4884 100644 >> --- a/arch/arm/mach-omap2/serial.c >> +++ b/arch/arm/mach-omap2/serial.c >> @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) >> omap_ctrl_writew(v, uart->padconf); >> } >> >> - p->flags |= UPF_SHARE_IRQ; >> + p->irqflags |= IRQF_SHARED; >> ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, >> "serial idle", (void *)uart); >> WARN_ON(ret); >> -- >> 1.6.0.3.613.g9f8f13 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Pandita, Vikram <vikram.pandita@ti.com> [090810 23:20]: > > > >-----Original Message----- > >From: Tony Lindgren [mailto:tony@atomide.com] > >Sent: Monday, August 10, 2009 11:39 AM > >To: Pandita, Vikram > >Cc: linux-omap@vger.kernel.org > >Subject: Re: [PATCH v2] OMAP2: Zoom2: Pass irqflags to 8250 driver > > > >* Vikram Pandita <vikram.pandita@ti.com> [090623 02:29]: > >> Pass irqflags to 8250 driver from zoom2 board file > >> Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq > >> > >> This patch is dependent on 8250 driver changes getting accepted upstream: > >> Refer: http://patchwork.kernel.org/patch/31884/ > > > >FYI, I'll archive this for now, please resubmit once the related changes > >are integrated. Or if resubmitting the related changes, please submit this > >too via the serial list. > > Looks like the dependency patch is already in linux-next tree at [1]. > The dependency patch is already lined up stream. > > So looks like you can line this irqflag change for zoom2. OK, thanks, will queue to omap3-upstream queue. Tony > > [1] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7 > > > > >Acked-by: Tony Lindgren <tony@atomide.com> > > > > > >> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> > >> --- > >> > >> Warning: > >> could cause compilation break if 8250 patch is not integrated first > >> > >> arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ > >> arch/arm/mach-omap2/serial.c | 2 +- > >> 2 files changed, 3 insertions(+), 1 deletions(-) > >> > >> diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom- > >debugboard.c > >> index bac5c43..f546063 100644 > >> --- a/arch/arm/mach-omap2/board-zoom-debugboard.c > >> +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c > >> @@ -12,6 +12,7 @@ > >> #include <linux/gpio.h> > >> #include <linux/serial_8250.h> > >> #include <linux/smsc911x.h> > >> +#include <linux/interrupt.h> > >> > >> #include <mach/gpmc.h> > >> > >> @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { > >> .mapbase = 0x10000000, > >> .irq = OMAP_GPIO_IRQ(102), > >> .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, > >> + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, > >> .iotype = UPIO_MEM, > >> .regshift = 1, > >> .uartclk = QUART_CLK, > >> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > >> index b094c15..45d4884 100644 > >> --- a/arch/arm/mach-omap2/serial.c > >> +++ b/arch/arm/mach-omap2/serial.c > >> @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) > >> omap_ctrl_writew(v, uart->padconf); > >> } > >> > >> - p->flags |= UPF_SHARE_IRQ; > >> + p->irqflags |= IRQF_SHARED; > >> ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, > >> "serial idle", (void *)uart); > >> WARN_ON(ret); > >> -- > >> 1.6.0.3.613.g9f8f13 > >> > >> -- > >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in > >> the body of a message to majordomo@vger.kernel.org > >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Branch in linux-omap: omap3-upstream Initial commit ID (Likely to change): 577736be2190198b88c9f3868b75f8de3b98e3e6 PatchWorks http://patchwork.kernel.org/patch/31888/ Git (Likely to change, and takes a while to get mirrored) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=577736be2190198b88c9f3868b75f8de3b98e3e6 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
tony >-----Original Message----- >From: Pandita, Vikram >>-----Original Message----- >>From: Tony Lindgren [mailto:tony@atomide.com] >>Subject: Re: [PATCH v2] OMAP2: Zoom2: Pass irqflags to 8250 driver >> >>* Vikram Pandita <vikram.pandita@ti.com> [090623 02:29]: >>> Pass irqflags to 8250 driver from zoom2 board file >>> Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq >>> >>> This patch is dependent on 8250 driver changes getting accepted upstream: >>> Refer: http://patchwork.kernel.org/patch/31884/ >> >>FYI, I'll archive this for now, please resubmit once the related changes >>are integrated. Or if resubmitting the related changes, please submit this >>too via the serial list. > >Looks like the dependency patch is already in linux-next tree at [1]. >The dependency patch is already lined up stream. > >So looks like you can line this irqflag change for zoom2. > >[1] http://git.kernel.org/?p=linux/kernel/git/sfr/linux- >next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7 > >> >>Acked-by: Tony Lindgren <tony@atomide.com> Would you be able to line this zoom2 patch as well in your omap3-boards branch? This patch is missing from your branch. >> >> >>> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> >>> --- >>> >>> Warning: >>> could cause compilation break if 8250 patch is not integrated first >>> >>> arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ >>> arch/arm/mach-omap2/serial.c | 2 +- >>> 2 files changed, 3 insertions(+), 1 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom- >>debugboard.c >>> index bac5c43..f546063 100644 >>> --- a/arch/arm/mach-omap2/board-zoom-debugboard.c >>> +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c >>> @@ -12,6 +12,7 @@ >>> #include <linux/gpio.h> >>> #include <linux/serial_8250.h> >>> #include <linux/smsc911x.h> >>> +#include <linux/interrupt.h> >>> >>> #include <mach/gpmc.h> >>> >>> @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { >>> .mapbase = 0x10000000, >>> .irq = OMAP_GPIO_IRQ(102), >>> .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, >>> + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, >>> .iotype = UPIO_MEM, >>> .regshift = 1, >>> .uartclk = QUART_CLK, >>> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c >>> index b094c15..45d4884 100644 >>> --- a/arch/arm/mach-omap2/serial.c >>> +++ b/arch/arm/mach-omap2/serial.c >>> @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) >>> omap_ctrl_writew(v, uart->padconf); >>> } >>> >>> - p->flags |= UPF_SHARE_IRQ; >>> + p->irqflags |= IRQF_SHARED; >>> ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, >>> "serial idle", (void *)uart); >>> WARN_ON(ret); >>> -- >>> 1.6.0.3.613.g9f8f13 >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in >>> the body of a message to majordomo@vger.kernel.org >>> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bac5c43..f546063 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -12,6 +12,7 @@ #include <linux/gpio.h> #include <linux/serial_8250.h> #include <linux/smsc911x.h> +#include <linux/interrupt.h> #include <mach/gpmc.h> @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .mapbase = 0x10000000, .irq = OMAP_GPIO_IRQ(102), .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, .iotype = UPIO_MEM, .regshift = 1, .uartclk = QUART_CLK, diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b094c15..45d4884 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) omap_ctrl_writew(v, uart->padconf); } - p->flags |= UPF_SHARE_IRQ; + p->irqflags |= IRQF_SHARED; ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, "serial idle", (void *)uart); WARN_ON(ret);
Pass irqflags to 8250 driver from zoom2 board file Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq This patch is dependent on 8250 driver changes getting accepted upstream: Refer: http://patchwork.kernel.org/patch/31884/ Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> --- Warning: could cause compilation break if 8250 patch is not integrated first arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ arch/arm/mach-omap2/serial.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)