Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>

+8 -8
+2 -2
arch/arm/boot/dts/keystone-k2e.dtsi
··· 86 86 }; 87 87 }; 88 88 89 - msm_ram: msmram@c000000 { 89 + msm_ram: sram@c000000 { 90 90 compatible = "mmio-sram"; 91 91 reg = <0x0c000000 0x200000>; 92 92 ranges = <0x0 0x0c000000 0x200000>; 93 93 #address-cells = <1>; 94 94 #size-cells = <1>; 95 95 96 - sram-bm@1f0000 { 96 + bm-sram@1f0000 { 97 97 reg = <0x001f0000 0x8000>; 98 98 }; 99 99 };
+2 -2
arch/arm/boot/dts/keystone-k2g.dtsi
··· 95 95 ranges = <0x0 0x0 0x0 0xc0000000>; 96 96 dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>; 97 97 98 - msm_ram: msmram@c000000 { 98 + msm_ram: sram@c000000 { 99 99 compatible = "mmio-sram"; 100 100 reg = <0x0c000000 0x100000>; 101 101 ranges = <0x0 0x0c000000 0x100000>; 102 102 #address-cells = <1>; 103 103 #size-cells = <1>; 104 104 105 - sram-bm@f7000 { 105 + bm-sram@f7000 { 106 106 reg = <0x000f7000 0x8000>; 107 107 }; 108 108 };
+2 -2
arch/arm/boot/dts/keystone-k2hk.dtsi
··· 57 57 &soc0 { 58 58 /include/ "keystone-k2hk-clocks.dtsi" 59 59 60 - msm_ram: msmram@c000000 { 60 + msm_ram: sram@c000000 { 61 61 compatible = "mmio-sram"; 62 62 reg = <0x0c000000 0x600000>; 63 63 ranges = <0x0 0x0c000000 0x600000>; 64 64 #address-cells = <1>; 65 65 #size-cells = <1>; 66 66 67 - sram-bm@5f0000 { 67 + bm-sram@5f0000 { 68 68 reg = <0x5f0000 0x8000>; 69 69 }; 70 70 };
+2 -2
arch/arm/boot/dts/keystone-k2l.dtsi
··· 255 255 }; 256 256 }; 257 257 258 - msm_ram: msmram@c000000 { 258 + msm_ram: sram@c000000 { 259 259 compatible = "mmio-sram"; 260 260 reg = <0x0c000000 0x200000>; 261 261 ranges = <0x0 0x0c000000 0x200000>; 262 262 #address-cells = <1>; 263 263 #size-cells = <1>; 264 264 265 - sram-bm@1f8000 { 265 + bm-sram@1f8000 { 266 266 reg = <0x001f8000 0x8000>; 267 267 }; 268 268 };