Skip to content

Commit 0e3dd41

Browse files
ffainellikrzk
authored andcommitted
memory: brcmstb_memc: Simplify compatible matching
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 501be7c commit 0e3dd41

File tree

1 file changed

+2
-54
lines changed

1 file changed

+2
-54
lines changed

drivers/memory/brcmstb_memc.c

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -184,62 +184,10 @@ static const struct of_device_id brcmstb_memc_of_match[] = {
184184
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.1",
185185
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
186186
},
187-
{
188-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2",
189-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
190-
},
191-
{
192-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.3",
193-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
194-
},
195-
{
196-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.5",
197-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
198-
},
199-
{
200-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.6",
201-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
202-
},
203-
{
204-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.7",
205-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
206-
},
207-
{
208-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.8",
209-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
210-
},
211-
{
212-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0",
213-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
214-
},
215-
{
216-
.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.1",
217-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
218-
},
219-
{
220-
.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.0",
221-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
222-
},
223-
{
224-
.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.1",
225-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
226-
},
227-
{
228-
.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.2",
229-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
230-
},
231-
{
232-
.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.3",
233-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
234-
},
235-
{
236-
.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.4",
237-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
238-
},
239-
/* default to the original offset */
187+
/* default to the V21 offset */
240188
{
241189
.compatible = "brcm,brcmstb-memc-ddr",
242-
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V1X]
190+
.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]
243191
},
244192
{}
245193
};

0 commit comments

Comments
 (0)