hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: mvebu: extend the PMSU registers 

The initial binding for PMSU was wrong, as it didn't take into account
all the registers from the PMSU and moreover it referred to the CPU
reset registers which are not part of PMSU.

The Power Management Unit Service block also controls the Coherency
Fabric subsystem. These registers are needed for the CPU idle
implementation for the Armada 370/XP, it allows to enter a deep CPU
idle state where the Coherency Fabric and the L2 cache are powered
down.

This commit adds support for a new compatible for the PMSU node which
includes the registers related to the coherency fabric. It also keeps
compatibility with the old compatible string.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483433-25836-5-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483433-25836-5-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Gregory CLEMENT 2014-04-14 15:50:31 +02:00 committed by Jason Cooper
parent bd045a1ebb
commit 0c3acc746d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt
View File

@ -4,17 +4,15 @@ Available on Marvell SOCs: Armada 370 and Armada XP
Required properties: Required properties:
- compatible: "marvell,armada-370-xp-pmsu" - compatible: should be "marvell,armada-370-pmsu", whereas
"marvell,armada-370-xp-pmsu" is deprecated and will be removed
- reg: Should contain PMSU registers location and length. First pair - reg: Should contain PMSU registers location and length.
for the per-CPU SW Reset Control registers, second pair for the
Power Management Service Unit.
Example: Example:
armada-370-xp-pmsu@d0022000 { armada-370-xp-pmsu@22000 {
compatible = "marvell,armada-370-xp-pmsu"; compatible = "marvell,armada-370-pmsu";
reg = <0xd0022100 0x430>, reg = <0x22000 0x1000>;
<0xd0020800 0x20>;
}; };

14
arch/arm/mach-mvebu/pmsu.c
View File

@ -30,10 +30,14 @@
static void __iomem *pmsu_mp_base; static void __iomem *pmsu_mp_base;
#define PMSU_BOOT_ADDR_REDIRECT_OFFSET(cpu) ((cpu * 0x100) + 0x24) #define PMSU_BASE_OFFSET 0x100
#define PMSU_REG_SIZE 0x1000
#define PMSU_BOOT_ADDR_REDIRECT_OFFSET(cpu) ((cpu * 0x100) + 0x124)
static struct of_device_id of_pmsu_table[] = { static struct of_device_id of_pmsu_table[] = {
{.compatible = "marvell,armada-370-xp-pmsu"}, { .compatible = "marvell,armada-370-pmsu", },
{ .compatible = "marvell,armada-370-xp-pmsu", },
{ /* end of list */ }, { /* end of list */ },
}; };
@ -80,6 +84,12 @@ static int __init armada_370_xp_pmsu_init(void)
goto out; goto out;
} }
if (of_device_is_compatible(np, "marvell,armada-370-xp-pmsu")) {
pr_warn(FW_WARN "deprecated pmsu binding\n");
res.start = res.start - PMSU_BASE_OFFSET;
res.end = res.start + PMSU_REG_SIZE - 1;
}
if (!request_mem_region(res.start, resource_size(&res), if (!request_mem_region(res.start, resource_size(&res),
np->full_name)) { np->full_name)) {
pr_err("unable to request region\n"); pr_err("unable to request region\n");