* [PATCH] tty/serial: Relax the device_type restriction from of_serial @ 2011-02-23 2:12 Grant Likely 2011-02-25 19:22 ` Grant Likely 0 siblings, 1 reply; 3+ messages in thread From: Grant Likely @ 2011-02-23 2:12 UTC (permalink / raw) To: devicetree-discuss, Greg Kroah-Hartman, linux-kernel There is no need to test for a device_type property in ns8250 compatible serial ports. device_type is an OpenFirmware property that is not required when using the flattened tree representation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- drivers/tty/serial/of_serial.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 5c7abe4..6a18ca6 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -160,17 +160,17 @@ static int of_platform_serial_remove(struct platform_device *ofdev) * A few common types, add more as needed. */ static struct of_device_id __devinitdata of_platform_serial_table[] = { - { .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, }, - { .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, }, - { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, }, - { .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, }, - { .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, }, - { .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, }, + { .compatible = "ns8250", .data = (void *)PORT_8250, }, + { .compatible = "ns16450", .data = (void *)PORT_16450, }, + { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, + { .compatible = "ns16550", .data = (void *)PORT_16550, }, + { .compatible = "ns16750", .data = (void *)PORT_16750, }, + { .compatible = "ns16850", .data = (void *)PORT_16850, }, #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL - { .type = "serial", .compatible = "ibm,qpace-nwp-serial", - .data = (void *)PORT_NWPSERIAL, }, + { .compatible = "ibm,qpace-nwp-serial", + .data = (void *)PORT_NWPSERIAL, }, #endif - { .type = "serial", .data = (void *)PORT_UNKNOWN, }, + { .type = "serial", .data = (void *)PORT_UNKNOWN, }, { /* end of list */ }, }; ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tty/serial: Relax the device_type restriction from of_serial 2011-02-23 2:12 [PATCH] tty/serial: Relax the device_type restriction from of_serial Grant Likely @ 2011-02-25 19:22 ` Grant Likely 2011-02-25 21:40 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 3+ messages in thread From: Grant Likely @ 2011-02-25 19:22 UTC (permalink / raw) To: devicetree-discuss, Greg Kroah-Hartman, linux-kernel, linuxppc-dev, Arnd Bergmann, Benjamin Herrenschmidt Hi Arnd and Ben, I forgot to cc you guys on this patch. Greg has it in his tree, but I wanted to make sure you noticed it. If you have any objections, let me know and I'll ask Greg to drop it. Thanks, g. On Tue, Feb 22, 2011 at 7:12 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > There is no need to test for a device_type property in ns8250 > compatible serial ports. device_type is an OpenFirmware property that > is not required when using the flattened tree representation. > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> > --- > drivers/tty/serial/of_serial.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c > index 5c7abe4..6a18ca6 100644 > --- a/drivers/tty/serial/of_serial.c > +++ b/drivers/tty/serial/of_serial.c > @@ -160,17 +160,17 @@ static int of_platform_serial_remove(struct platform_device *ofdev) > * A few common types, add more as needed. > */ > static struct of_device_id __devinitdata of_platform_serial_table[] = { > - { .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, }, > - { .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, }, > - { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > - { .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, }, > - { .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, }, > - { .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, }, > + { .compatible = "ns8250", .data = (void *)PORT_8250, }, > + { .compatible = "ns16450", .data = (void *)PORT_16450, }, > + { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > + { .compatible = "ns16550", .data = (void *)PORT_16550, }, > + { .compatible = "ns16750", .data = (void *)PORT_16750, }, > + { .compatible = "ns16850", .data = (void *)PORT_16850, }, > #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL > - { .type = "serial", .compatible = "ibm,qpace-nwp-serial", > - .data = (void *)PORT_NWPSERIAL, }, > + { .compatible = "ibm,qpace-nwp-serial", > + .data = (void *)PORT_NWPSERIAL, }, > #endif > - { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > + { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > { /* end of list */ }, > }; > > > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tty/serial: Relax the device_type restriction from of_serial 2011-02-25 19:22 ` Grant Likely @ 2011-02-25 21:40 ` Benjamin Herrenschmidt 0 siblings, 0 replies; 3+ messages in thread From: Benjamin Herrenschmidt @ 2011-02-25 21:40 UTC (permalink / raw) To: Grant Likely Cc: devicetree-discuss, Greg Kroah-Hartman, linux-kernel, linuxppc-dev, Arnd Bergmann On Fri, 2011-02-25 at 12:22 -0700, Grant Likely wrote: > Hi Arnd and Ben, > > I forgot to cc you guys on this patch. Greg has it in his tree, but I > wanted to make sure you noticed it. If you have any objections, let > me know and I'll ask Greg to drop it. No objection. Device-types are a thing of the past :-) Cheers, Ben. > Thanks, > g. > > > On Tue, Feb 22, 2011 at 7:12 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > > There is no need to test for a device_type property in ns8250 > > compatible serial ports. device_type is an OpenFirmware property that > > is not required when using the flattened tree representation. > > > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> > > --- > > drivers/tty/serial/of_serial.c | 18 +++++++++--------- > > 1 files changed, 9 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c > > index 5c7abe4..6a18ca6 100644 > > --- a/drivers/tty/serial/of_serial.c > > +++ b/drivers/tty/serial/of_serial.c > > @@ -160,17 +160,17 @@ static int of_platform_serial_remove(struct platform_device *ofdev) > > * A few common types, add more as needed. > > */ > > static struct of_device_id __devinitdata of_platform_serial_table[] = { > > - { .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, }, > > - { .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, }, > > - { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > > - { .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, }, > > - { .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, }, > > - { .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, }, > > + { .compatible = "ns8250", .data = (void *)PORT_8250, }, > > + { .compatible = "ns16450", .data = (void *)PORT_16450, }, > > + { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > > + { .compatible = "ns16550", .data = (void *)PORT_16550, }, > > + { .compatible = "ns16750", .data = (void *)PORT_16750, }, > > + { .compatible = "ns16850", .data = (void *)PORT_16850, }, > > #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL > > - { .type = "serial", .compatible = "ibm,qpace-nwp-serial", > > - .data = (void *)PORT_NWPSERIAL, }, > > + { .compatible = "ibm,qpace-nwp-serial", > > + .data = (void *)PORT_NWPSERIAL, }, > > #endif > > - { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > > + { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > > { /* end of list */ }, > > }; > > > > > > > > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-25 21:41 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-23 2:12 [PATCH] tty/serial: Relax the device_type restriction from of_serial Grant Likely 2011-02-25 19:22 ` Grant Likely 2011-02-25 21:40 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox