davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NXP/FSL SoC driver updates for v5.16

Browse Source 
DPIO Driver
 - Code cleanup and fix compile warning
 
 RCMP and Guts Driver
 - Make use of the helper function devm_platform_ioremap_resource()
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEhb3UXAyxp6UQ0v6khtxQDvusFVQFAmFyCg8ACgkQhtxQDvus
 FVRraxAAsgKVsmUcN6zkn/7qu1hpb6HXYCJRNiudKNeRmKkqgyoKUTT3YzO3+IqK
 wVXoPVDfat19wVTqdAPXSf6ZQkSyG4bigU+c8YwxoPzNBUJg1fQVRHdz9majpYMK
 wUBEGfAxcT7uLBTJpFT/rgMMJbe0EM/Dykyp3xHt0VQRM5tUvnVr2X5WWSJhAEPN
 BJNQW/54UKmpZUEAO6Pas3vH5oUXkAfzmSXpm5z31dMmd5aGckSAwpBzLVGxTdVX
 AKTZ4u1nodWi+AJmItMmgyLGXMMuWjmicwtP2LOiIjmHEv5vTQMWnK9G61K/EwI8
 cP0qm01xThhwFey15L1EAyfh23L+md/aB7X0msPf2t2oRq2uc8dwjeVW2uHdR/oy
 qhsfheYK3m/g7IQK9sAT2uSLVnuNVHlSutIDKvWnJWD9EtoA4RgkQH61hXNjp4zr
 BtUg9M2dnp9zP7K1oQqfWi726FWk/EWj/FVRWKjCWXmHupUBndbrFMux4HFGy/16
 hluEu0OcirFOVhrPLAPBSdzBfQm5n/h7ZxR/9ObyRwtHZ7VM3w4Z1Onh5ByJb3OZ
 1VhIUqVyRm4tKsRqNyFiyLC53JLx90nuZYzd8beyvL6bgCRFvWreZ9kiBWTnElfn
 y/1BCpp7suQWMe0si3qghC2FdncKPYSpYzHr9M840ZxivWKtcBY=
 =SEAL
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFy2VwACgkQmmx57+YA
 GNljYg/+LVeiT/ZBDPMp3gG/bEM1ndH4Spt/8conDVD8h1a4IL7cLo3u+suWbjTt
 26AwSH6bGIBHHh5phlYGuZLtdgjZu4jLGzZofK8DqnRyvBq51kcBrZxeWGkdEn8E
 SaYh9qlevKjy7NdFkNYGLLvFtOoxnqTwTEAe0iO13EgHRKpil/huRGux0yJKjp6/
 EbpqMcmQQKU1C5Gks6q/E7ApWzIZV+BLO3RkBhULYXpQALNIcZoWcdTQVn2xE+Xy
 bALw1MJ4z7Od09PYu4aDrTx6Aaobq1XTEQefprt1NA06LFbrTxRlYM/Rh2tPaYeT
 F7tu9HHe4w9kFAFkrcHTw/WcENCYWhT+TOavWK2BqHQMAa2slNZZaTMwX5VnE9R2
 7G0mLAzPf4wKa4WbInLhWtCarN3aJ5r35Uj8/nozC4qU5yUdJR7D3eFYBSE08sbz
 e4hp/NLjSuGbakJpSK09+IBrpRL/hfCnHi6Vd4yj6veqA2FyS+//HUnIhcn4HeGG
 xotMS8pBemEpC+Qfrr382TzR0X5U9xBzQTV3K2i2un9mHoMY/0vixupwSBmcnZ81
 1mrVTAz7x5RDztnMXbDxl0+SG+40NL+H/uYBuy17MUmYI59QzlAYGavSU0605ZE4
 jjQSu5+S6Blrqgfk43Op/2kC3J/AqtyKKpRUOALenaPAWvygPS0=
 =1cl/
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-22 17:31:39 +02:00
commit ac2561f921
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/fsl/dpio/dpio-service.c
View File

@ -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);

8
drivers/soc/fsl/dpio/qbman-portal.c
View File

@ -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++;

4
drivers/soc/fsl/guts.c
View File

@ -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);

7
drivers/soc/fsl/rcpm.c
View File

@ -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;