From: Tony Lindgren <tony@atomide.com> To: Benoit Cousson <b-cousson@ti.com> Cc: grant.likely@secretlab.ca, paul@pwsan.com, khilman@ti.com, rnayak@ti.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCH] ARM: OMAP2+: Remove custom init_irq for remaining boards Date: Mon, 26 Sep 2011 16:18:11 -0700 [thread overview] Message-ID: <20110926231811.GK6324@atomide.com> (raw) In-Reply-To: <20110926231646.GJ6324@atomide.com> With SoC specific timers, board specific init_irq is no longer needed. Earlier this was still needed to initialize the gptimer12 on Beagle based boards. Also convert board-h4.c to use omap2_init_irq accidentally did not get converted earlier. Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 4b1f6c6..059b74d 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -397,11 +397,6 @@ static struct platform_device keys_gpio = { }, }; -static void __init devkit8000_init_irq(void) -{ - omap3_init_irq(); -} - #define OMAP_DM9000_BASE 0x2c000000 static struct resource omap_dm9000_resources[] = { @@ -665,7 +660,7 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap35xx_init_early, - .init_irq = devkit8000_init_irq, + .init_irq = omap3_init_irq, .init_machine = devkit8000_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index fcc5107..8486142 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -290,11 +290,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = { { OMAP_TAG_LCD, &h4_lcd_config }, }; -static void __init omap_h4_init_irq(void) -{ - omap2_init_irq(); -} - static struct at24_platform_data m24c01 = { .byte_len = SZ_1K / 8, .page_size = 16, @@ -375,7 +370,7 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board") .reserve = omap_reserve, .map_io = omap242x_map_io, .init_early = omap2420_init_early, - .init_irq = omap_h4_init_irq, + .init_irq = omap2_init_irq, .init_machine = omap_h4_init, .timer = &omap2_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index ce3234d..e085371 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -449,11 +449,6 @@ static void __init omap3_beagle_init_early(void) omap2_init_common_infrastructure(); } -static void __init omap3_beagle_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_beagle_devices[] __initdata = { &leds_gpio, &keys_gpio, @@ -561,7 +556,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap3_beagle_init_early, - .init_irq = omap3_beagle_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_beagle_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 807c274..fa58a0f 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -428,11 +428,6 @@ static int __init omap3_stalker_i2c_init(void) static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { }; -static void __init omap3_stalker_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_stalker_devices[] __initdata = { &keys_gpio, }; @@ -492,7 +487,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") .boot_params = 0x80000100, .map_io = omap3_map_io, .init_early = omap35xx_init_early, - .init_irq = omap3_stalker_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_stalker_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index f7f1809..05488fb 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -326,11 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = { }; #endif -static void __init omap3_touchbook_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_touchbook_devices[] __initdata = { &omap3_touchbook_lcd_device, &leds_gpio, @@ -403,7 +398,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap3430_init_early, - .init_irq = omap3_touchbook_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_touchbook_init, .timer = &omap3_secure_timer, MACHINE_END
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: OMAP2+: Remove custom init_irq for remaining boards Date: Mon, 26 Sep 2011 16:18:11 -0700 [thread overview] Message-ID: <20110926231811.GK6324@atomide.com> (raw) In-Reply-To: <20110926231646.GJ6324@atomide.com> With SoC specific timers, board specific init_irq is no longer needed. Earlier this was still needed to initialize the gptimer12 on Beagle based boards. Also convert board-h4.c to use omap2_init_irq accidentally did not get converted earlier. Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 4b1f6c6..059b74d 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -397,11 +397,6 @@ static struct platform_device keys_gpio = { }, }; -static void __init devkit8000_init_irq(void) -{ - omap3_init_irq(); -} - #define OMAP_DM9000_BASE 0x2c000000 static struct resource omap_dm9000_resources[] = { @@ -665,7 +660,7 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap35xx_init_early, - .init_irq = devkit8000_init_irq, + .init_irq = omap3_init_irq, .init_machine = devkit8000_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index fcc5107..8486142 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -290,11 +290,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = { { OMAP_TAG_LCD, &h4_lcd_config }, }; -static void __init omap_h4_init_irq(void) -{ - omap2_init_irq(); -} - static struct at24_platform_data m24c01 = { .byte_len = SZ_1K / 8, .page_size = 16, @@ -375,7 +370,7 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board") .reserve = omap_reserve, .map_io = omap242x_map_io, .init_early = omap2420_init_early, - .init_irq = omap_h4_init_irq, + .init_irq = omap2_init_irq, .init_machine = omap_h4_init, .timer = &omap2_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index ce3234d..e085371 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -449,11 +449,6 @@ static void __init omap3_beagle_init_early(void) omap2_init_common_infrastructure(); } -static void __init omap3_beagle_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_beagle_devices[] __initdata = { &leds_gpio, &keys_gpio, @@ -561,7 +556,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap3_beagle_init_early, - .init_irq = omap3_beagle_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_beagle_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 807c274..fa58a0f 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -428,11 +428,6 @@ static int __init omap3_stalker_i2c_init(void) static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { }; -static void __init omap3_stalker_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_stalker_devices[] __initdata = { &keys_gpio, }; @@ -492,7 +487,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") .boot_params = 0x80000100, .map_io = omap3_map_io, .init_early = omap35xx_init_early, - .init_irq = omap3_stalker_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_stalker_init, .timer = &omap3_secure_timer, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index f7f1809..05488fb 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -326,11 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = { }; #endif -static void __init omap3_touchbook_init_irq(void) -{ - omap3_init_irq(); -} - static struct platform_device *omap3_touchbook_devices[] __initdata = { &omap3_touchbook_lcd_device, &leds_gpio, @@ -403,7 +398,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap3430_init_early, - .init_irq = omap3_touchbook_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3_touchbook_init, .timer = &omap3_secure_timer, MACHINE_END
next prev parent reply other threads:[~2011-09-26 23:18 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-23 20:23 [PATCH 00/11] OMAP: Add initial support for DT on OMAP3 & OMAP4 Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 01/11] OMAP2+: Add SoC specific map_io functions Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 23:00 ` Tony Lindgren 2011-09-23 23:00 ` Tony Lindgren 2011-09-26 23:15 ` Tony Lindgren 2011-09-26 23:15 ` Tony Lindgren 2011-09-26 23:16 ` [PATCH] ARM: OMAP2+: Use SoC specifc map_io Tony Lindgren 2011-09-26 23:16 ` Tony Lindgren 2011-09-26 23:18 ` Tony Lindgren [this message] 2011-09-26 23:18 ` [PATCH] ARM: OMAP2+: Remove custom init_irq for remaining boards Tony Lindgren 2012-05-04 15:59 ` [PATCH 01/11] OMAP2+: Add SoC specific map_io functions Thomas Petazzoni 2012-05-04 15:59 ` Thomas Petazzoni 2012-05-14 15:06 ` Cousson, Benoit 2012-05-14 15:06 ` Cousson, Benoit 2012-05-14 19:55 ` Nicolas Pitre 2012-05-14 19:55 ` Nicolas Pitre 2011-09-23 20:23 ` [PATCH 02/11] arm/dts: Add initial device tree support for OMAP4 SoC Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 03/11] arm/dts: Add support for OMAP4 PandaBoard Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 23:21 ` Grant Likely 2011-09-23 23:21 ` Grant Likely 2011-09-26 12:38 ` Cousson, Benoit 2011-09-26 12:38 ` Cousson, Benoit 2011-09-23 20:23 ` [PATCH 04/11] arm/dts: Add support for OMAP4 SDP board Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 05/11] arm/dts: Add initial device tree support for OMAP3 SoC Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 06/11] arm/dts: Add support for OMAP3 Beagle board Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 07/11] OMAP2+: board-generic: Add DT support to generic board Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 23:08 ` Tony Lindgren 2011-09-23 23:08 ` Tony Lindgren 2011-09-26 12:35 ` Cousson, Benoit 2011-09-26 12:35 ` Cousson, Benoit 2011-09-26 21:37 ` Tony Lindgren 2011-09-26 21:37 ` Tony Lindgren 2011-09-26 6:32 ` Rajendra Nayak 2011-09-26 6:32 ` Rajendra Nayak [not found] ` <4E801C62.5020700-l0cyMroinI0@public.gmane.org> 2011-09-26 9:00 ` Cousson, Benoit 2011-09-26 9:00 ` Cousson, Benoit 2011-09-23 20:23 ` [PATCH 08/11] OMAP2+: board-generic: Add i2c static init Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 23:12 ` Tony Lindgren 2011-09-23 23:12 ` Tony Lindgren 2011-09-23 23:47 ` Grant Likely 2011-09-23 23:47 ` Grant Likely 2011-09-26 16:45 ` Tony Lindgren 2011-09-26 16:45 ` Tony Lindgren 2011-09-23 20:23 ` [PATCH 09/11] OMAP2+: l3-noc: Add support for device-tree Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 20:23 ` [PATCH 10/11] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 22:58 ` Tony Lindgren 2011-09-23 22:58 ` Tony Lindgren 2011-09-26 12:13 ` Cousson, Benoit 2011-09-26 12:13 ` Cousson, Benoit 2011-09-26 21:44 ` Tony Lindgren 2011-09-26 21:44 ` Tony Lindgren 2011-09-23 20:23 ` [PATCH 11/11] arm/dts: OMAP3+: Add mpu, dsp and iva nodes Benoit Cousson 2011-09-23 20:23 ` Benoit Cousson 2011-09-23 23:26 ` Grant Likely 2011-09-23 23:26 ` Grant Likely
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=20110926231811.GK6324@atomide.com \ --to=tony@atomide.com \ --cc=b-cousson@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=grant.likely@secretlab.ca \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=paul@pwsan.com \ --cc=rnayak@ti.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.