diff options
| author | Doug Berger <opendmb@gmail.com> | 2018-05-12 01:02:41 +0300 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2018-06-27 01:44:14 +0300 |
| commit | 77d899631d8aeb2aed0beae24a6e5a7e5c880505 (patch) | |
| tree | 38845212705652f9dc1b4e5f2b02df70ff56c7d9 | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| download | linux-77d899631d8aeb2aed0beae24a6e5a7e5c880505.tar.xz | |
soc: bcm: brcmstb: pm: Add support for newer rev B3.0 controllers
Update the Device Tree binding document and add a matching entry for the
MEMC DDR controller revision B3.0 which is found on chips like 7278A0
and newer.
Signed-off-by: Doug Berger <opendmb@gmail.com>
[florian: tweak commit message, make it apply to upstream kernel]
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 1 | ||||
| -rw-r--r-- | drivers/soc/bcm/brcmstb/pm/pm-arm.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt index c052caad36e8..fb762059e68e 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt @@ -190,6 +190,7 @@ Power-Down (SRPD), among other things. Required properties: - compatible : should contain one of these "brcm,brcmstb-memc-ddr-rev-b.2.2" + "brcm,brcmstb-memc-ddr-rev-b.3.0" "brcm,brcmstb-memc-ddr" - reg : the MEMC DDR register range diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index dcf8c8065508..ade724677238 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -632,6 +632,10 @@ static const struct of_device_id brcmstb_memc_of_match[] = { .data = &ddr_seq_b22, }, { + .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0", + .data = &ddr_seq_b22, + }, + { .compatible = "brcm,brcmstb-memc-ddr", .data = &ddr_seq, }, |