Commit a3f22db5 authored by Simon Horman's avatar Simon Horman
Browse files

ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT 



This allows the GIC interrupt controller of the sh73a0 SoC to be
initialised using a flattened device tree blob.

It does not allow the INTC interrupt controller which is also present on
the sh73a0 SoC to be enabled via device tree.  Nor does it handle sharing
of interrupts between the GIC and INTC interrupt controllers.

This limits the usefulness of this code to applications which only wish to
access devices which use interrupts that can be handled by the GIC
interrupt controller. Other applications should, for now, continue using
non-device tree initialisation of the sh72a0 interrupt controllers.

Includes update to use irqchip_init() by Thierry Reding

Cc: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 20aa1135

arch/arm/boot/dts/sh73a0.dtsi

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the SH73A0 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "renesas,sh73a0";



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a9";

		};

		cpu@1 {

			compatible = "arm,cortex-a9";

		};

	};



	gic: interrupt-controller@f0001000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0xf0001000 0x1000>,

		      <0xf0000100 0x100>;

	};

};

arch/arm/mach-shmobile/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ extern struct clk sh7372_extal1_clk; 
extern struct clk sh7372_extal2_clk;



extern void sh73a0_init_irq(void);

extern void sh73a0_init_irq_dt(void);

extern void sh73a0_map_io(void);

extern void sh73a0_earlytimer_init(void);

extern void sh73a0_add_early_devices(void);

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

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/sh_intc.h>

#include <linux/irqchip.h>

#include <linux/irqchip/arm-gic.h>

#include <mach/intc.h>

#include <mach/irqs.h>
@@ -459,3 +460,11 @@ void __init sh73a0_init_irq(void) 
	sh73a0_pint1_cascade.handler = sh73a0_pint1_demux;

	setup_irq(gic_spi(34), &sh73a0_pint1_cascade);

}



#ifdef CONFIG_OF

void __init sh73a0_init_irq_dt(void)

{

	irqchip_init();

	gic_arch_extn.irq_set_wake = sh73a0_set_wake;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE