Commit 8d523f09 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Marc Zyngier
Browse files

arm64: dts: k3-j721e: ti-sci-inta/intr: Update to latest bindings 



Update the INTA and INTR dt nodes to the latest DT bindings.

Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20200806074826.24607-12-lokeshvutla@ti.com
parent 5c4b585d

arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts

+5 −5
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ 
};



&mailbox0_cluster0 {

	interrupts = <214 0>;

	interrupts = <436>;



	mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {

		ti,mbox-rx = <0 0 0>;
@@ -301,7 +301,7 @@ 
};



&mailbox0_cluster1 {

	interrupts = <215 0>;

	interrupts = <432>;



	mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {

		ti,mbox-rx = <0 0 0>;
@@ -315,7 +315,7 @@ 
};



&mailbox0_cluster2 {

	interrupts = <216 0>;

	interrupts = <428>;



	mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {

		ti,mbox-rx = <0 0 0>;
@@ -329,7 +329,7 @@ 
};



&mailbox0_cluster3 {

	interrupts = <217 0>;

	interrupts = <424>;



	mbox_c66_0: mbox-c66-0 {

		ti,mbox-rx = <0 0 0>;
@@ -343,7 +343,7 @@ 
};



&mailbox0_cluster4 {

	interrupts = <218 0>;

	interrupts = <420>;



	mbox_c71_0: mbox-c71-0 {

		ti,mbox-rx = <0 0 0>;

arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

+22 −21
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ 
		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;

		#interrupt-cells = <2>;

		#interrupt-cells = <1>;

		ti,sci = <&dmsc>;

		ti,sci-dst-id = <14>;

		ti,sci-rm-range-girq = <0x1>;

		ti,sci-dev-id = <131>;

		ti,interrupt-ranges = <8 392 56>;

	};



	main_navss {
@@ -101,10 +101,12 @@ 
			ti,intr-trigger-type = <4>;

			interrupt-controller;

			interrupt-parent = <&gic500>;

			#interrupt-cells = <2>;

			#interrupt-cells = <1>;

			ti,sci = <&dmsc>;

			ti,sci-dst-id = <14>;

			ti,sci-rm-range-girq = <0>, <2>;

			ti,sci-dev-id = <213>;

			ti,interrupt-ranges = <0 64 64>,

					      <64 448 64>,

					      <128 672 64>;

		};



		main_udmass_inta: interrupt-controller@33d00000 {
@@ -115,8 +117,7 @@ 
			msi-controller;

			ti,sci = <&dmsc>;

			ti,sci-dev-id = <209>;

			ti,sci-rm-range-vint = <0xa>;

			ti,sci-rm-range-global-event = <0xd>;

			ti,interrupt-ranges = <0 0 256>;

		};



		secure_proxy_main: mailbox@32c00000 {
@@ -296,7 +297,7 @@ 
			reg-names = "cpts";

			clocks = <&k3_clks 201 1>;

			clock-names = "cpts";

			interrupts-extended = <&main_navss_intr 201 0>;

			interrupts-extended = <&main_navss_intr 391>;

			interrupt-names = "cpts";

			ti,cpts-periodic-outputs = <6>;

			ti,cpts-ext-ts-inputs = <8>;
@@ -688,8 +689,8 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <105 0>, <105 1>, <105 2>, <105 3>,

			     <105 4>, <105 5>, <105 6>, <105 7>;

		interrupts = <256>, <257>, <258>, <259>,

			     <260>, <261>, <262>, <263>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <128>;
@@ -705,7 +706,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <106 0>, <106 1>, <106 2>;

		interrupts = <288>, <289>, <290>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <36>;
@@ -721,8 +722,8 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <107 0>, <107 1>, <107 2>, <107 3>,

			     <107 4>, <107 5>, <107 6>, <107 7>;

		interrupts = <264>, <265>, <266>, <267>,

			     <268>, <269>, <270>, <271>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <128>;
@@ -738,7 +739,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <108 0>, <108 1>, <108 2>;

		interrupts = <292>, <293>, <294>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <36>;
@@ -754,8 +755,8 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <109 0>, <109 1>, <109 2>, <109 3>,

			     <109 4>, <109 5>, <109 6>, <109 7>;

		interrupts = <272>, <273>, <274>, <275>,

			     <276>, <277>, <278>, <279>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <128>;
@@ -771,7 +772,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <110 0>, <110 1>, <110 2>;

		interrupts = <296>, <297>, <298>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <36>;
@@ -787,8 +788,8 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <111 0>, <111 1>, <111 2>, <111 3>,

			     <111 4>, <111 5>, <111 6>, <111 7>;

		interrupts = <280>, <281>, <282>, <283>,

			     <284>, <285>, <286>, <287>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <128>;
@@ -804,7 +805,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&main_gpio_intr>;

		interrupts = <112 0>, <112 1>, <112 2>;

		interrupts = <300>, <301>, <302>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <36>;

arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi

+5 −6
Original line number Diff line number Diff line
@@ -101,9 +101,10 @@ 
		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;

		#interrupt-cells = <2>;

		#interrupt-cells = <1>;

		ti,sci = <&dmsc>;

		ti,sci-dst-id = <14>;

		ti,sci-dev-id = <137>;

		ti,interrupt-ranges = <16 960 16>;

		ti,sci-rm-range-girq = <0x5>;

	};
@@ -113,8 +114,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&wkup_gpio_intr>;

		interrupts = <113 0>, <113 1>, <113 2>,

			     <113 3>, <113 4>, <113 5>;

		interrupts = <103>, <104>, <105>, <106>, <107>, <108>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <84>;
@@ -130,8 +130,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&wkup_gpio_intr>;

		interrupts = <114 0>, <114 1>, <114 2>,

			     <114 3>, <114 4>, <114 5>;

		interrupts = <112>, <113>, <114>, <115>, <116>, <117>;

		interrupt-controller;

		#interrupt-cells = <2>;

		ti,ngpio = <84>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE