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

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

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



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

Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>

---

v3
* Fix copy-paste error and use unique reg values for each CPU

v2
As suggested by Mark Rutland
* Add reg and device_type to cpus
* Remove #address-cells from gic
parent df2ddd7b

arch/arm/boot/dts/r8a7779.dtsi

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

 * Device Tree Source for Renesas r8a7740

 *

 * Copyright (C) 2013 Renesas Solutions Corp.

 * Copyright (C) 2013 Simon Horman

 *

 * 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,r8a7779";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

		};

		cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <2>;

		};

		cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <3>;

		};

	};



        gic: interrupt-controller@f0001000 {

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

                #interrupt-cells = <3>;

                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
@@ -59,6 +59,7 @@ extern void r8a7740_pinmux_init(void); 
extern void r8a7740_pm_init(void);



extern void r8a7779_init_irq(void);

extern void r8a7779_init_irq_dt(void);

extern void r8a7779_map_io(void);

extern void r8a7779_earlytimer_init(void);

extern void r8a7779_add_early_devices(void);

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

+21 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/io.h>

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

#include <mach/common.h>

#include <linux/irqchip.h>

#include <mach/intc.h>

#include <mach/r8a7779.h>

#include <asm/mach-types.h>
@@ -43,13 +44,8 @@ static int r8a7779_set_wake(struct irq_data *data, unsigned int on) 
	return 0; /* always allow wakeup */

}



void __init r8a7779_init_irq(void)

static void __init r8a7779_init_irq_common(void)

{

	void __iomem *gic_dist_base = IOMEM(0xf0001000);

	void __iomem *gic_cpu_base = IOMEM(0xf0000100);



	/* use GIC to handle interrupts */

	gic_init(0, 29, gic_dist_base, gic_cpu_base);

	gic_arch_extn.irq_set_wake = r8a7779_set_wake;



	/* route all interrupts to ARM */
@@ -63,3 +59,22 @@ void __init r8a7779_init_irq(void) 
	__raw_writel(0xbffffffc, INT2SMSKCR3);

	__raw_writel(0x003fee3f, INT2SMSKCR4);

}



void __init r8a7779_init_irq(void)

{

	void __iomem *gic_dist_base = IOMEM(0xf0001000);

	void __iomem *gic_cpu_base = IOMEM(0xf0000100);



	/* use GIC to handle interrupts */

	gic_init(0, 29, gic_dist_base, gic_cpu_base);



	r8a7779_init_irq_common();

}



#ifdef CONFIG_OF

void __init r8a7779_init_irq_dt(void)

{

	irqchip_init();

	r8a7779_init_irq_common();

}

#endif