github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 12:03:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu dt for 5.5 (part 1)

Browse Source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCXb9ANAAKCRALBhiOFHI7
 1YxGAJ42trDdNhPczQeHvNx2UcvmSKU8rQCfdNMvDGGosrbJ/aWklGPQfU4iano=
 =0o2E
 -----END PGP SIGNATURE-----

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-laptop
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-11-03 17:31:40 -08:00
commit 3c8b2e2c41
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/armada-38x.dtsi
View File

@ -103,6 +103,11 @@ internal-regs {
#size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>;
};
L2: cache-controller@8000 {
compatible = "arm,pl310-cache";
reg = <0x8000 0x1000>;

2
arch/arm/boot/dts/armada-xp-98dx3236.dtsi
View File

@ -90,7 +90,7 @@ pcie1: pcie@1,0 {
};
internal-regs {
sdramc@1400 {
sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>;
};

5
arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
View File

@ -33,6 +33,11 @@ memory {
};
};
&L2 {
arm,parity-enable;
marvell,ecc-enable;
};
&devbus_bootcs {
status = "okay";

2
arch/arm/boot/dts/armada-xp.dtsi
View File

@ -36,7 +36,7 @@ bootrom {
};
internal-regs {
sdramc@1400 {
sdramc: sdramc@1400 {
compatible = "marvell,armada-xp-sdram-controller";
reg = <0x1400 0x500>;
};

2
arch/arm/boot/dts/dove.dtsi
View File

@ -784,7 +784,7 @@ lcd0: lcd-controller@820000 {
status = "disabled";
};
crypto_sram: sa-sram@ffffe000 {
crypto_sram: sram@ffffe000 {
compatible = "mmio-sram";
reg = <0xffffe000 0x800>;
clocks = <&gate_clk 15>;

2
arch/arm/boot/dts/kirkwood-synology.dtsi
View File

@ -244,7 +244,7 @@ i2c@11000 {
rs5c372: rs5c372@32 {
status = "disabled";
compatible = "ricoh,rs5c372";
compatible = "ricoh,rs5c372a";
reg = <0x32>;
};