* [PATCH 00/04] ARM: shmobile: Use default ->init_irq()
@ 2013-07-01 6:01 Magnus Damm
2013-07-01 6:01 ` [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 Magnus Damm
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 6:01 UTC (permalink / raw)
To: linux-arm-kernel
ARM: shmobile: Use default ->init_irq()
[PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2
[PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4
[PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790
[PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0
Rework the mach-shmobile code to provide NULL as ->init_irq() callback
instead of irqchip_init(). This cleans up the code and reduces the
number of lines.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Written against renesas.git renesas-next-20130701 and
[PATCH v2 00/07] ARM: shmobile: Remove unused auxdata and callbacks
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 --
7 files changed, 14 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2
2013-07-01 6:01 [PATCH 00/04] ARM: shmobile: Use default ->init_irq() Magnus Damm
@ 2013-07-01 6:01 ` Magnus Damm
2013-07-01 7:32 ` Simon Horman
2013-07-01 6:01 ` [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4 Magnus Damm
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 6:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/setup-emev2.c | 2 --
1 file changed, 2 deletions(-)
--- 0005/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900
@@ -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>
@@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
.smp = smp_ops(emev2_smp_ops),
.init_early = emev2_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.dt_compat = emev2_boards_compat_dt,
MACHINE_END
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4
2013-07-01 6:01 [PATCH 00/04] ARM: shmobile: Use default ->init_irq() Magnus Damm
2013-07-01 6:01 ` [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 Magnus Damm
@ 2013-07-01 6:01 ` Magnus Damm
2013-07-01 7:47 ` Simon Horman
2013-07-01 6:01 ` [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790 Magnus Damm
2013-07-01 6:01 ` [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0 Magnus Damm
3 siblings, 1 reply; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 6:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/board-ape6evm.c | 2 --
arch/arm/mach-shmobile/setup-r8a73a4.c | 2 --
2 files changed, 4 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-ape6evm.c
+++ work/arch/arm/mach-shmobile/board-ape6evm.c 2013-07-01 13:29:37.000000000 +0900
@@ -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>
@@ -103,7 +102,6 @@ static const char *ape6evm_boards_compat
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
.init_early = r8a73a4_init_delay,
- .init_irq = irqchip_init,
.init_time = shmobile_timer_init,
.init_machine = ape6evm_add_standard_devices,
.dt_compat = ape6evm_boards_compat_dt,
--- 0001/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2013-07-01 13:29:53.000000000 +0900
@@ -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>
@@ -224,7 +223,6 @@ static const char *r8a73a4_boards_compat
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
.init_early = r8a73a4_init_delay,
- .init_irq = irqchip_init,
.init_machine = r8a73a4_add_standard_devices_dt,
.init_time = shmobile_timer_init,
.dt_compat = r8a73a4_boards_compat_dt,
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790
2013-07-01 6:01 [PATCH 00/04] ARM: shmobile: Use default ->init_irq() Magnus Damm
2013-07-01 6:01 ` [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 Magnus Damm
2013-07-01 6:01 ` [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4 Magnus Damm
@ 2013-07-01 6:01 ` Magnus Damm
2013-07-01 7:52 ` Simon Horman
2013-07-01 6:01 ` [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0 Magnus Damm
3 siblings, 1 reply; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 6:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/board-lager.c | 2 --
arch/arm/mach-shmobile/setup-r8a7790.c | 2 --
2 files changed, 4 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-lager.c
+++ work/arch/arm/mach-shmobile/board-lager.c 2013-07-01 13:27:30.000000000 +0900
@@ -22,7 +22,6 @@
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/interrupt.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/leds.h>
#include <linux/pinctrl/machine.h>
@@ -104,7 +103,6 @@ static const char *lager_boards_compat_d
DT_MACHINE_START(LAGER_DT, "lager")
.init_early = r8a7790_init_delay,
- .init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt,
--- 0008/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-07-01 13:27:52.000000000 +0900
@@ -19,7 +19,6 @@
*/
#include <linux/irq.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/gpio-rcar.h>
@@ -225,7 +224,6 @@ static const char *r8a7790_boards_compat
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
.init_early = r8a7790_init_delay,
- .init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.dt_compat = r8a7790_boards_compat_dt,
MACHINE_END
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0
2013-07-01 6:01 [PATCH 00/04] ARM: shmobile: Use default ->init_irq() Magnus Damm
` (2 preceding siblings ...)
2013-07-01 6:01 ` [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790 Magnus Damm
@ 2013-07-01 6:01 ` Magnus Damm
2013-07-01 7:55 ` Simon Horman
3 siblings, 1 reply; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 6:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
2 files changed, 4 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9g-reference.c 2013-06-28 16:04:39.000000000 +0900
@@ -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>
@@ -99,7 +98,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-refere
.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,
--- 0007/arch/arm/mach-shmobile/setup-sh73a0.c
+++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2013-06-28 16:04:47.000000000 +0900
@@ -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>
@@ -983,7 +982,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH7
.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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2
2013-07-01 6:01 ` [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 Magnus Damm
@ 2013-07-01 7:32 ` Simon Horman
2013-07-01 7:48 ` Magnus Damm
0 siblings, 1 reply; 10+ messages in thread
From: Simon Horman @ 2013-07-01 7:32 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 01, 2013 at 03:01:12PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Remove redundant irqchip_init() callback. The default case
> of NULL will result in invoking irqchip_init() anyway.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/setup-emev2.c | 2 --
> 1 file changed, 2 deletions(-)
>
> --- 0005/arch/arm/mach-shmobile/setup-emev2.c
> +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900
> @@ -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>
> @@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
> .smp = smp_ops(emev2_smp_ops),
> .init_early = emev2_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .dt_compat = emev2_boards_compat_dt,
> MACHINE_END
Hi Magnus,
I mistakenly dropped the following patch from Maxime Ripard from
v3.11. I have re-queued it up, for v3.12, in the cleanup branch:
commit 4042de1229ecf083890d8ad5c9327e03b648c1a2
Author: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sun May 26 22:05:23 2013 +0900
ARM: shmobile: emev2: 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 shmobile as well.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4
2013-07-01 6:01 ` [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4 Magnus Damm
@ 2013-07-01 7:47 ` Simon Horman
0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-07-01 7:47 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 01, 2013 at 03:01:21PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Remove redundant irqchip_init() callback. The default case
> of NULL will result in invoking irqchip_init() anyway.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/board-ape6evm.c | 2 --
> arch/arm/mach-shmobile/setup-r8a73a4.c | 2 --
> 2 files changed, 4 deletions(-)
>
> --- 0001/arch/arm/mach-shmobile/board-ape6evm.c
> +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2013-07-01 13:29:37.000000000 +0900
> @@ -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>
> @@ -103,7 +102,6 @@ static const char *ape6evm_boards_compat
>
> DT_MACHINE_START(APE6EVM_DT, "ape6evm")
> .init_early = r8a73a4_init_delay,
> - .init_irq = irqchip_init,
> .init_time = shmobile_timer_init,
> .init_machine = ape6evm_add_standard_devices,
> .dt_compat = ape6evm_boards_compat_dt,
> --- 0001/arch/arm/mach-shmobile/setup-r8a73a4.c
> +++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2013-07-01 13:29:53.000000000 +0900
> @@ -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>
> @@ -224,7 +223,6 @@ static const char *r8a73a4_boards_compat
>
> DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
> .init_early = r8a73a4_init_delay,
> - .init_irq = irqchip_init,
> .init_machine = r8a73a4_add_standard_devices_dt,
> .init_time = shmobile_timer_init,
> .dt_compat = r8a73a4_boards_compat_dt,
Hi Magnus,
as per my remark about the emev2, I accidently dropped a patch
from Maxime Ripard which corresponds to the setup-r8a73a4.c portion of
your above patch. Accordingly I have re-queued up Maxime's patch for v3.12
and applied the board-ape6evm.c portion of your patch as follows.
I have altered the title, partially so it uses the same scheme
used by Maxime's patches and partially to reflect that it
now only covers the ape6evm board.
The result will be in the cleanup branch the next time that I push my tree,
most likely later this afternoon.
commit eec81df7727a23e0da6a46b63aec1210fba884cf
Author: Magnus Damm <damm@opensource.se>
Date: Mon Jul 1 15:01:21 2013 +0900
ARM: shmobile: ape6evm: Remove init_irq declaration in machine description
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the r8a73a4 SoC and altered the subject to
use the same format as the patch that updates the r8a73a4. ]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 5eb0caa..1fbc39a 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>
@@ -102,7 +101,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,
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2
2013-07-01 7:32 ` Simon Horman
@ 2013-07-01 7:48 ` Magnus Damm
0 siblings, 0 replies; 10+ messages in thread
From: Magnus Damm @ 2013-07-01 7:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Maxime, everyone,
On Mon, Jul 1, 2013 at 4:32 PM, Simon Horman <horms@verge.net.au> wrote:
> On Mon, Jul 01, 2013 at 03:01:12PM +0900, Magnus Damm wrote:
>> From: Magnus Damm <damm@opensource.se>
>>
>> Remove redundant irqchip_init() callback. The default case
>> of NULL will result in invoking irqchip_init() anyway.
>>
>> Signed-off-by: Magnus Damm <damm@opensource.se>
>> ---
>>
>> arch/arm/mach-shmobile/setup-emev2.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> --- 0005/arch/arm/mach-shmobile/setup-emev2.c
>> +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900
>> @@ -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>
>> @@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
>> .smp = smp_ops(emev2_smp_ops),
>> .init_early = emev2_init_delay,
>> .nr_irqs = NR_IRQS_LEGACY,
>> - .init_irq = irqchip_init,
>> .dt_compat = emev2_boards_compat_dt,
>> MACHINE_END
>
> Hi Magnus,
>
> I mistakenly dropped the following patch from Maxime Ripard from
> v3.11. I have re-queued it up, for v3.12, in the cleanup branch:
>
> commit 4042de1229ecf083890d8ad5c9327e03b648c1a2
> Author: Maxime Ripard <maxime.ripard@free-electrons.com>
> Date: Sun May 26 22:05:23 2013 +0900
>
> ARM: shmobile: emev2: Remove init_irq declaration in machine description
Thanks for going through earlier submitted patches and picking them
up. Of course I welcome the contribution by Maxime so please use his
code over mine wherever possible.
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790
2013-07-01 6:01 ` [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790 Magnus Damm
@ 2013-07-01 7:52 ` Simon Horman
0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-07-01 7:52 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 01, 2013 at 03:01:31PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Remove redundant irqchip_init() callback. The default case
> of NULL will result in invoking irqchip_init() anyway.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/board-lager.c | 2 --
> arch/arm/mach-shmobile/setup-r8a7790.c | 2 --
> 2 files changed, 4 deletions(-)
>
> --- 0001/arch/arm/mach-shmobile/board-lager.c
> +++ work/arch/arm/mach-shmobile/board-lager.c 2013-07-01 13:27:30.000000000 +0900
> @@ -22,7 +22,6 @@
> #include <linux/gpio_keys.h>
> #include <linux/input.h>
> #include <linux/interrupt.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/leds.h>
> #include <linux/pinctrl/machine.h>
> @@ -104,7 +103,6 @@ static const char *lager_boards_compat_d
>
> DT_MACHINE_START(LAGER_DT, "lager")
> .init_early = r8a7790_init_delay,
> - .init_irq = irqchip_init,
> .init_time = r8a7790_timer_init,
> .init_machine = lager_add_standard_devices,
> .dt_compat = lager_boards_compat_dt,
> --- 0008/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-07-01 13:27:52.000000000 +0900
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/irq.h>
> -#include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/of_platform.h>
> #include <linux/platform_data/gpio-rcar.h>
> @@ -225,7 +224,6 @@ static const char *r8a7790_boards_compat
>
> DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
> .init_early = r8a7790_init_delay,
> - .init_irq = irqchip_init,
> .init_time = r8a7790_timer_init,
> .dt_compat = r8a7790_boards_compat_dt,
> MACHINE_END
Hi Magnus,
as per my remark about the emev2, I accidently dropped a patch
from Maxime Ripard which corresponds to the setup-r8a7790.c portion of
your above patch. Accordingly I have re-queued up Maxime's patch for v3.12
and applied the board-lager.c portion of your patch as follows.
I have altered the title, partially so it uses the same scheme
used by Maxime's patches and partially to reflect that it
now only covers the lager board.
The result will be in the cleanup branch the next time that I push my tree,
most likely later this afternoon.
commit 4a94ed71a7b3e17c46a23b89039cfa113fbfaa43
Author: Magnus Damm <damm@opensource.se>
Date: Mon Jul 1 15:01:31 2013 +0900
ARM: shmobile: lager: Remove init_irq declaration in machine description
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the r8a7790 SoC and altered the subject to
use the same format as the patch that updates the r8a7790. ]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index d73e21d..1e99b17 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -22,7 +22,6 @@
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/interrupt.h>
-#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/leds.h>
#include <linux/pinctrl/machine.h>
@@ -103,7 +102,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,
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0
2013-07-01 6:01 ` [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0 Magnus Damm
@ 2013-07-01 7:55 ` Simon Horman
0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-07-01 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 01, 2013 at 03:01:40PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Remove redundant irqchip_init() callback. The default case
> of NULL will result in invoking irqchip_init() anyway.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 --
> arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
> 2 files changed, 4 deletions(-)
>
> --- 0001/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ work/arch/arm/mach-shmobile/board-kzm9g-reference.c 2013-06-28 16:04:39.000000000 +0900
> @@ -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>
> @@ -99,7 +98,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-refere
> .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,
> --- 0007/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2013-06-28 16:04:47.000000000 +0900
> @@ -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>
> @@ -983,7 +982,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH7
> .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
Hi Magnus,
as per my remark about the emev2, I accidently dropped a patch
from Maxime Ripard which corresponds to the setup-sh73a0.c portion of
your above patch. Accordingly I have re-queued up Maxime's patch for v3.12
and applied the board-kzm9g-reference.c portion of your patch as follows.
I have altered the title, partially so it uses the same scheme
used by Maxime's patches and partially to reflect that it
now only covers the kzm9g board.
The result will be in the cleanup branch the next time that I push my tree,
most likely later this afternoon.
commit 083c11c998f17c3ef4f2fc066424d6762254344b
Author: Magnus Damm <damm@opensource.se>
Date: Mon Jul 1 15:01:40 2013 +0900
ARM: shmobile: kzm9g: Remove init_irq declaration in machine description
Remove redundant irqchip_init() callback. The default case
of NULL will result in invoking irqchip_init() anyway.
Signed-off-by: Magnus Damm <damm@opensource.se>
[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the sh73a0 SoC and altered the subject to
use the same format as the patch that updates the sh73a0. ]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 44055fe..41092bb 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>
@@ -99,7 +98,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,
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-07-01 7:55 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-01 6:01 [PATCH 00/04] ARM: shmobile: Use default ->init_irq() Magnus Damm
2013-07-01 6:01 ` [PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 Magnus Damm
2013-07-01 7:32 ` Simon Horman
2013-07-01 7:48 ` Magnus Damm
2013-07-01 6:01 ` [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4 Magnus Damm
2013-07-01 7:47 ` Simon Horman
2013-07-01 6:01 ` [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790 Magnus Damm
2013-07-01 7:52 ` Simon Horman
2013-07-01 6:01 ` [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0 Magnus Damm
2013-07-01 7:55 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox