Commit 3c8b2e2c authored by Olof Johansson's avatar Olof Johansson

Merge tag 'mvebu-dt-5.5-1' of git://git.infradead.org/linux-mvebu into arm/dt

mvebu dt for 5.5 (part 1)

 - Enable L2 cache parity and ECC on a Armada XP SoC family and allow
   to use in on the Armada 38x SoCs too.
 - Use correct name for the rs5c372a on synology (Kirkwood based)
 - Rename "sa-sram" node to "sram" on dove

* tag 'mvebu-dt-5.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-xp: add label to sdram-controller node
  ARM: dts: mvebu: add sdram controller node to Armada-38x
  ARM: dts: armada-xp: enable L2 cache parity and ecc on db-xc3-24g4xg
  ARM: dts: dove: Rename "sa-sram" node to "sram"
  ARM: dts: kirkwood: synology: Fix rs5c372 RTC entry

Link: https://lore.kernel.org/r/8736f44q9l.fsf@FE-laptopSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fc711fdf 90b9dc96
...@@ -103,6 +103,11 @@ internal-regs { ...@@ -103,6 +103,11 @@ internal-regs {
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>;
};
L2: cache-controller@8000 { L2: cache-controller@8000 {
compatible = "arm,pl310-cache"; compatible = "arm,pl310-cache";
reg = <0x8000 0x1000>; reg = <0x8000 0x1000>;
......
...@@ -90,7 +90,7 @@ pcie1: pcie@1,0 { ...@@ -90,7 +90,7 @@ pcie1: pcie@1,0 {
}; };
internal-regs { internal-regs {
sdramc@1400 { sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller"; compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>; reg = <0x1400 0x500>;
}; };
......
...@@ -33,6 +33,11 @@ memory { ...@@ -33,6 +33,11 @@ memory {
}; };
}; };
&L2 {
arm,parity-enable;
marvell,ecc-enable;
};
&devbus_bootcs { &devbus_bootcs {
status = "okay"; status = "okay";
......
...@@ -36,7 +36,7 @@ bootrom { ...@@ -36,7 +36,7 @@ bootrom {
}; };
internal-regs { internal-regs {
sdramc@1400 { sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller"; compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>; reg = <0x1400 0x500>;
}; };
......
...@@ -784,7 +784,7 @@ lcd0: lcd-controller@820000 { ...@@ -784,7 +784,7 @@ lcd0: lcd-controller@820000 {
status = "disabled"; status = "disabled";
}; };
crypto_sram: sa-sram@ffffe000 { crypto_sram: sram@ffffe000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0xffffe000 0x800>; reg = <0xffffe000 0x800>;
clocks = <&gate_clk 15>; clocks = <&gate_clk 15>;
......
...@@ -244,7 +244,7 @@ i2c@11000 { ...@@ -244,7 +244,7 @@ i2c@11000 {
rs5c372: rs5c372@32 { rs5c372: rs5c372@32 {
status = "disabled"; status = "disabled";
compatible = "ricoh,rs5c372"; compatible = "ricoh,rs5c372a";
reg = <0x32>; reg = <0x32>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment