|
|
@@ -190,15 +190,10 @@ EXPORT_SYMBOL_GPL(pruss_release_mem_region);
|
|
|
int pruss_regmap_read(struct pruss *pruss, enum pruss_syscon mod,
|
|
|
unsigned int reg, unsigned int *val)
|
|
|
{
|
|
|
- struct regmap *map;
|
|
|
-
|
|
|
- if (IS_ERR_OR_NULL(pruss) || mod < PRUSS_SYSCON_CFG ||
|
|
|
- mod >= PRUSS_SYSCON_MAX)
|
|
|
+ if (IS_ERR_OR_NULL(pruss) || mod != PRUSS_SYSCON_CFG)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- map = (mod == PRUSS_SYSCON_CFG) ? pruss->cfg : pruss->mii_rt;
|
|
|
-
|
|
|
- return regmap_read(map, reg, val);
|
|
|
+ return regmap_read(pruss->cfg, reg, val);
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(pruss_regmap_read);
|
|
|
|
|
|
@@ -218,15 +213,10 @@ EXPORT_SYMBOL_GPL(pruss_regmap_read);
|
|
|
int pruss_regmap_update(struct pruss *pruss, enum pruss_syscon mod,
|
|
|
unsigned int reg, unsigned int mask, unsigned int val)
|
|
|
{
|
|
|
- struct regmap *map;
|
|
|
-
|
|
|
- if (IS_ERR_OR_NULL(pruss) || mod < PRUSS_SYSCON_CFG ||
|
|
|
- mod >= PRUSS_SYSCON_MAX)
|
|
|
+ if (IS_ERR_OR_NULL(pruss) || mod != PRUSS_SYSCON_CFG)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- map = (mod == PRUSS_SYSCON_CFG) ? pruss->cfg : pruss->mii_rt;
|
|
|
-
|
|
|
- return regmap_update_bits(map, reg, mask, val);
|
|
|
+ return regmap_update_bits(pruss->cfg, reg, mask, val);
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(pruss_regmap_update);
|
|
|
|
|
|
@@ -404,17 +394,6 @@ skip_mux:
|
|
|
return PTR_ERR(pruss->cfg);
|
|
|
}
|
|
|
|
|
|
- np = of_get_child_by_name(node, "mii-rt");
|
|
|
- if (!np) {
|
|
|
- dev_err(dev, "%pOF is missing mii-rt node\n", np);
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
-
|
|
|
- pruss->mii_rt = syscon_node_to_regmap(np);
|
|
|
- of_node_put(np);
|
|
|
- if (IS_ERR(pruss->mii_rt))
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
np = of_get_child_by_name(node, "memories");
|
|
|
if (!np) {
|
|
|
dev_err(dev, "%pOF is missing memories node\n", np);
|