ARM: davinci: aintc: wrap davinci_irq_init() with a helper

We're going to extend the davinci_irq_init() function with a config
structure so we can drop the intc-related fields from davinci_soc_info.

Once we do it, we won't be able to use this routine directly as the
init_irq callback. Wrap the calls in additional helpers that don't
take parameters and can be assigned to init_irq.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index f53a461a606f60107e669e122b8acce63d5a37c9..d122ba7c488954e0dcb9f34dd91feaafefcef7ab 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -438,7 +438,7 @@ static __init void dm355_evm_init(void)
 MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")
        .atag_offset  = 0x100,
        .map_io       = dm355_evm_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm355_init_irq,
        .init_time      = dm355_init_time,
        .init_machine = dm355_evm_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 0fdf1d03eb1107fffe7e69c2322eaffae0555620..b9e9950dd300a1e0917cd136d00357d83097a027 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -273,7 +273,7 @@ static __init void dm355_leopard_init(void)
 MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")
        .atag_offset  = 0x100,
        .map_io       = dm355_leopard_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm355_init_irq,
        .init_time      = dm355_init_time,
        .init_machine = dm355_leopard_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index f21dc8d3b28c1798d97da555c25d7ddd8310c049..150a36f333df0bd3583e725d6fe9c478b5c13923 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -831,7 +831,7 @@ static __init void dm365_evm_init(void)
 MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")
        .atag_offset    = 0x100,
        .map_io         = dm365_evm_map_io,
-       .init_irq       = davinci_irq_init,
+       .init_irq       = dm365_init_irq,
        .init_time      = dm365_init_time,
        .init_machine   = dm365_evm_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 0a338982125490d0857562fff95e2a056cc3b982..b392f362ed0355ceda5c1e87f3fbeec4231e6a04 100644 (file)
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -888,7 +888,7 @@ MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")
        /* Maintainer: MontaVista Software <source@mvista.com> */
        .atag_offset  = 0x100,
        .map_io       = davinci_evm_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm644x_init_irq,
        .init_time      = dm644x_init_time,
        .init_machine = davinci_evm_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 308109617a47eb0cd543121422fc8be25c931a5a..4600b617f9b4b3fdbd7457047c4f3bbb06a0c09e 100644 (file)
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -860,7 +860,7 @@ static __init void evm_init(void)
 MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM")
        .atag_offset  = 0x100,
        .map_io       = davinci_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm646x_init_irq,
        .init_time      = dm646x_evm_init_time,
        .init_machine = evm_init,
        .init_late      = davinci_init_late,
@@ -870,7 +870,7 @@ MACHINE_END
 MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")
        .atag_offset  = 0x100,
        .map_io       = davinci_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm646x_init_irq,
        .init_time      = dm6467t_evm_init_time,
        .init_machine = evm_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index efdaa27241c5eaee6bd6c231496bab51bf42d034..ce99f782811a228f4a42bedc6825aafffef49599 100644 (file)
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -231,7 +231,7 @@ MACHINE_START(NEUROS_OSD2, "Neuros OSD2")
        /* Maintainer: Neuros Technologies <neuros@groups.google.com> */
        .atag_offset    = 0x100,
        .map_io          = davinci_ntosd2_map_io,
-       .init_irq       = davinci_irq_init,
+       .init_irq       = dm644x_init_irq,
        .init_time      = dm644x_init_time,
        .init_machine = davinci_ntosd2_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index ff14de1396c875c6b32aeb73b85c8ebb80588bd1..bcdefde2f40110bc5b53047ec6ed786377f95fd1 100644 (file)
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -152,7 +152,7 @@ static __init void davinci_sffsdr_init(void)
 MACHINE_START(SFFSDR, "Lyrtech SFFSDR")
        .atag_offset  = 0x100,
        .map_io       = davinci_sffsdr_map_io,
-       .init_irq     = davinci_irq_init,
+       .init_irq     = dm644x_init_irq,
        .init_time      = dm644x_init_time,
        .init_machine = davinci_sffsdr_init,
        .init_late      = davinci_init_late,

diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index db4c95ef4d5c59302a407b7a287a4ece098e7de6..56c1835c42e59bfb387ad206ecf55d9b1c660f93 100644 (file)
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -88,6 +88,7 @@ int davinci_init_wdt(void);
 /* DM355 function declarations */
 void dm355_init(void);
 void dm355_init_time(void);
+void dm355_init_irq(void);
 void dm355_register_clocks(void);
 void dm355_init_spi0(unsigned chipselect_mask,
                const struct spi_board_info *info, unsigned len);
@@ -97,6 +98,7 @@ int dm355_gpio_register(void);
 
 /* DM365 function declarations */
 void dm365_init(void);
+void dm365_init_irq(void);
 void dm365_init_time(void);
 void dm365_register_clocks(void);
 void dm365_init_asp(void);
@@ -110,6 +112,7 @@ int dm365_gpio_register(void);
 
 /* DM644x function declarations */
 void dm644x_init(void);
+void dm644x_init_irq(void);
 void dm644x_init_devices(void);
 void dm644x_init_time(void);
 void dm644x_register_clocks(void);
@@ -119,6 +122,7 @@ int dm644x_gpio_register(void);
 
 /* DM646x function declarations */
 void dm646x_init(void);
+void dm646x_init_irq(void);
 void dm646x_init_time(unsigned long ref_clk_rate, unsigned long aux_clkin_rate);
 void dm646x_register_clocks(void);
 void dm646x_init_mcasp0(struct snd_platform_data *pdata);

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b27ea4fc1d517b16f7f7f602033ff373fb422a98..6c65699cb07488c017325867b2fbf2f6a720bd5e 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -792,6 +792,11 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+void __init dm355_init_irq(void)
+{
+       davinci_irq_init();
+}
+
 static int __init dm355_init_devices(void)
 {
        struct platform_device *edma_pdev;

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index d9c6ab9215a6a64276e07ca1e187e625e466927a..e1c223c6031f2803dbc9bbd5954dc51036b1d2c7 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -1051,6 +1051,11 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+void __init dm365_init_irq(void)
+{
+       davinci_irq_init();
+}
+
 static int __init dm365_init_devices(void)
 {
        struct platform_device *edma_pdev;

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index b2748c82b747b80a6ceae6e04ee10685170ad6b5..2b18c134ee158547f32bc629bcb30b42f11a853b 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -728,6 +728,11 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+void __init dm644x_init_irq(void)
+{
+       davinci_irq_init();
+}
+
 void __init dm644x_init_devices(void)
 {
        struct platform_device *edma_pdev;

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index cf210741dfe50f5d083491269d5685509bd4a4eb..75a9f80317ca8c56a19240bd68033d7ab90354fa 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -689,6 +689,11 @@ void __init dm646x_register_clocks(void)
        platform_device_register(&dm646x_pll2_device);
 }
 
+void __init dm646x_init_irq(void)
+{
+       davinci_irq_init();
+}
+
 static int __init dm646x_init_devices(void)
 {
        int ret = 0;