From: "Mohammed, Afzal" <afzal@ti.com> To: Tony Lindgren <tony@atomide.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "paul@pwsan.com" <paul@pwsan.com> Subject: RE: [PATCH 7/9] ARM: OMAP2+: Prepare for irqs.h removal Date: Tue, 4 Sep 2012 08:46:21 +0000 [thread overview] Message-ID: <C8443D0743D26F4388EA172BF4E2A7A93E9DC9F4@DBDE01.ent.ti.com> (raw) In-Reply-To: <20120831005237.28732.96766.stgit@muffinssi.local> Hi Tony, On Fri, Aug 31, 2012 at 06:22:37, Tony Lindgren wrote: > As the interrupts should only be defined in the platform_data, and > eventually coming from device tree, there's no need to define them > in header files. > > Let's remove the hardcoded references to irqs.h and fix up the includes > so we don't rely on headers included in irqs.h. While at it, sort > the includes the standard way. > arch/arm/mach-omap2/gpmc.c | 11 +++++--- > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > /* GPMC register offsets */ > #define GPMC_REVISION 0x00 > #define GPMC_SYSCONFIG 0x10 > @@ -846,16 +849,16 @@ static int __init gpmc_init(void) > l = OMAP2420_GPMC_BASE; > else > l = OMAP34XX_GPMC_BASE; > - gpmc_irq = INT_34XX_GPMC_IRQ; > + gpmc_irq = 20; > } else if (cpu_is_omap34xx()) { > ck = "gpmc_fck"; > l = OMAP34XX_GPMC_BASE; > - gpmc_irq = INT_34XX_GPMC_IRQ; > + gpmc_irq = 20; > } else if (cpu_is_omap44xx() || soc_is_omap54xx()) { > /* Base address and irq number are same for OMAP4/5 */ > ck = "gpmc_ck"; > l = OMAP44XX_GPMC_BASE; > - gpmc_irq = OMAP44XX_IRQ_GPMC; > + gpmc_irq = 20 + OMAP44XX_IRQ_GIC_START; I have a suggestion to avoid above hardcoded patching on gpmc.c. With driver conversion series it again would have to be patched. I have made a basic gpmc driver conversion, which is expected to be non-controversial. This was done over your devel-gpmc branch. It is working fine, has only 3 patches 1. Add hwmod entry 2. Adapt to hwmod 3. Basic driver conversion Here the basic driver gets resources and clk in driver probe using con-id "fck", it has no platform data as of now It is available @git://gitorious.org/x0148406-public/linux-kernel.git gpmc-simple-drv Originally this was made on top of my series, "OMAP-GPMC: generic time calc, prepare for driver" It was modified so that it can be applied to your devel-gpmc branch. *I am not sending the patches now to avoid confusion by way of having too many patch series* In case you like this, let me know, I will post. As I am proceeding with Paul's suggestion on hwmod reset, I hope Paul can take the first one. Regards Afzal
WARNING: multiple messages have this Message-ID (diff)
From: afzal@ti.com (Mohammed, Afzal) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/9] ARM: OMAP2+: Prepare for irqs.h removal Date: Tue, 4 Sep 2012 08:46:21 +0000 [thread overview] Message-ID: <C8443D0743D26F4388EA172BF4E2A7A93E9DC9F4@DBDE01.ent.ti.com> (raw) In-Reply-To: <20120831005237.28732.96766.stgit@muffinssi.local> Hi Tony, On Fri, Aug 31, 2012 at 06:22:37, Tony Lindgren wrote: > As the interrupts should only be defined in the platform_data, and > eventually coming from device tree, there's no need to define them > in header files. > > Let's remove the hardcoded references to irqs.h and fix up the includes > so we don't rely on headers included in irqs.h. While at it, sort > the includes the standard way. > arch/arm/mach-omap2/gpmc.c | 11 +++++--- > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > /* GPMC register offsets */ > #define GPMC_REVISION 0x00 > #define GPMC_SYSCONFIG 0x10 > @@ -846,16 +849,16 @@ static int __init gpmc_init(void) > l = OMAP2420_GPMC_BASE; > else > l = OMAP34XX_GPMC_BASE; > - gpmc_irq = INT_34XX_GPMC_IRQ; > + gpmc_irq = 20; > } else if (cpu_is_omap34xx()) { > ck = "gpmc_fck"; > l = OMAP34XX_GPMC_BASE; > - gpmc_irq = INT_34XX_GPMC_IRQ; > + gpmc_irq = 20; > } else if (cpu_is_omap44xx() || soc_is_omap54xx()) { > /* Base address and irq number are same for OMAP4/5 */ > ck = "gpmc_ck"; > l = OMAP44XX_GPMC_BASE; > - gpmc_irq = OMAP44XX_IRQ_GPMC; > + gpmc_irq = 20 + OMAP44XX_IRQ_GIC_START; I have a suggestion to avoid above hardcoded patching on gpmc.c. With driver conversion series it again would have to be patched. I have made a basic gpmc driver conversion, which is expected to be non-controversial. This was done over your devel-gpmc branch. It is working fine, has only 3 patches 1. Add hwmod entry 2. Adapt to hwmod 3. Basic driver conversion Here the basic driver gets resources and clk in driver probe using con-id "fck", it has no platform data as of now It is available @git://gitorious.org/x0148406-public/linux-kernel.git gpmc-simple-drv Originally this was made on top of my series, "OMAP-GPMC: generic time calc, prepare for driver" It was modified so that it can be applied to your devel-gpmc branch. *I am not sending the patches now to avoid confusion by way of having too many patch series* In case you like this, let me know, I will post. As I am proceeding with Paul's suggestion on hwmod reset, I hope Paul can take the first one. Regards Afzal
next prev parent reply other threads:[~2012-09-04 8:46 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-31 0:52 [PATCH 0/9] Clean up hardcoded IRQs for mach-omap2, enable SPARSE_IRQ, plaform_data/gpio-omap.h Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 1/9] ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 2/9] ARM: OMAP1: Define OMAP1_INT_I2C locally Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 3/9] ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 4/9] ARM: OMAP2+: Remove unused nand_irq for GPMC Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-09-03 10:10 ` Mohammed, Afzal 2012-09-03 10:10 ` Mohammed, Afzal 2012-08-31 0:52 ` [PATCH 5/9] ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 23:16 ` Linus Walleij 2012-08-31 23:16 ` Linus Walleij 2012-08-31 23:52 ` Tony Lindgren 2012-08-31 23:52 ` Tony Lindgren 2012-09-05 13:12 ` Peter Ujfalusi 2012-09-05 13:12 ` Peter Ujfalusi 2012-09-05 16:54 ` Tony Lindgren 2012-09-05 16:54 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 6/9] ARM: OMAP: Move gpio.h to include/linux/platform_data Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 23:17 ` Linus Walleij 2012-08-31 23:17 ` Linus Walleij 2012-08-31 23:17 ` Linus Walleij 2012-09-03 10:14 ` Mohammed, Afzal 2012-09-03 10:14 ` Mohammed, Afzal 2012-09-06 20:36 ` Tony Lindgren 2012-09-06 20:36 ` Tony Lindgren 2012-09-06 20:36 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 7/9] ARM: OMAP2+: Prepare for irqs.h removal Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-09-04 8:46 ` Mohammed, Afzal [this message] 2012-09-04 8:46 ` Mohammed, Afzal 2012-09-05 1:09 ` Tony Lindgren 2012-09-05 1:09 ` Tony Lindgren 2012-09-05 9:03 ` Mohammed, Afzal 2012-09-05 9:03 ` Mohammed, Afzal 2012-09-05 12:48 ` Mohammed, Afzal 2012-09-05 12:48 ` Mohammed, Afzal 2012-09-05 1:14 ` Tony Lindgren 2012-09-05 1:14 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 8/9] ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-09-05 1:17 ` Tony Lindgren 2012-09-05 1:17 ` Tony Lindgren 2012-08-31 0:52 ` [PATCH 9/9] ARM: OMAP1: Move plat/irqs.h to mach/irqs.h Tony Lindgren 2012-08-31 0:52 ` Tony Lindgren 2012-08-31 5:58 ` [PATCH 0/9] Clean up hardcoded IRQs for mach-omap2, enable SPARSE_IRQ, plaform_data/gpio-omap.h Rob Herring 2012-08-31 5:58 ` Rob Herring 2012-08-31 15:36 ` Tony Lindgren 2012-08-31 15:36 ` Tony Lindgren
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=C8443D0743D26F4388EA172BF4E2A7A93E9DC9F4@DBDE01.ent.ti.com \ --to=afzal@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=paul@pwsan.com \ --cc=tony@atomide.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.