Skip to content

Commit 36e2913

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3908895 + 644c5a5 commit 36e2913

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

arch/arm/boot/dts/keystone-k2e.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@
8686
};
8787
};
8888

89-
msm_ram: msmram@c000000 {
89+
msm_ram: sram@c000000 {
9090
compatible = "mmio-sram";
9191
reg = <0x0c000000 0x200000>;
9292
ranges = <0x0 0x0c000000 0x200000>;
9393
#address-cells = <1>;
9494
#size-cells = <1>;
9595

96-
sram-bm@1f0000 {
96+
bm-sram@1f0000 {
9797
reg = <0x001f0000 0x8000>;
9898
};
9999
};

arch/arm/boot/dts/keystone-k2g.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
ranges = <0x0 0x0 0x0 0xc0000000>;
9696
dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
9797

98-
msm_ram: msmram@c000000 {
98+
msm_ram: sram@c000000 {
9999
compatible = "mmio-sram";
100100
reg = <0x0c000000 0x100000>;
101101
ranges = <0x0 0x0c000000 0x100000>;
102102
#address-cells = <1>;
103103
#size-cells = <1>;
104104

105-
sram-bm@f7000 {
105+
bm-sram@f7000 {
106106
reg = <0x000f7000 0x8000>;
107107
};
108108
};

arch/arm/boot/dts/keystone-k2hk.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
&soc0 {
5858
/include/ "keystone-k2hk-clocks.dtsi"
5959

60-
msm_ram: msmram@c000000 {
60+
msm_ram: sram@c000000 {
6161
compatible = "mmio-sram";
6262
reg = <0x0c000000 0x600000>;
6363
ranges = <0x0 0x0c000000 0x600000>;
6464
#address-cells = <1>;
6565
#size-cells = <1>;
6666

67-
sram-bm@5f0000 {
67+
bm-sram@5f0000 {
6868
reg = <0x5f0000 0x8000>;
6969
};
7070
};

arch/arm/boot/dts/keystone-k2l.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,14 @@
255255
};
256256
};
257257

258-
msm_ram: msmram@c000000 {
258+
msm_ram: sram@c000000 {
259259
compatible = "mmio-sram";
260260
reg = <0x0c000000 0x200000>;
261261
ranges = <0x0 0x0c000000 0x200000>;
262262
#address-cells = <1>;
263263
#size-cells = <1>;
264264

265-
sram-bm@1f8000 {
265+
bm-sram@1f8000 {
266266
reg = <0x001f8000 0x8000>;
267267
};
268268
};

0 commit comments

Comments
 (0)