Commit b9c112f2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ti-k3-dt-fixes-for-v5.13' of... 

Merge tag 'ti-k3-dt-fixes-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux into arm/fixes

Devicetree fixes for TI K3 platforms for v5.13 merge window:

These minor fixes include:
* Fixups for device tree discovered during yaml conversion
* Fixups for missing dma-coherent property in j7200
* Removal of camera sensor node from am65 evm dts to overlay
  as camera sensor boards are variable.

* tag 'ti-k3-dt-fixes-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux:
  arm64: dts: ti: k3*: Introduce reg definition for interrupt routers
  arm64: dts: ti: k3-am65|j721e|am64: Map the dma / navigator subsystem via explicit ranges
  arm64: dts: ti: k3-*: Rename the TI-SCI node
  arm64: dts: ti: k3-am65-wakeup: Drop un-necessary properties from dmsc node
  arm64: dts: ti: k3-am65-wakeup: Add debug region to TI-SCI node
  arm64: dts: ti: k3-*: Rename the TI-SCI clocks node name
  arm64: dts: ti: j7200-main: Mark Main NAVSS as dma-coherent
  arm64: dts: ti: k3-am654-base-board: remove ov5640

Link: https://lore.kernel.org/r/20210518115634.467vgpbzplal5kou@obituary


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7468bed8 cab12bad

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

+6 −5
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ 
		};

	};



	dmss: dmss {

	dmss: bus@48000000 {

		compatible = "simple-mfd";

		#address-cells = <2>;

		#size-cells = <2>;

		dma-ranges;

		ranges;

		ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;



		ti,sci-dev-id = <25>;
@@ -134,7 +134,7 @@ 
		};

	};



	dmsc: dmsc@44043000 {

	dmsc: system-controller@44043000 {

		compatible = "ti,k2g-sci";

		ti,host-id = <12>;

		mbox-names = "rx", "tx";
@@ -148,7 +148,7 @@ 
			#power-domain-cells = <2>;

		};



		k3_clks: clocks {

		k3_clks: clock-controller {

			compatible = "ti,k2g-sci-clk";

			#clock-cells = <2>;

		};
@@ -373,8 +373,9 @@ 
		clocks = <&k3_clks 145 0>;

	};



	main_gpio_intr: interrupt-controller0 {

	main_gpio_intr: interrupt-controller@a00000 {

		compatible = "ti,sci-intr";

		reg = <0x00 0x00a00000 0x00 0x800>;

		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -74,8 +74,9 @@ 
		clocks = <&k3_clks 148 0>;

	};



	mcu_gpio_intr: interrupt-controller1 {

	mcu_gpio_intr: interrupt-controller@4210000 {

		compatible = "ti,sci-intr";

		reg = <0x00 0x04210000 0x00 0x200>;

		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;

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

+6 −4
Original line number Diff line number Diff line
@@ -433,8 +433,9 @@ 
		#phy-cells = <0>;

	};



	intr_main_gpio: interrupt-controller0 {

	intr_main_gpio: interrupt-controller@a00000 {

		compatible = "ti,sci-intr";

		reg = <0x0 0x00a00000 0x0 0x400>;

		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;
@@ -444,18 +445,19 @@ 
		ti,interrupt-ranges = <0 392 32>;

	};



	main-navss {

	main_navss: bus@30800000 {

		compatible = "simple-mfd";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;

		dma-coherent;

		dma-ranges;



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



		intr_main_navss: interrupt-controller1 {

		intr_main_navss: interrupt-controller@310e0000 {

			compatible = "ti,sci-intr";

			reg = <0x0 0x310e0000 0x0 0x2000>;

			ti,intr-trigger-type = <4>;

			interrupt-controller;

			interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -116,11 +116,11 @@ 
		};

	};



	mcu-navss {

	mcu_navss: bus@28380000 {

		compatible = "simple-mfd";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;

		dma-coherent;

		dma-ranges;

arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi

+7 −6
Original line number Diff line number Diff line
@@ -6,24 +6,24 @@ 
 */



&cbass_wakeup {

	dmsc: dmsc {

	dmsc: system-controller@44083000 {

		compatible = "ti,am654-sci";

		ti,host-id = <12>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		mbox-names = "rx", "tx";



		mboxes= <&secure_proxy_main 11>,

			<&secure_proxy_main 13>;



		reg-names = "debug_messages";

		reg = <0x44083000 0x1000>;



		k3_pds: power-controller {

			compatible = "ti,sci-pm-domain";

			#power-domain-cells = <2>;

		};



		k3_clks: clocks {

		k3_clks: clock-controller {

			compatible = "ti,k2g-sci-clk";

			#clock-cells = <2>;

		};
@@ -69,8 +69,9 @@ 
		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;

	};



	intr_wkup_gpio: interrupt-controller2 {

	intr_wkup_gpio: interrupt-controller@42200000 {

		compatible = "ti,sci-intr";

		reg = <0x42200000 0x200>;

		ti,intr-trigger-type = <1>;

		interrupt-controller;

		interrupt-parent = <&gic500>;