Commit 0914acd8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm32-dt-for-5.3' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM: DT: Hisilicon ARM32 SoCs updates for v5.3

- Updated CoreSight funnel and replicator using new bindings to fix warning
  for the hip04.

* tag 'hisi-arm32-dt-for-5.3' of git://github.com/hisilicon/linux-hisi

:
  ARM: dts: hip04: Update coresight DT bindings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 80f7f92c 06c3cba6
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@
		/* non-configurable replicators don't show up on the
		 * AMBA bus.  As such no need to add "arm,primecell".
		 */
		compatible = "arm,coresight-replicator";
		compatible = "arm,coresight-static-replicator";

		out-ports {
			#address-cells = <1>;
@@ -385,7 +385,7 @@
		/* non-configurable replicators don't show up on the
		 * AMBA bus.  As such no need to add "arm,primecell".
		 */
		compatible = "arm,coresight-replicator";
		compatible = "arm,coresight-static-replicator";

		out-ports {
			#address-cells = <1>;
@@ -420,7 +420,7 @@
		/* non-configurable replicators don't show up on the
		 * AMBA bus.  As such no need to add "arm,primecell".
		 */
		compatible = "arm,coresight-replicator";
		compatible = "arm,coresight-static-replicator";

		out-ports {
			#address-cells = <1>;
@@ -454,7 +454,7 @@
		/* non-configurable replicators don't show up on the
		 * AMBA bus.  As such no need to add "arm,primecell".
		 */
		compatible = "arm,coresight-replicator";
		compatible = "arm,coresight-static-replicator";

		out-ports {
			#address-cells = <1>;
@@ -485,7 +485,7 @@
	};

	funnel@0,e3c41000 {
		compatible = "arm,coresight-funnel", "arm,primecell";
		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
		reg = <0 0xe3c41000 0 0x1000>;

		clocks = <&clk_375m>;
@@ -534,7 +534,7 @@
	};

	funnel@0,e3c81000 {
		compatible = "arm,coresight-funnel", "arm,primecell";
		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
		reg = <0 0xe3c81000 0 0x1000>;

		clocks = <&clk_375m>;
@@ -583,7 +583,7 @@
	};

	funnel@0,e3cc1000 {
		compatible = "arm,coresight-funnel", "arm,primecell";
		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
		reg = <0 0xe3cc1000 0 0x1000>;

		clocks = <&clk_375m>;
@@ -632,7 +632,7 @@
	};

	funnel@0,e3d01000 {
		compatible = "arm,coresight-funnel", "arm,primecell";
		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
		reg = <0 0xe3d01000 0 0x1000>;

		clocks = <&clk_375m>;
@@ -681,7 +681,7 @@
	};

	funnel@0,e3c04000 {
		compatible = "arm,coresight-funnel", "arm,primecell";
		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
		reg = <0 0xe3c04000 0 0x1000>;

		clocks = <&clk_375m>;