openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

memory: atmel-ebi: Properly handle multiple reference to the same CS 

Some devices are defining several sub-ranges within the same CS iomem
range. In this case, we should not duplicate the EBI device config.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Boris Brezillon 2017-01-27 10:10:37 +01:00 committed by Alexandre Belloni
parent 427456e477
commit 987e079eca
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/memory/atmel-ebi.c
View File

@ -449,12 +449,31 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,
struct at91_ebi_dev_config conf = { }; struct at91_ebi_dev_config conf = { };
struct device *dev = ebi->dev; struct device *dev = ebi->dev;
struct at91_ebi_dev *ebid; struct at91_ebi_dev *ebid;
int ret, numcs = 0, i; unsigned long cslines = 0;
int ret, numcs = 0, nentries, i;
bool apply = false; bool apply = false;
u32 cs;
numcs = of_property_count_elems_of_size(np, "reg", nentries = of_property_count_elems_of_size(np, "reg",
reg_cells * sizeof(u32)); reg_cells * sizeof(u32));
if (numcs <= 0) { for (i = 0; i < nentries; i++) {
ret = of_property_read_u32_index(np, "reg", i * reg_cells,
&cs);
if (ret)
return ret;
if (cs >= AT91_MATRIX_EBI_NUM_CS ||
!(ebi->caps->available_cs & BIT(cs))) {
dev_err(dev, "invalid reg property in %s\n",
np->full_name);
return -EINVAL;
}
if (!test_and_set_bit(cs, &cslines))
numcs++;
}
if (!numcs) {
dev_err(dev, "invalid reg property in %s\n", np->full_name); dev_err(dev, "invalid reg property in %s\n", np->full_name);
return -EINVAL; return -EINVAL;
} }
@ -473,21 +492,8 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,
else if (ret) else if (ret)
apply = true; apply = true;
for (i = 0; i < numcs; i++) { i = 0;
u32 cs; for_each_set_bit(cs, &cslines, AT91_MATRIX_EBI_NUM_CS) {
ret = of_property_read_u32_index(np, "reg", i * reg_cells,
&cs);
if (ret)
return ret;
if (cs > AT91_MATRIX_EBI_NUM_CS ||
!(ebi->caps->available_cs & BIT(cs))) {
dev_err(dev, "invalid reg property in %s\n",
np->full_name);
return -EINVAL;
}
ebid->configs[i].cs = cs; ebid->configs[i].cs = cs;
if (apply) { if (apply) {
@ -506,6 +512,8 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,
if (ebi->ebi_csa && apply) if (ebi->ebi_csa && apply)
regmap_field_update_bits(ebi->ebi_csa, regmap_field_update_bits(ebi->ebi_csa,
BIT(cs), 0); BIT(cs), 0);
i++;
} }
list_add_tail(&ebid->node, &ebi->devs); list_add_tail(&ebid->node, &ebi->devs);