diff mbox

[net,v2,2/5] powerpc: remove fsl,fman from of_device_ids[]

Message ID 1482139343-8975-3-git-send-email-madalin.bucur@nxp.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Madalin Bucur Dec. 19, 2016, 9:22 a.m. UTC
The fsl/fman drivers will use of_platform_populate() on all
supported platforms.

Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
---
 arch/powerpc/platforms/85xx/corenet_generic.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

David Miller Dec. 19, 2016, 3:37 p.m. UTC | #1
From: Madalin Bucur <madalin.bucur@nxp.com>
Date: Mon, 19 Dec 2016 11:22:20 +0200

> The fsl/fman drivers will use of_platform_populate() on all
> supported platforms.
> 
> Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>

It seems that this creates a failure point between patches #2 and
#3.  If the cases handled by this "fsl,fman" entry are only afterwards
covered by the of_platform_populate() code added in patch #3 then you
cannot split these two changes up like this.

The two changes must be done at the same time, otherwise probing will
fail for some people between patches #2 and #3.
Madalin Bucur Dec. 19, 2016, 4:07 p.m. UTC | #2
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Monday, December 19, 2016 5:37 PM
> 
> From: Madalin Bucur <madalin.bucur@nxp.com>
> Date: Mon, 19 Dec 2016 11:22:20 +0200
> 
> > The fsl/fman drivers will use of_platform_populate() on all
> > supported platforms.
> >
> > Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
> 
> It seems that this creates a failure point between patches #2 and
> #3.  If the cases handled by this "fsl,fman" entry are only afterwards
> covered by the of_platform_populate() code added in patch #3 then you
> cannot split these two changes up like this.
> 
> The two changes must be done at the same time, otherwise probing will
> fail for some people between patches #2 and #3.

You are right, that will happen. I was not convinced these need to be
merged due to the different places they touch. I'll send a v3.
diff mbox

Patch

diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 1179115..824b7f1 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -117,9 +117,6 @@  static const struct of_device_id of_device_ids[] = {
 	{
 		.compatible	= "fsl,qe",
 	},
-	{
-		.compatible    = "fsl,fman",
-	},
 	/* The following two are for the Freescale hypervisor */
 	{
 		.name		= "hypervisor",