Commit 36e29139 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_5.8' of...

Merge tag 'keystone_dts_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt

ARM: dts: Keystone update for v5.8

 - Rename "msmram" node to "sram"

* tag 'keystone_dts_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: Rename "msmram" node to "sram"

Link: https://lore.kernel.org/r/1590638489-12023-2-git-send-email-santosh.shilimkar@oracle.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3908895f 644c5a58
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@
			};
		};

		msm_ram: msmram@c000000 {
		msm_ram: sram@c000000 {
			compatible = "mmio-sram";
			reg = <0x0c000000 0x200000>;
			ranges = <0x0 0x0c000000 0x200000>;
			#address-cells = <1>;
			#size-cells = <1>;

			sram-bm@1f0000 {
			bm-sram@1f0000 {
				reg = <0x001f0000 0x8000>;
			};
		};
+2 −2
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@
		ranges = <0x0 0x0 0x0 0xc0000000>;
		dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;

		msm_ram: msmram@c000000 {
		msm_ram: sram@c000000 {
			compatible = "mmio-sram";
			reg = <0x0c000000 0x100000>;
			ranges = <0x0 0x0c000000 0x100000>;
			#address-cells = <1>;
			#size-cells = <1>;

			sram-bm@f7000 {
			bm-sram@f7000 {
				reg = <0x000f7000 0x8000>;
			};
		};
+2 −2
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@
&soc0 {
		/include/ "keystone-k2hk-clocks.dtsi"

		msm_ram: msmram@c000000 {
		msm_ram: sram@c000000 {
			compatible = "mmio-sram";
			reg = <0x0c000000 0x600000>;
			ranges = <0x0 0x0c000000 0x600000>;
			#address-cells = <1>;
			#size-cells = <1>;

			sram-bm@5f0000 {
			bm-sram@5f0000 {
				reg = <0x5f0000 0x8000>;
			};
		};
+2 −2
Original line number Diff line number Diff line
@@ -255,14 +255,14 @@
			};
		};

		msm_ram: msmram@c000000 {
		msm_ram: sram@c000000 {
			compatible = "mmio-sram";
			reg = <0x0c000000 0x200000>;
			ranges = <0x0 0x0c000000 0x200000>;
			#address-cells = <1>;
			#size-cells = <1>;

			sram-bm@1f8000 {
			bm-sram@1f8000 {
				reg = <0x001f8000 0x8000>;
			};
		};