Hi everyone,
This is a splitted up version of the patch I previously sent to
remove the explicit declaration of irqchip_init as the init_irq callback in
the machine descriptions.
Since it was a pretty tricky patch to merge, since it was touching a lot of
different platforms, I splitted it for each platforms, and rebased it on top
of 3.10-rc1.
The best way to merge it is probably that each one of us take into their tree
the patches that are relevant for our architecture and send them to arm-soc
later on.
Thanks,
Maxime
Changes from v1:
- Removed the dead include of linux/irqchip.h
- Splitted the shmobile changes into several patches
Maxime Ripard (20):
ARM: sunxi: Remove init_irq declaration in machine description
ARM: zynq: Remove init_irq declaration in machine description
ARM: nomadik: Remove init_irq declaration in machine description
ARM: picoxcell: Remove init_irq declaration in machine description
ARM: shmobile: ape6evm: Remove init_irq declaration in machine
description
ARM: shmobile: kzm9g: Remove init_irq declaration in machine
description
ARM: shmobile: lager: Remove init_irq declaration in machine
description
ARM: shmobile: emev2: Remove init_irq declaration in machine
description
ARM: shmobile: r8a73a4: Remove init_irq declaration in machine
description
ARM: shmobile: r8a7790: Remove init_irq declaration in machine
description
ARM: shmobile: sh73a0: Remove init_irq declaration in machine
description
ARM: bcm281xx: Remove init_irq declaration in machine description
ARM: spear: Remove init_irq declaration in machine description
ARM: msm: Remove init_irq declaration in machine description
ARM: mvebu: Remove init_irq declaration in machine description
ARM: mxs: Remove init_irq declaration in machine description
ARM: sirf: Remove init_irq declaration in machine description
ARM: vexpress: Remove init_irq declaration in machine description
ARM: virt: Remove init_irq declaration in machine description
ARM: vt8500: Remove init_irq declaration in machine description
arch/arm/mach-bcm/board_bcm.c | 2 --
arch/arm/mach-msm/board-dt-8660.c | 2 --
arch/arm/mach-msm/board-dt-8960.c | 2 --
arch/arm/mach-mvebu/armada-370-xp.c | 2 --
arch/arm/mach-mxs/mach-mxs.c | 2 --
arch/arm/mach-nomadik/cpu-8815.c | 2 --
arch/arm/mach-picoxcell/common.c | 2 --
arch/arm/mach-prima2/common.c | 4 ----
arch/arm/mach-shmobile/board-ape6evm.c | 2 --
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
arch/arm/mach-shmobile/board-lager.c | 2 --
arch/arm/mach-shmobile/setup-emev2.c | 2 --
arch/arm/mach-shmobile/setup-r8a73a4.c | 2 --
arch/arm/mach-shmobile/setup-r8a7790.c | 2 --
arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
arch/arm/mach-spear/spear1310.c | 2 --
arch/arm/mach-spear/spear1340.c | 2 --
arch/arm/mach-spear/spear300.c | 2 --
arch/arm/mach-spear/spear310.c | 2 --
arch/arm/mach-spear/spear320.c | 2 --
arch/arm/mach-spear/spear6xx.c | 2 --
arch/arm/mach-sunxi/sunxi.c | 2 --
arch/arm/mach-vexpress/v2m.c | 2 --
arch/arm/mach-virt/virt.c | 2 --
arch/arm/mach-vt8500/vt8500.c | 2 --
arch/arm/mach-zynq/common.c | 2 --
26 files changed, 54 deletions(-)
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index aefa50d..b7ee96e 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -24,7 +24,6 @@
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/input.h>
#include <linux/of_platform.h>
#include <linux/pinctrl/machine.h>
@@ -100,7 +99,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = kzm_init,
.init_time = shmobile_timer_init,
.dt_compat = kzm9g_boards_compat_dt,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/setup-r8a73a4.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index c5a75a7..0b78896 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/irq-renesas-irqc.h>
@@ -194,7 +193,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
- .init_irq = irqchip_init,
.init_machine = r8a73a4_add_standard_devices_dt,
.init_time = shmobile_timer_init,
.dt_compat = r8a73a4_boards_compat_dt,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for bcm281xx as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Christian Daudt <[email protected]>
---
arch/arm/mach-bcm/board_bcm.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 22e8421..2859932 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -15,7 +15,6 @@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
-#include <linux/irqchip.h>
#include <linux/clocksource.h>
#include <asm/mach/arch.h>
@@ -54,7 +53,6 @@ static void __init board_init(void)
static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
- .init_irq = irqchip_init,
.init_time = clocksource_of_init,
.init_machine = board_init,
.dt_compat = bcm11351_dt_compat,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for vexpress as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Pawel Moll <[email protected]>
---
arch/arm/mach-vexpress/v2m.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 8802030..d601697 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -9,7 +9,6 @@
#include <linux/clocksource.h>
#include <linux/smp.h>
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/of_fdt.h>
#include <linux/of_irq.h>
@@ -458,7 +457,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
.smp = smp_ops(vexpress_smp_ops),
.map_io = v2m_dt_map_io,
.init_early = v2m_dt_init_early,
- .init_irq = irqchip_init,
.init_time = v2m_dt_timer_init,
.init_machine = v2m_dt_init,
MACHINE_END
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for msm as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-msm/board-dt-8660.c | 2 --
arch/arm/mach-msm/board-dt-8960.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c
index 7dcfc53..492f5cd 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -11,7 +11,6 @@
*/
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/of.h>
#include <linux/of_platform.h>
@@ -44,7 +43,6 @@ static const char *msm8x60_fluid_match[] __initdata = {
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
.smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8x60_io,
- .init_irq = irqchip_init,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
.init_time = msm_dt_timer_init,
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c
index 7301936..bb55309 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -11,7 +11,6 @@
*/
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
@@ -31,7 +30,6 @@ static const char * const msm8960_dt_match[] __initconst = {
DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
.smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8960_io,
- .init_irq = irqchip_init,
.init_time = msm_dt_timer_init,
.init_machine = msm_dt_init,
.dt_compat = msm8960_dt_match,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for vt8500 as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-vt8500/vt8500.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 1dd281e..70a5ac9 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -20,7 +20,6 @@
#include <linux/clocksource.h>
#include <linux/io.h>
-#include <linux/irqchip.h>
#include <linux/pm.h>
#include <asm/mach-types.h>
@@ -178,7 +177,6 @@ static const char * const vt8500_dt_compat[] = {
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
.dt_compat = vt8500_dt_compat,
.map_io = vt8500_map_io,
- .init_irq = irqchip_init,
.init_machine = vt8500_init,
.init_time = clocksource_of_init,
.restart = vt8500_restart,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for virt as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-virt/virt.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
index 061f283..bdf05f4 100644
--- a/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <linux/irqchip.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/smp.h>
@@ -39,7 +38,6 @@ static const char *virt_dt_match[] = {
extern struct smp_operations virt_smp_ops;
DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
- .init_irq = irqchip_init,
.init_machine = virt_init,
.smp = smp_ops(virt_smp_ops),
.dt_compat = virt_dt_match,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for sirf as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Barry Song <[email protected]>
---
arch/arm/mach-prima2/common.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 4f94cd8..a9f475c 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -9,7 +9,6 @@
#include <linux/clocksource.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/irqchip.h>
#include <asm/sizes.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -55,7 +54,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
@@ -74,7 +72,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
@@ -94,7 +91,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.smp = smp_ops(sirfsoc_smp_ops),
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for mxs as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-mxs/mach-mxs.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 5b62b64..66fe810 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -19,7 +19,6 @@
#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/irqchip/mxs.h>
#include <linux/micrel_phy.h>
#include <linux/of_address.h>
@@ -435,7 +434,6 @@ static const char *mxs_dt_compat[] __initdata = {
DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
.map_io = debug_ll_io_init,
- .init_irq = irqchip_init,
.handle_irq = icoll_handle_irq,
.init_time = mxs_timer_init,
.init_machine = mxs_machine_init,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for mvebu as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Jason Cooper <[email protected]>
---
arch/arm/mach-mvebu/armada-370-xp.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 42a4cb3..c04fed8 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -20,7 +20,6 @@
#include <linux/clk/mvebu.h>
#include <linux/dma-mapping.h>
#include <linux/mbus.h>
-#include <linux/irqchip.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -96,7 +95,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io,
.init_early = armada_370_xp_init_early,
- .init_irq = irqchip_init,
.init_time = armada_370_xp_timer_and_clk_init,
.restart = mvebu_restart,
.dt_compat = armada_370_xp_dt_compat,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for spear as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
---
arch/arm/mach-spear/spear1310.c | 2 --
arch/arm/mach-spear/spear1340.c | 2 --
arch/arm/mach-spear/spear300.c | 2 --
arch/arm/mach-spear/spear310.c | 2 --
arch/arm/mach-spear/spear320.c | 2 --
arch/arm/mach-spear/spear6xx.c | 2 --
6 files changed, 12 deletions(-)
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c
index 9eaac2c..7ad0030 100644
--- a/arch/arm/mach-spear/spear1310.c
+++ b/arch/arm/mach-spear/spear1310.c
@@ -14,7 +14,6 @@
#define pr_fmt(fmt) "SPEAr1310: " fmt
#include <linux/amba/pl022.h>
-#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <linux/pata_arasan_cf_data.h>
#include <asm/mach/arch.h>
@@ -60,7 +59,6 @@ static void __init spear1310_map_io(void)
DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")
.smp = smp_ops(spear13xx_smp_ops),
.map_io = spear1310_map_io,
- .init_irq = irqchip_init,
.init_time = spear13xx_timer_init,
.init_machine = spear1310_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c
index a04a7fe..3fb6834 100644
--- a/arch/arm/mach-spear/spear1340.c
+++ b/arch/arm/mach-spear/spear1340.c
@@ -17,7 +17,6 @@
#include <linux/amba/serial.h>
#include <linux/delay.h>
#include <linux/of_platform.h>
-#include <linux/irqchip.h>
#include <asm/mach/arch.h>
#include "generic.h"
#include <mach/spear.h>
@@ -155,7 +154,6 @@ static const char * const spear1340_dt_board_compat[] = {
DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")
.smp = smp_ops(spear13xx_smp_ops),
.map_io = spear13xx_map_io,
- .init_irq = irqchip_init,
.init_time = spear13xx_timer_init,
.init_machine = spear1340_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c
index bac56e8..b52e48f 100644
--- a/arch/arm/mach-spear/spear300.c
+++ b/arch/arm/mach-spear/spear300.c
@@ -14,7 +14,6 @@
#define pr_fmt(fmt) "SPEAr300: " fmt
#include <linux/amba/pl08x.h>
-#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include "generic.h"
@@ -212,7 +211,6 @@ static void __init spear300_map_io(void)
DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")
.map_io = spear300_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear300_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c
index 6ffbc63..ed2029d 100644
--- a/arch/arm/mach-spear/spear310.c
+++ b/arch/arm/mach-spear/spear310.c
@@ -15,7 +15,6 @@
#include <linux/amba/pl08x.h>
#include <linux/amba/serial.h>
-#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include "generic.h"
@@ -254,7 +253,6 @@ static void __init spear310_map_io(void)
DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")
.map_io = spear310_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear310_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c
index 6eb3eec..bf634b3 100644
--- a/arch/arm/mach-spear/spear320.c
+++ b/arch/arm/mach-spear/spear320.c
@@ -16,7 +16,6 @@
#include <linux/amba/pl022.h>
#include <linux/amba/pl08x.h>
#include <linux/amba/serial.h>
-#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -269,7 +268,6 @@ static void __init spear320_map_io(void)
DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")
.map_io = spear320_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear320_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c
index ec8eefb..8b0295a 100644
--- a/arch/arm/mach-spear/spear6xx.c
+++ b/arch/arm/mach-spear/spear6xx.c
@@ -16,7 +16,6 @@
#include <linux/amba/pl08x.h>
#include <linux/clk.h>
#include <linux/err.h>
-#include <linux/irqchip.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
@@ -423,7 +422,6 @@ static const char *spear600_dt_board_compat[] = {
DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)")
.map_io = spear6xx_map_io,
- .init_irq = irqchip_init,
.init_time = spear6xx_timer_init,
.init_machine = spear600_dt_init,
.restart = spear_restart,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index fdf3894..73dd75b 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -22,7 +22,6 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/platform_device.h>
#include <linux/of_platform.h>
#include <linux/delay.h>
@@ -1035,7 +1034,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = sh73a0_add_standard_devices_dt,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/setup-r8a7790.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 49de2d5..2a7a276 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -19,7 +19,6 @@
*/
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/serial_sci.h>
@@ -142,7 +141,6 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
- .init_irq = irqchip_init,
.init_machine = r8a7790_add_standard_devices_dt,
.init_time = r8a7790_timer_init,
.dt_compat = r8a7790_boards_compat_dt,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/setup-emev2.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 899a86c..66694e0 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -20,7 +20,6 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/platform_device.h>
#include <linux/platform_data/gpio-em.h>
#include <linux/of_platform.h>
@@ -454,7 +453,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
.init_early = emev2_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = emev2_add_standard_devices_dt,
.dt_compat = emev2_boards_compat_dt,
MACHINE_END
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/board-lager.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index f587187..b7488b8 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -19,7 +19,6 @@
*/
#include <linux/interrupt.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <mach/common.h>
@@ -39,7 +38,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(LAGER_DT, "lager")
- .init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for sunxi as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-sunxi/sunxi.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 706ce35..08937a3 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -14,7 +14,6 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
@@ -117,7 +116,6 @@ static const char * const sunxi_board_dt_compat[] = {
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
.init_machine = sunxi_dt_init,
.map_io = sunxi_map_io,
- .init_irq = irqchip_init,
.init_time = sunxi_timer_init,
.dt_compat = sunxi_board_dt_compat,
MACHINE_END
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for shmobile as well.
Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/board-ape6evm.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 55b8c9f..8dfbdba 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -20,7 +20,6 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
@@ -87,7 +86,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
- .init_irq = irqchip_init,
.init_time = shmobile_timer_init,
.init_machine = ape6evm_add_standard_devices,
.dt_compat = ape6evm_boards_compat_dt,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for nomadik as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
arch/arm/mach-nomadik/cpu-8815.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 59f6ff5..46cce9b 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -25,7 +25,6 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/dma-mapping.h>
-#include <linux/irqchip.h>
#include <linux/platform_data/clk-nomadik.h>
#include <linux/platform_data/pinctrl-nomadik.h>
#include <linux/pinctrl/machine.h>
@@ -323,7 +322,6 @@ static const char * cpu8815_board_compat[] = {
DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
.map_io = cpu8815_map_io,
- .init_irq = irqchip_init,
.init_time = cpu8815_timer_init_of,
.init_machine = cpu8815_init_of,
.restart = cpu8815_restart,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for picoxcell as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Jamie Iles <[email protected]>
---
arch/arm/mach-picoxcell/common.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 70b441a..c2721ce 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -9,7 +9,6 @@
*/
#include <linux/delay.h>
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_address.h>
@@ -87,7 +86,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd)
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
.map_io = picoxcell_map_io,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_time = dw_apb_timer_init,
.init_machine = picoxcell_init_machine,
.dt_compat = picoxcell_dt_match,
--
1.8.1.2
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for zynq as well.
Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Michal Simek <[email protected]>
---
arch/arm/mach-zynq/common.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5bfe703..4c0199b8 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -25,7 +25,6 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/of.h>
-#include <linux/irqchip.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = {
MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
.smp = smp_ops(zynq_smp_ops),
.map_io = zynq_map_io,
- .init_irq = irqchip_init,
.init_machine = zynq_init_machine,
.init_time = zynq_timer_init,
.dt_compat = zynq_dt_match,
--
1.8.1.2
On 05/14/2013 05:38 PM, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for zynq as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> Acked-by: Michal Simek <[email protected]>
> ---
> arch/arm/mach-zynq/common.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 5bfe703..4c0199b8 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -25,7 +25,6 @@
> #include <linux/of_irq.h>
> #include <linux/of_platform.h>
> #include <linux/of.h>
> -#include <linux/irqchip.h>
>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> @@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = {
> MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
> .smp = smp_ops(zynq_smp_ops),
> .map_io = zynq_map_io,
> - .init_irq = irqchip_init,
> .init_machine = zynq_init_machine,
> .init_time = zynq_timer_init,
> .dt_compat = zynq_dt_match,
>
Subject should contain v2 but anyway I have added it my zynq repo.
Thanks,
Michal
Hi Maxime,
Thanks for this, I'll add it to my tree. I've modified it slightly to
kill off the other irq includes, hopefully that's okay with you.
Thanks,
Jamie
8<---
>From 4b83f75a7af388aaf5f79ccf72c37074bc9166da Mon Sep 17 00:00:00 2001
From: Maxime Ripard <[email protected]>
Date: Tue, 14 May 2013 17:38:37 +0200
Subject: [PATCH] ARM: picoxcell: Remove init_irq declaration in machine
description
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for picoxcell as well.
[ jiles: removed other, unused irq includes. ]
Signed-off-by: Maxime Ripard <[email protected]>
Signed-off-by: Jamie Iles <[email protected]>
---
arch/arm/mach-picoxcell/common.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index f6f71bb..b069fa6 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -8,12 +8,8 @@
* All enquiries to [email protected]
*/
#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/irqchip.h>
-#include <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_address.h>
-#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/dw_apb_timer.h>
@@ -85,7 +81,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd)
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
.map_io = picoxcell_map_io,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_time = dw_apb_timer_init,
.init_machine = picoxcell_init_machine,
.dt_compat = picoxcell_dt_match,
--
1.8.1.2
On 13-05-14 08:38 AM, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for bcm281xx as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> Acked-by: Christian Daudt <[email protected]>
> ---
> arch/arm/mach-bcm/board_bcm.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
> index 22e8421..2859932 100644
> --- a/arch/arm/mach-bcm/board_bcm.c
> +++ b/arch/arm/mach-bcm/board_bcm.c
> @@ -15,7 +15,6 @@
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/platform_device.h>
> -#include <linux/irqchip.h>
> #include <linux/clocksource.h>
>
> #include <asm/mach/arch.h>
> @@ -54,7 +53,6 @@ static void __init board_init(void)
> static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
>
> DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
> - .init_irq = irqchip_init,
> .init_time = clocksource_of_init,
> .init_machine = board_init,
> .dt_compat = bcm11351_dt_compat,
Applied.
Thanks,
csd
On Tue, May 14, 2013 at 05:38:38PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/board-ape6evm.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
> index 55b8c9f..8dfbdba 100644
> --- a/arch/arm/mach-shmobile/board-ape6evm.c
> +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> @@ -20,7 +20,6 @@
>
> #include <linux/gpio.h>
> #include <linux/interrupt.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/pinctrl/machine.h>
> #include <linux/platform_device.h>
> @@ -87,7 +86,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(APE6EVM_DT, "ape6evm")
> - .init_irq = irqchip_init,
> .init_time = shmobile_timer_init,
> .init_machine = ape6evm_add_standard_devices,
> .dt_compat = ape6evm_boards_compat_dt,
Signed-off-by: Simon Horman <[email protected]>
On Tue, May 14, 2013 at 05:38:39PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> index aefa50d..b7ee96e 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -24,7 +24,6 @@
> #include <linux/gpio.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/input.h>
> #include <linux/of_platform.h>
> #include <linux/pinctrl/machine.h>
> @@ -100,7 +99,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> .map_io = sh73a0_map_io,
> .init_early = sh73a0_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = kzm_init,
> .init_time = shmobile_timer_init,
> .dt_compat = kzm9g_boards_compat_dt,
Signed-off-by: Simon Horman <[email protected]>
On Tue, May 14, 2013 at 05:38:40PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/board-lager.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
> index f587187..b7488b8 100644
> --- a/arch/arm/mach-shmobile/board-lager.c
> +++ b/arch/arm/mach-shmobile/board-lager.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/interrupt.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <mach/common.h>
> @@ -39,7 +38,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(LAGER_DT, "lager")
> - .init_irq = irqchip_init,
> .init_time = r8a7790_timer_init,
> .init_machine = lager_add_standard_devices,
> .dt_compat = lager_boards_compat_dt,
Signed-off-by: Simon Horman <[email protected]>
On Tue, May 14, 2013 at 05:38:41PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/setup-emev2.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
> index 899a86c..66694e0 100644
> --- a/arch/arm/mach-shmobile/setup-emev2.c
> +++ b/arch/arm/mach-shmobile/setup-emev2.c
> @@ -20,7 +20,6 @@
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/platform_device.h>
> #include <linux/platform_data/gpio-em.h>
> #include <linux/of_platform.h>
> @@ -454,7 +453,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
> .smp = smp_ops(emev2_smp_ops),
> .init_early = emev2_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = emev2_add_standard_devices_dt,
> .dt_compat = emev2_boards_compat_dt,
> MACHINE_END
Signed-off-by: Simon Horman <[email protected]>
On Wed, May 15, 2013 at 09:59:07AM +0900, Simon Horman wrote:
> On Tue, May 14, 2013 at 05:38:38PM +0200, Maxime Ripard wrote:
> > Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> > specified") removed the need to explictly setup the init_irq field in
> > the machine description when using only irqchip_init. Remove that
> > declaration for shmobile as well.
> >
> > Signed-off-by: Maxime Ripard <[email protected]>
> > ---
> > arch/arm/mach-shmobile/board-ape6evm.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
> > index 55b8c9f..8dfbdba 100644
> > --- a/arch/arm/mach-shmobile/board-ape6evm.c
> > +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> > @@ -20,7 +20,6 @@
> >
> > #include <linux/gpio.h>
> > #include <linux/interrupt.h>
> > -#include <linux/irqchip.h>
> > #include <linux/kernel.h>
> > #include <linux/pinctrl/machine.h>
> > #include <linux/platform_device.h>
> > @@ -87,7 +86,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
> > };
> >
> > DT_MACHINE_START(APE6EVM_DT, "ape6evm")
> > - .init_irq = irqchip_init,
> > .init_time = shmobile_timer_init,
> > .init_machine = ape6evm_add_standard_devices,
> > .dt_compat = ape6evm_boards_compat_dt,
>
> Signed-off-by: Simon Horman <[email protected]>
Sorry, what I should have said is:
Queued up for v3.11 in the boards-spe6evm branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Wed, May 15, 2013 at 09:59:17AM +0900, Simon Horman wrote:
> On Tue, May 14, 2013 at 05:38:39PM +0200, Maxime Ripard wrote:
> > Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> > specified") removed the need to explictly setup the init_irq field in
> > the machine description when using only irqchip_init. Remove that
> > declaration for shmobile as well.
> >
> > Signed-off-by: Maxime Ripard <[email protected]>
> > ---
> > arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > index aefa50d..b7ee96e 100644
> > --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > @@ -24,7 +24,6 @@
> > #include <linux/gpio.h>
> > #include <linux/io.h>
> > #include <linux/irq.h>
> > -#include <linux/irqchip.h>
> > #include <linux/input.h>
> > #include <linux/of_platform.h>
> > #include <linux/pinctrl/machine.h>
> > @@ -100,7 +99,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> > .map_io = sh73a0_map_io,
> > .init_early = sh73a0_init_delay,
> > .nr_irqs = NR_IRQS_LEGACY,
> > - .init_irq = irqchip_init,
> > .init_machine = kzm_init,
> > .init_time = shmobile_timer_init,
> > .dt_compat = kzm9g_boards_compat_dt,
>
> Signed-off-by: Simon Horman <[email protected]>
Sorry, what I should have said is:
Queued up for v3.11 in the boards-kzm9g branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Tue, May 14, 2013 at 05:38:40PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/board-lager.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
> index f587187..b7488b8 100644
> --- a/arch/arm/mach-shmobile/board-lager.c
> +++ b/arch/arm/mach-shmobile/board-lager.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/interrupt.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <mach/common.h>
> @@ -39,7 +38,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(LAGER_DT, "lager")
> - .init_irq = irqchip_init,
> .init_time = r8a7790_timer_init,
> .init_machine = lager_add_standard_devices,
> .dt_compat = lager_boards_compat_dt,
Sorry, what I should have said is:
Queued up for v3.11 in the boards-lager branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Wed, May 15, 2013 at 09:59:38AM +0900, Simon Horman wrote:
> On Tue, May 14, 2013 at 05:38:41PM +0200, Maxime Ripard wrote:
> > Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> > specified") removed the need to explictly setup the init_irq field in
> > the machine description when using only irqchip_init. Remove that
> > declaration for shmobile as well.
> >
> > Signed-off-by: Maxime Ripard <[email protected]>
> > ---
> > arch/arm/mach-shmobile/setup-emev2.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
> > index 899a86c..66694e0 100644
> > --- a/arch/arm/mach-shmobile/setup-emev2.c
> > +++ b/arch/arm/mach-shmobile/setup-emev2.c
> > @@ -20,7 +20,6 @@
> > #include <linux/init.h>
> > #include <linux/interrupt.h>
> > #include <linux/irq.h>
> > -#include <linux/irqchip.h>
> > #include <linux/platform_device.h>
> > #include <linux/platform_data/gpio-em.h>
> > #include <linux/of_platform.h>
> > @@ -454,7 +453,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
> > .smp = smp_ops(emev2_smp_ops),
> > .init_early = emev2_init_delay,
> > .nr_irqs = NR_IRQS_LEGACY,
> > - .init_irq = irqchip_init,
> > .init_machine = emev2_add_standard_devices_dt,
> > .dt_compat = emev2_boards_compat_dt,
> > MACHINE_END
>
> Signed-off-by: Simon Horman <[email protected]>
Sorry, what I should have said is:
Queued up for v3.11 in the soc-emev2 branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Tue, May 14, 2013 at 05:38:42PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/setup-r8a73a4.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
> index c5a75a7..0b78896 100644
> --- a/arch/arm/mach-shmobile/setup-r8a73a4.c
> +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
> @@ -18,7 +18,6 @@
> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/of_platform.h>
> #include <linux/platform_data/irq-renesas-irqc.h>
> @@ -194,7 +193,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
> - .init_irq = irqchip_init,
> .init_machine = r8a73a4_add_standard_devices_dt,
> .init_time = shmobile_timer_init,
> .dt_compat = r8a73a4_boards_compat_dt,
Queued up for v3.11 in the boards-r8a73a4 branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Tue, May 14, 2013 at 05:38:43PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/setup-r8a7790.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
> index 49de2d5..2a7a276 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/of_platform.h>
> #include <linux/serial_sci.h>
> @@ -142,7 +141,6 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
> - .init_irq = irqchip_init,
> .init_machine = r8a7790_add_standard_devices_dt,
> .init_time = r8a7790_timer_init,
> .dt_compat = r8a7790_boards_compat_dt,
Queued up for v3.11 in the soc-r8a7790 branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Tue, May 14, 2013 at 05:38:44PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for shmobile as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index fdf3894..73dd75b 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -22,7 +22,6 @@
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/platform_device.h>
> #include <linux/of_platform.h>
> #include <linux/delay.h>
> @@ -1035,7 +1034,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
> .map_io = sh73a0_map_io,
> .init_early = sh73a0_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = sh73a0_add_standard_devices_dt,
> .dt_compat = sh73a0_boards_compat_dt,
> MACHINE_END
Queued up for v3.11 in the soc-sh73a0 branch of my renesas tree
on kernel.org. It is included in the renesas-next-20130515 tag of
that tree and should appear in linux-next in the not to distant future.
On Wed, May 15, 2013 at 10:46:04AM +0900, Simon Horman wrote:
> On Wed, May 15, 2013 at 09:59:07AM +0900, Simon Horman wrote:
> > On Tue, May 14, 2013 at 05:38:38PM +0200, Maxime Ripard wrote:
> > > Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> > > specified") removed the need to explictly setup the init_irq field in
> > > the machine description when using only irqchip_init. Remove that
> > > declaration for shmobile as well.
> > >
> > > Signed-off-by: Maxime Ripard <[email protected]>
> > > ---
> > > arch/arm/mach-shmobile/board-ape6evm.c | 2 --
> > > 1 file changed, 2 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
> > > index 55b8c9f..8dfbdba 100644
> > > --- a/arch/arm/mach-shmobile/board-ape6evm.c
> > > +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> > > @@ -20,7 +20,6 @@
> > >
> > > #include <linux/gpio.h>
> > > #include <linux/interrupt.h>
> > > -#include <linux/irqchip.h>
> > > #include <linux/kernel.h>
> > > #include <linux/pinctrl/machine.h>
> > > #include <linux/platform_device.h>
> > > @@ -87,7 +86,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
> > > };
> > >
> > > DT_MACHINE_START(APE6EVM_DT, "ape6evm")
> > > - .init_irq = irqchip_init,
> > > .init_time = shmobile_timer_init,
> > > .init_machine = ape6evm_add_standard_devices,
> > > .dt_compat = ape6evm_boards_compat_dt,
> >
> > Signed-off-by: Simon Horman <[email protected]>
>
> Sorry, what I should have said is:
>
> Queued up for v3.11 in the boards-spe6evm branch of my renesas tree
s/spe6evm/ape6evm/
> on kernel.org. It is included in the renesas-next-20130515 tag of
> that tree and should appear in linux-next in the not to distant future.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Tuesday 14 May 2013, Maxime Ripard wrote:
> This is a splitted up version of the patch I previously sent to
> remove the explicit declaration of irqchip_init as the init_irq callback in
> the machine descriptions.
>
> Since it was a pretty tricky patch to merge, since it was touching a lot of
> different platforms, I splitted it for each platforms, and rebased it on top
> of 3.10-rc1.
>
> The best way to merge it is probably that each one of us take into their tree
> the patches that are relevant for our architecture and send them to arm-soc
> later on.
Sounds good to me. I'm sure that some platform maintainers will fail to
apply this though. Could you send whatever remains as a separate branch
in a couple of weeks so we can directly apply it to next/cleanup?
Arnd
On Tue, May 14, 2013 at 05:38:47PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for msm as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-msm/board-dt-8660.c | 2 --
> arch/arm/mach-msm/board-dt-8960.c | 2 --
> 2 files changed, 4 deletions(-)
I've replaced the patch in my msm-cleanup tree with this one. I'll
push this out once the support goes into the arm soc tree.
David
--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
On 15/05/13 03:38, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for vt8500 as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-vt8500/vt8500.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
> index 1dd281e..70a5ac9 100644
> --- a/arch/arm/mach-vt8500/vt8500.c
> +++ b/arch/arm/mach-vt8500/vt8500.c
> @@ -20,7 +20,6 @@
>
> #include <linux/clocksource.h>
> #include <linux/io.h>
> -#include <linux/irqchip.h>
> #include <linux/pm.h>
>
> #include <asm/mach-types.h>
> @@ -178,7 +177,6 @@ static const char * const vt8500_dt_compat[] = {
> DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
> .dt_compat = vt8500_dt_compat,
> .map_io = vt8500_map_io,
> - .init_irq = irqchip_init,
> .init_machine = vt8500_init,
> .init_time = clocksource_of_init,
> .restart = vt8500_restart,
I don't have any plans to touch this driver, so please send direct to
arm-soc as Arnd
requested.
Acked-by: Tony Prisk <[email protected]>
Regards
Tony Prisk
Hi Arnd,
Le 15/05/2013 14:55, Arnd Bergmann a ?crit :
> On Tuesday 14 May 2013, Maxime Ripard wrote:
>> This is a splitted up version of the patch I previously sent to
>> remove the explicit declaration of irqchip_init as the init_irq callback in
>> the machine descriptions.
>>
>> Since it was a pretty tricky patch to merge, since it was touching a lot of
>> different platforms, I splitted it for each platforms, and rebased it on top
>> of 3.10-rc1.
>>
>> The best way to merge it is probably that each one of us take into their tree
>> the patches that are relevant for our architecture and send them to arm-soc
>> later on.
>
> Sounds good to me. I'm sure that some platform maintainers will fail to
> apply this though. Could you send whatever remains as a separate branch
> in a couple of weeks so we can directly apply it to next/cleanup?
Ok, I will.
Thanks,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Hi Tony,
Le 15/05/2013 20:52, Tony Prisk a ?crit :
> I don't have any plans to touch this driver, so please send direct to
> arm-soc as Arnd
> requested.
>
> Acked-by: Tony Prisk <[email protected]>
Thanks!
I will send it then.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Hi Jamie,
Le 14/05/2013 18:20, Jamie Iles a ?crit :
> Hi Maxime,
>
> Thanks for this, I'll add it to my tree. I've modified it slightly to
> kill off the other irq includes, hopefully that's okay with you.
Yes, I was pretty conservative since I was not familiar with most of the
code, but yes, I'm fine with the changes.
Thank you,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
On Tue, May 14, 2013 at 05:38:49PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for mxs as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
Applied, thanks.
On Tue, May 14, 2013 at 05:38:48PM +0200, Maxime Ripard wrote:
> Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
> specified") removed the need to explictly setup the init_irq field in
> the machine description when using only irqchip_init. Remove that
> declaration for mvebu as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> Acked-by: Jason Cooper <[email protected]>
> ---
> arch/arm/mach-mvebu/armada-370-xp.c | 2 --
> 1 file changed, 2 deletions(-)
Applied to mvebu/cleanup
thx,
Jason.
On Thu, May 16, 2013 at 10:19:56AM +0200, Maxime Ripard wrote:
> Hi Jamie,
>
> Le 14/05/2013 18:20, Jamie Iles a ?crit :
> > Hi Maxime,
> >
> > Thanks for this, I'll add it to my tree. I've modified it slightly to
> > kill off the other irq includes, hopefully that's okay with you.
>
> Yes, I was pretty conservative since I was not familiar with most of the
> code, but yes, I'm fine with the changes.
Thanks Maxime, applied to picoxcell-next.
Jamie