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

Commit 23f8f601 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'juno-updates-4.14' of... 

Merge tag 'juno-updates-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt64

Pull "ARMv8 Vexpress/Juno DT updates for v4.14" from Sudeep Holla:

1. Replaces old coresight ATB programmable replicator compatible with
   new and more generic one

2. Replaces incorrect usage of underscores for device node names in the
   device tree with hyphen

* tag 'juno-updates-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: replace underscores with hyphen in device node names
  arm64: dts: juno: Use the new coresight replicator string
parents 9bbf3390 207b6e6b

arch/arm64/boot/dts/arm/foundation-v8.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 
				clock-names = "uartclk", "apb_pclk";

			};



			virtio_block@0130000 {

			virtio-block@0130000 {

				compatible = "virtio,mmio";

				reg = <0x130000 0x200>;

				interrupts = <42>;

arch/arm64/boot/dts/arm/juno-base.dtsi

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

	};



	cpu_debug0: cpu_debug@22010000 {

	cpu_debug0: cpu-debug@22010000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x22010000 0x0 0x1000>;
@@ -260,7 +260,7 @@ 
		};

	};



	cpu_debug1: cpu_debug@22110000 {

	cpu_debug1: cpu-debug@22110000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x22110000 0x0 0x1000>;
@@ -283,7 +283,7 @@ 
		};

	};



	cpu_debug2: cpu_debug@23010000 {

	cpu_debug2: cpu-debug@23010000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x23010000 0x0 0x1000>;
@@ -356,7 +356,7 @@ 
		};

	};



	cpu_debug3: cpu_debug@23110000 {

	cpu_debug3: cpu-debug@23110000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x23110000 0x0 0x1000>;
@@ -379,7 +379,7 @@ 
		};

	};



	cpu_debug4: cpu_debug@23210000 {

	cpu_debug4: cpu-debug@23210000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x23210000 0x0 0x1000>;
@@ -402,7 +402,7 @@ 
		};

	};



	cpu_debug5: cpu_debug@23310000 {

	cpu_debug5: cpu-debug@23310000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";

		reg = <0x0 0x23310000 0x0 0x1000>;
@@ -426,7 +426,7 @@ 
	};



	replicator@20120000 {

		compatible = "qcom,coresight-replicator1x", "arm,primecell";

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

		reg = <0 0x20120000 0 0x1000>;



		clocks = <&soc_smc50mhz>;

arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi

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

			};



			virtio_block@0130000 {

			virtio-block@0130000 {

				compatible = "virtio,mmio";

				reg = <0x130000 0x200>;

				interrupts = <42>;