Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31400bb5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-fixes' into renesas-soc 

* renesas-fixes:
  ARM: shmobile: r8a7779: Route all interrupts to ARM
  ARM: shmobile: kzm9d: use late init machine hook
  ARM: shmobile: kzm9g: use late init machine hook
  ARM: mach-shmobile: armadillo800eva: Use late init machine hook
parents 6816bfa3 86f887c1

arch/arm/mach-shmobile/board-armadillo800eva.c

+1 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") 
	.init_irq	= r8a7740_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

	.init_machine	= eva_init,

	.init_late	= shmobile_init_late,

	.timer		= &shmobile_timer,

	.dt_compat	= eva_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-kzm9d.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") 
	.init_irq	= emev2_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= kzm9d_add_standard_devices,

	.init_late	= shmobile_init_late,

	.timer		= &shmobile_timer,

	.dt_compat	= kzm9d_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-kzm9g.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g") 
	.init_irq	= sh73a0_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= kzm_init,

	.init_late	= shmobile_init_late,

	.timer		= &shmobile_timer,

	.dt_compat	= kzm9g_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/intc-r8a7779.c

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#define INT2SMSKCR3 0xfe7822ac

#define INT2SMSKCR4 0xfe7822b0



#define INT2NTSR0 0xfe700060

#define INT2NTSR1 0xfe700064



static int r8a7779_set_wake(struct irq_data *data, unsigned int on)

{

	return 0; /* always allow wakeup */
@@ -49,6 +52,10 @@ void __init r8a7779_init_irq(void) 
	gic_init(0, 29, gic_dist_base, gic_cpu_base);

	gic_arch_extn.irq_set_wake = r8a7779_set_wake;



	/* route all interrupts to ARM */

	__raw_writel(0xffffffff, INT2NTSR0);

	__raw_writel(0x3fffffff, INT2NTSR1);



	/* unmask all known interrupts in INTCS2 */

	__raw_writel(0xfffffff0, INT2SMSKCR0);

	__raw_writel(0xfff7ffff, INT2SMSKCR1);