diff options
-rw-r--r-- | Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt | 9 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/pmsu.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt index 976188770079..26799ef562df 100644 --- a/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt +++ b/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt | |||
@@ -1,11 +1,14 @@ | |||
1 | Power Management Service Unit(PMSU) | 1 | Power Management Service Unit(PMSU) |
2 | ----------------------------------- | 2 | ----------------------------------- |
3 | Available on Marvell SOCs: Armada 370 and Armada XP | 3 | Available on Marvell SOCs: Armada 370, Armada 38x and Armada XP |
4 | 4 | ||
5 | Required properties: | 5 | Required properties: |
6 | 6 | ||
7 | - compatible: should be "marvell,armada-370-pmsu", whereas | 7 | - compatible: should be one of: |
8 | "marvell,armada-370-xp-pmsu" is deprecated and will be removed | 8 | - "marvell,armada-370-pmsu" for Armada 370 or Armada XP |
9 | - "marvell,armada-380-pmsu" for Armada 38x | ||
10 | - "marvell,armada-370-xp-pmsu" was used for Armada 370/XP but is now | ||
11 | deprecated and will be removed | ||
9 | 12 | ||
10 | - reg: Should contain PMSU registers location and length. | 13 | - reg: Should contain PMSU registers location and length. |
11 | 14 | ||
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c index a1508deecd26..a8796b832e2e 100644 --- a/arch/arm/mach-mvebu/pmsu.c +++ b/arch/arm/mach-mvebu/pmsu.c | |||
@@ -38,6 +38,7 @@ static void __iomem *pmsu_mp_base; | |||
38 | static struct of_device_id of_pmsu_table[] = { | 38 | static struct of_device_id of_pmsu_table[] = { |
39 | { .compatible = "marvell,armada-370-pmsu", }, | 39 | { .compatible = "marvell,armada-370-pmsu", }, |
40 | { .compatible = "marvell,armada-370-xp-pmsu", }, | 40 | { .compatible = "marvell,armada-370-xp-pmsu", }, |
41 | { .compatible = "marvell,armada-380-pmsu", }, | ||
41 | { /* end of list */ }, | 42 | { /* end of list */ }, |
42 | }; | 43 | }; |
43 | 44 | ||