]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
memory: brcmstb_memc: Simplify compatible matching
authorFlorian Fainelli <florian.fainelli@broadcom.com>
Mon, 9 Jun 2025 21:23:56 +0000 (14:23 -0700)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 27 Jun 2025 05:47:49 +0000 (07:47 +0200)
Now that a "brcm,brcmstb-memc-ddr-rev-b.2.x" fallback compatible string
has been defined, we can greatly simplify the matching within the driver
to only look for that compatible string and nothing else.

The fallback "brcm,brcmstb-memc-ddr" is also updated to assume the V21
register layout since that is the most common nowadays.

Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20250609212356.2264244-3-florian.fainelli@broadcom.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
drivers/memory/brcmstb_memc.c

index c87b37e2c1f07cc4a5f5904dfaef2839985a39c0..ba73470b1b134e5d8134c75a641bfa6f88a3cd36 100644 (file)
@@ -184,62 +184,10 @@ static const struct of_device_id brcmstb_memc_of_match[] = {
                .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.1",
                .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
        },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.3",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.5",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.6",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.7",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.8",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.1",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-c.1.0",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-c.1.1",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-c.1.2",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-c.1.3",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       {
-               .compatible = "brcm,brcmstb-memc-ddr-rev-c.1.4",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
-       },
-       /* default to the original offset */
+       /* default to the V21 offset */
        {
                .compatible = "brcm,brcmstb-memc-ddr",
-               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V1X]
+               .data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
        },
        {}
 };