|
@@ -526,23 +526,21 @@ static int armada_thermal_probe_legacy(struct platform_device *pdev,
|
|
|
|
|
|
/* First memory region points towards the status register */
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- if (!res)
|
|
|
- return -EIO;
|
|
|
-
|
|
|
- /*
|
|
|
- * Edit the resource start address and length to map over all the
|
|
|
- * registers, instead of pointing at them one by one.
|
|
|
- */
|
|
|
- res->start -= data->syscon_status_off;
|
|
|
- res->end = res->start + max(data->syscon_status_off,
|
|
|
- max(data->syscon_control0_off,
|
|
|
- data->syscon_control1_off)) +
|
|
|
- sizeof(unsigned int) - 1;
|
|
|
-
|
|
|
base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
if (IS_ERR(base))
|
|
|
return PTR_ERR(base);
|
|
|
|
|
|
+ /*
|
|
|
+ * Fix up from the old individual DT register specification to
|
|
|
+ * cover all the registers. We do this by adjusting the ioremap()
|
|
|
+ * result, which should be fine as ioremap() deals with pages.
|
|
|
+ * However, validate that we do not cross a page boundary while
|
|
|
+ * making this adjustment.
|
|
|
+ */
|
|
|
+ if (((unsigned long)base & ~PAGE_MASK) < data->syscon_status_off)
|
|
|
+ return -EINVAL;
|
|
|
+ base -= data->syscon_status_off;
|
|
|
+
|
|
|
priv->syscon = devm_regmap_init_mmio(&pdev->dev, base,
|
|
|
&armada_thermal_regmap_config);
|
|
|
if (IS_ERR(priv->syscon))
|