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

Commit 3dc76086 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: emev2: Use interrupt macros in DT files 



Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent d6dd1313

arch/arm/boot/dts/emev2-kzm9d.dts

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "emev2.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "EMEV2 KZM9D Board";
@@ -49,7 +50,7 @@ 
		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 1>;	/* active high */

		interrupts = <1 IRQ_TYPE_EDGE_RISING>;

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

arch/arm/boot/dts/emev2.dtsi

+18 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	compatible = "renesas,emev2";
@@ -48,8 +49,8 @@ 


	pmu {

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

		interrupts = <0 120 4>,

			     <0 121 4>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>;

	};



	smu@e0110000 {
@@ -129,7 +130,7 @@ 
	sti@e0180000 {

		compatible = "renesas,em-sti";

		reg = <0xe0180000 0x54>;

		interrupts = <0 125 0>;

		interrupts = <0 125 IRQ_TYPE_NONE>;

		clocks = <&sti_sclk>;

		clock-names = "sclk";

	};
@@ -137,7 +138,7 @@ 
	uart@e1020000 {

		compatible = "renesas,em-uart";

		reg = <0xe1020000 0x38>;

		interrupts = <0 8 0>;

		interrupts = <0 8 IRQ_TYPE_NONE>;

		clocks = <&usia_u0_sclk>;

		clock-names = "sclk";

	};
@@ -145,7 +146,7 @@ 
	uart@e1030000 {

		compatible = "renesas,em-uart";

		reg = <0xe1030000 0x38>;

		interrupts = <0 9 0>;

		interrupts = <0 9 IRQ_TYPE_NONE>;

		clocks = <&usib_u1_sclk>;

		clock-names = "sclk";

	};
@@ -153,7 +154,7 @@ 
	uart@e1040000 {

		compatible = "renesas,em-uart";

		reg = <0xe1040000 0x38>;

		interrupts = <0 10 0>;

		interrupts = <0 10 IRQ_TYPE_NONE>;

		clocks = <&usib_u2_sclk>;

		clock-names = "sclk";

	};
@@ -161,7 +162,7 @@ 
	uart@e1050000 {

		compatible = "renesas,em-uart";

		reg = <0xe1050000 0x38>;

		interrupts = <0 11 0>;

		interrupts = <0 11 IRQ_TYPE_NONE>;

		clocks = <&usib_u3_sclk>;

		clock-names = "sclk";

	};
@@ -169,7 +170,8 @@ 
	gpio0: gpio@e0050000 {

		compatible = "renesas,em-gio";

		reg = <0xe0050000 0x2c>, <0xe0050040 0x20>;

		interrupts = <0 67 0>, <0 68 0>;

		interrupts = <0 67 IRQ_TYPE_NONE>,

			     <0 68 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;
@@ -179,7 +181,8 @@ 
	gpio1: gpio@e0050080 {

		compatible = "renesas,em-gio";

		reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>;

		interrupts = <0 69 0>, <0 70 0>;

		interrupts = <0 69 IRQ_TYPE_NONE>,

			     <0 70 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;
@@ -189,7 +192,8 @@ 
	gpio2: gpio@e0050100 {

		compatible = "renesas,em-gio";

		reg = <0xe0050100 0x2c>, <0xe0050140 0x20>;

		interrupts = <0 71 0>, <0 72 0>;

		interrupts = <0 71 IRQ_TYPE_NONE>,

			     <0 72 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;
@@ -199,7 +203,8 @@ 
	gpio3: gpio@e0050180 {

		compatible = "renesas,em-gio";

		reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>;

		interrupts = <0 73 0>, <0 74 0>;

		interrupts = <0 73 IRQ_TYPE_NONE>,

			     <0 74 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;
@@ -209,7 +214,8 @@ 
	gpio4: gpio@e0050200 {

		compatible = "renesas,em-gio";

		reg = <0xe0050200 0x2c>, <0xe0050240 0x20>;

		interrupts = <0 75 0>, <0 76 0>;

		interrupts = <0 75 IRQ_TYPE_NONE>,

			     <0 76 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <31>;