Commit a334e45d authored by Florian Fainelli's avatar Florian Fainelli

soc: bcm: brcmstb: Add missing DDR MEMC compatible strings

We would not be matching the following chip/compatible strings
combinations, which would lead to not setting the warm boot flag
correctly, fix that:

    7260A0/B0: brcm,brcmstb-memc-ddr-rev-b.2.1
    7255A0: brcm,brcmstb-memc-ddr-rev-b.2.3
    7278Bx: brcm,brcmstb-memc-ddr-rev-b.3.1

The B2.1 core (which is in 7260 A0 and B0) doesn't have the
SHIMPHY_ADDR_CNTL_0_DDR_PAD_CNTRL setup in the memsys init code, nor
does it have the warm boot flag re-definition on entry. Those changes
were for B2.2 and later MEMSYS cores. Fall back to the previous S2/S3
entry method for these specific chips.

Fixes: 0b741b82 ("soc: bcm: brcmstb: Add support for S2/S3/S5 suspend states (ARM)")
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 77d89963
...@@ -189,8 +189,11 @@ Power-Down (SRPD), among other things. ...@@ -189,8 +189,11 @@ Power-Down (SRPD), among other things.
Required properties: Required properties:
- compatible : should contain one of these - compatible : should contain one of these
"brcm,brcmstb-memc-ddr-rev-b.2.1"
"brcm,brcmstb-memc-ddr-rev-b.2.2" "brcm,brcmstb-memc-ddr-rev-b.2.2"
"brcm,brcmstb-memc-ddr-rev-b.2.3"
"brcm,brcmstb-memc-ddr-rev-b.3.0" "brcm,brcmstb-memc-ddr-rev-b.3.0"
"brcm,brcmstb-memc-ddr-rev-b.3.1"
"brcm,brcmstb-memc-ddr" "brcm,brcmstb-memc-ddr"
- reg : the MEMC DDR register range - reg : the MEMC DDR register range
......
...@@ -627,14 +627,26 @@ static const struct of_device_id ddr_shimphy_dt_ids[] = { ...@@ -627,14 +627,26 @@ static const struct of_device_id ddr_shimphy_dt_ids[] = {
}; };
static const struct of_device_id brcmstb_memc_of_match[] = { static const struct of_device_id brcmstb_memc_of_match[] = {
{
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.1",
.data = &ddr_seq,
},
{ {
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2", .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2",
.data = &ddr_seq_b22, .data = &ddr_seq_b22,
}, },
{
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.3",
.data = &ddr_seq_b22,
},
{ {
.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0", .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0",
.data = &ddr_seq_b22, .data = &ddr_seq_b22,
}, },
{
.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.1",
.data = &ddr_seq_b22,
},
{ {
.compatible = "brcm,brcmstb-memc-ddr", .compatible = "brcm,brcmstb-memc-ddr",
.data = &ddr_seq, .data = &ddr_seq,
......
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