[PATCH v2 2/2] dmaengine: pl08x: Use the channel count from the device tree

[David Yang]

The Hi3798MV100 DMAC is a plain PL080 except for the channel count: 4
instead of 8. The part ID does not say, and the driver takes the count
from the matched vendor_data entry. The entry is shared between
instances; the adjustment lands in a private copy. dma-common.yaml
already defines dma-channels for a controller node. Honor it.

Signed-off-by: David Yang <mmyangfl@xxxxxxxxx>
---
 drivers/dma/amba-pl08x.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 9f5e4f5fb877..27c61a7f2082 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -282,7 +282,7 @@ struct pl08x_driver_data {
 	bool has_slave;
 	void __iomem *base;
 	struct amba_device *adev;
-	const struct vendor_data *vd;
+	struct vendor_data *vd;
 	struct pl08x_platform_data *pd;
 	struct pl08x_phy_chan *phy_chans;
 	struct dma_pool *pool;
@@ -2698,6 +2698,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 	struct device_node *np = adev->dev.of_node;
 	struct reset_control *rst;
 	u32 tsfr_size;
+	u32 channels;
 	int ret = 0;
 	int i;
 
@@ -2719,7 +2720,6 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 
 	/* Assign useful pointers to the driver state */
 	pl08x->adev = adev;
-	pl08x->vd = vd;
 
 	pl08x->base = ioremap(adev->res.start, resource_size(&adev->res));
 	if (!pl08x->base) {
@@ -2727,6 +2727,17 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 		goto out_no_ioremap;
 	}
 
+	/*
+	 * vd points into the shared id table; give the instance its own
+	 * copy before anything below starts adjusting it.
+	 */
+	pl08x->vd = devm_kmemdup(&adev->dev, vd, sizeof(*vd), GFP_KERNEL);
+	if (!pl08x->vd) {
+		ret = -ENOMEM;
+		goto out_no_platdata;
+	}
+	vd = pl08x->vd;
+
 	/* Release the reset before reading registers */
 	rst = devm_reset_control_get_optional_shared_deasserted(&adev->dev, NULL);
 	if (IS_ERR(rst)) {
@@ -2756,6 +2767,16 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 		vd->dualmaster = !!(val & BIT(9));
 	}
 
+	/* Read the channel number from the node if specified */
+	if (!of_property_read_u32(np, "dma-channels", &channels) && channels) {
+		if (channels > vd->channels)
+			dev_warn(&adev->dev,
+				 "using %u channels, instead of %u from the node\n",
+				 vd->channels, channels);
+		else
+			vd->channels = channels;
+	}
+
 	/* Initialize memcpy engine */
 	dma_cap_set(DMA_MEMCPY, pl08x->memcpy.cap_mask);
 	pl08x->memcpy.dev = &adev->dev;
-- 
2.53.0