| Message ID | 1312945564-6626-4-git-send-email-holt@sgi.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Aug 09, 2011 at 10:06:02PM -0500, Robin Holt wrote: > On powerpc, the OpenFirmware devices are not matched without specifying > an of_match array. Introduce that array as that is used for matching > on the Freescale P1010 processor. > > Signed-off-by: Robin Holt <holt@sgi.com> > To: Marc Kleine-Budde <mkl@pengutronix.de> > Acked-by: Wolfgang Grandegger <wg@grandegger.com> > To: U Bhaskar-B22300 <B22300@freescale.com> > Cc: socketcan-core@lists.berlios.de > Cc: netdev@vger.kernel.org > Cc: PPC list <linuxppc-dev@lists.ozlabs.org> > --- > drivers/net/can/flexcan.c | 13 ++++++++++++- > 1 files changed, 12 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c > index 68cbe52..662f832 100644 > --- a/drivers/net/can/flexcan.c > +++ b/drivers/net/can/flexcan.c > @@ -1027,8 +1027,19 @@ static int __devexit flexcan_remove(struct platform_device *pdev) > return 0; > } > > +static struct of_device_id flexcan_of_match[] = { > + { > + .compatible = "fsl,flexcan", Let me make sure I have this correct. At this point, we would want it to be fsl,flexcan here. If, at some point, we find the i.MX-wonderful has diverged from the -p1010, we would, at that point in the code, use of_device_is_compatible to differentiate the two, correct? That would mean we should make no change to this patch for the fsl,flexcan-p1010, right? Robin
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 68cbe52..662f832 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1027,8 +1027,19 @@ static int __devexit flexcan_remove(struct platform_device *pdev) return 0; } +static struct of_device_id flexcan_of_match[] = { + { + .compatible = "fsl,flexcan", + }, + {}, +}; + static struct platform_driver flexcan_driver = { - .driver.name = DRV_NAME, + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .of_match_table = flexcan_of_match, + }, .probe = flexcan_probe, .remove = __devexit_p(flexcan_remove), };