Unverified Commit ac2561f9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-next-v5.16' of... 

Merge tag 'soc-fsl-next-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers

NXP/FSL SoC driver updates for v5.16

DPIO Driver
- Code cleanup and fix compile warning

RCMP and Guts Driver
- Make use of the helper function devm_platform_ioremap_resource()

* tag 'soc-fsl-next-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  soc: fsl: dpio: rename the enqueue descriptor variable
  soc: fsl: dpio: use an explicit NULL instead of 0
  soc: fsl: rcpm: Make use of the helper function devm_platform_ioremap_resource()
  soc: fsl: guts: Make use of the helper function devm_platform_ioremap_resource()

Link: https://lore.kernel.org/r/20211022010027.11866-2-leoyang.li@nxp.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 34f3c67b 54c8b5b6

drivers/soc/fsl/dpio/dpio-service.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ int dpaa2_io_service_enqueue_multiple_fq(struct dpaa2_io *d, 
	qbman_eq_desc_set_no_orp(&ed, 0);

	qbman_eq_desc_set_fq(&ed, fqid);



	return qbman_swp_enqueue_multiple(d->swp, &ed, fd, 0, nb);

	return qbman_swp_enqueue_multiple(d->swp, &ed, fd, NULL, nb);

}

EXPORT_SYMBOL(dpaa2_io_service_enqueue_multiple_fq);

drivers/soc/fsl/dpio/qbman-portal.c

+4 −4
Original line number Diff line number Diff line
@@ -688,9 +688,9 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, 
		p = (s->addr_cena + QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));

		p[0] = cl[0] | s->eqcr.pi_vb;

		if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {

			struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;

			struct qbman_eq_desc *eq_desc = (struct qbman_eq_desc *)p;



			d->dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |

			eq_desc->dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |

				((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);

		}

		eqcr_pi++;
@@ -770,9 +770,9 @@ int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, 
		p = (s->addr_cena + QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));

		p[0] = cl[0] | s->eqcr.pi_vb;

		if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {

			struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;

			struct qbman_eq_desc *eq_desc = (struct qbman_eq_desc *)p;



			d->dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |

			eq_desc->dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |

				((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);

		}

		eqcr_pi++;

drivers/soc/fsl/guts.c

+1 −3
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static int fsl_guts_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct device *dev = &pdev->dev;

	struct resource *res;

	const struct fsl_soc_die_attr *soc_die;

	const char *machine;

	u32 svr;
@@ -152,8 +151,7 @@ static int fsl_guts_probe(struct platform_device *pdev) 


	guts->little_endian = of_property_read_bool(np, "little-endian");



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	guts->regs = devm_ioremap_resource(dev, res);

	guts->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(guts->regs))

		return PTR_ERR(guts->regs);

drivers/soc/fsl/rcpm.c

+1 −6
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static const struct dev_pm_ops rcpm_pm_ops = { 
static int rcpm_probe(struct platform_device *pdev)

{

	struct device	*dev = &pdev->dev;

	struct resource *r;

	struct rcpm	*rcpm;

	int ret;
@@ -154,11 +153,7 @@ static int rcpm_probe(struct platform_device *pdev) 
	if (!rcpm)

		return -ENOMEM;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r)

		return -ENODEV;



	rcpm->ippdexpcr_base = devm_ioremap_resource(&pdev->dev, r);

	rcpm->ippdexpcr_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(rcpm->ippdexpcr_base)) {

		ret =  PTR_ERR(rcpm->ippdexpcr_base);

		return ret;