[FSL P50x0] Keyboard and mouse don't work anymore after the devicetree updates for 5.19

[Christian Zigotzky]

On 27 May 2022 at 04:23 am, Rob Herring wrote:
> The issue is in drivers/usb/host/fsl-mph-dr-of.c which copies the
> resources to a child platform device. Can you try the following
> change:
>
> diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
> index 44a7e58a26e3..47d9b7be60da 100644
> --- a/drivers/usb/host/fsl-mph-dr-of.c
> +++ b/drivers/usb/host/fsl-mph-dr-of.c
> @@ -80,8 +80,6 @@ static struct platform_device *fsl_usb2_device_register(
>                                          const char *name, int id)
>   {
>          struct platform_device *pdev;
> -       const struct resource *res = ofdev->resource;
> -       unsigned int num = ofdev->num_resources;
>          int retval;
>
>          pdev = platform_device_alloc(name, id);
> @@ -106,11 +104,7 @@ static struct platform_device *fsl_usb2_device_register(
>          if (retval)
>                  goto error;
>
> -       if (num) {
> -               retval = platform_device_add_resources(pdev, res, num);
> -               if (retval)
> -                       goto error;
> -       }
> +       pdev->dev.of_node = ofdev->dev.of_node;
>
>          retval = platform_device_add(pdev);
>          if (retval)
Hi Rob,

Thanks a lot for your patch! :-)

First attempt with the latest git kernel:

patching file a/drivers/usb/host/fsl-mph-dr-of.c
Hunk #1 FAILED at 80.
Hunk #2 FAILED at 106.
2 out of 2 hunks FAILED -- saving rejects to file 
a/drivers/usb/host/fsl-mph-dr-of.c.rej

I created a new patch with your modifications. (see attachment)

Unfortunately I can't test it. The git kernel doesn't compile currently.

powerpc-linux-gnu-ld: net/rds/tcp_stats.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/wireless/wext-spy.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/wireless/wext-priv.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/bcast.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/bearer.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/core.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/link.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/discover.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/msg.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/name_distr.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/subscr.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/name_table.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/net.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/netlink.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/netlink_compat.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/node.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/eth_media.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/topsrv.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/group.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/trace.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/udp_media.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/tipc/sysctl.o:(.bss+0x40): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/crypto.o:(.bss+0x0): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/tipc/diag.o:(.bss+0x0): multiple definition of 
`____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
powerpc-linux-gnu-ld: net/9p/trans_common.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/9p/trans_virtio.o:(.bss+0x40): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/6lowpan/ndisc.o:(.bss+0x0): multiple 
definition of `____cacheline_aligned'; init/version.o:(.bss+0x0): first 
defined here
powerpc-linux-gnu-ld: net/sysctl_net.o:(.bss+0x80): multiple definition 
of `____cacheline_aligned'; init/version.o:(.bss+0x0): first defined here
make: *** [Makefile:1160: vmlinux] Error 1

@All
Could you please check the multiple definition of `____cacheline_aligned'?

Thanks,
Christian

-------------- next part --------------
--- a/drivers/usb/host/fsl-mph-dr-of.c	2022-05-28 09:10:26.797688422 +0200
+++ b/drivers/usb/host/fsl-mph-dr-of.c	2022-05-28 09:15:01.668594809 +0200
@@ -80,8 +80,6 @@ static struct platform_device *fsl_usb2_
 					const char *name, int id)
 {
 	struct platform_device *pdev;
-	const struct resource *res = ofdev->resource;
-	unsigned int num = ofdev->num_resources;
 	int retval;
 
 	pdev = platform_device_alloc(name, id);
@@ -106,11 +104,7 @@ static struct platform_device *fsl_usb2_
 	if (retval)
 		goto error;
 
-	if (num) {
-		retval = platform_device_add_resources(pdev, res, num);
-		if (retval)
-			goto error;
-	}
+	pdev->dev.of_node = ofdev->dev.of_node;
 
 	retval = platform_device_add(pdev);
 	if (retval)