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

Commit 299a0458 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sprd-dt-v5.3-rc1' of https://github.com/lyrazhang/linux into arm/dt 

Spreadtrum's devicetree for v5.3-rc1

This tag contains only two patches for updating coresight compatible string.

* tag 'sprd-dt-v5.3-rc1' of https://github.com/lyrazhang/linux

:
  arm64: dts: sc9860: Update coresight DT bindings
  arm64: dts: sc9836: Update coresight DT bindings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 61c615ac b04832ed

arch/arm64/boot/dts/sprd/sc9836.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ 
	};

	};





	funnel@10001000 {

	funnel@10001000 {

		compatible = "arm,coresight-funnel", "arm,primecell";

		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

		reg = <0 0x10001000 0 0x1000>;

		reg = <0 0x10001000 0 0x1000>;

		clocks = <&clk26mhz>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		clock-names = "apb_pclk";

arch/arm64/boot/dts/sprd/sc9860.dtsi

+4 −4
Original line number Original line Diff line number Diff line
@@ -300,7 +300,7 @@ 
		};

		};





		funnel@10001000 { /* SoC Funnel */

		funnel@10001000 { /* SoC Funnel */

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

			reg = <0 0x10001000 0 0x1000>;

			reg = <0 0x10001000 0 0x1000>;

			clocks = <&ext_26m>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";
@@ -367,7 +367,7 @@ 
		};

		};





		funnel@11001000 { /* Cluster0 Funnel */

		funnel@11001000 { /* Cluster0 Funnel */

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

			reg = <0 0x11001000 0 0x1000>;

			reg = <0 0x11001000 0 0x1000>;

			clocks = <&ext_26m>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";
@@ -415,7 +415,7 @@ 
		};

		};





		funnel@11002000 { /* Cluster1 Funnel */

		funnel@11002000 { /* Cluster1 Funnel */

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

			reg = <0 0x11002000 0 0x1000>;

			reg = <0 0x11002000 0 0x1000>;

			clocks = <&ext_26m>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";
@@ -513,7 +513,7 @@ 
		};

		};





		funnel@11005000 { /* Main Funnel */

		funnel@11005000 { /* Main Funnel */

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

			reg = <0 0x11005000 0 0x1000>;

			reg = <0 0x11005000 0 0x1000>;

			clocks = <&ext_26m>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";