* bcm63xx_uart updates for 2.6.34 @ 2010-01-30 17:42 Maxime Bizon 2010-01-30 17:42 ` [PATCH 1/2] bcm63xx_uart: don't use kfree() on non kmalloced area Maxime Bizon 2010-01-30 17:42 ` [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered Maxime Bizon 0 siblings, 2 replies; 5+ messages in thread From: Maxime Bizon @ 2010-01-30 17:42 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-serial; +Cc: Ralf Baechle, linux-mips Hi Greg, These two patches are intended for 2.6.34. Regards, ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] bcm63xx_uart: don't use kfree() on non kmalloced area. 2010-01-30 17:42 bcm63xx_uart updates for 2.6.34 Maxime Bizon @ 2010-01-30 17:42 ` Maxime Bizon 2010-01-30 17:42 ` [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered Maxime Bizon 1 sibling, 0 replies; 5+ messages in thread From: Maxime Bizon @ 2010-01-30 17:42 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-serial; +Cc: Ralf Baechle, linux-mips, Maxime Bizon Signed-off-by: Maxime Bizon <mbizon@freebox.fr> --- drivers/serial/bcm63xx_uart.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c index 37ad0c4..f78ede8 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/serial/bcm63xx_uart.c @@ -830,7 +830,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev) ret = uart_add_one_port(&bcm_uart_driver, port); if (ret) { - kfree(port); + ports[pdev->id].membase = 0; return ret; } platform_set_drvdata(pdev, port); -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered. 2010-01-30 17:42 bcm63xx_uart updates for 2.6.34 Maxime Bizon 2010-01-30 17:42 ` [PATCH 1/2] bcm63xx_uart: don't use kfree() on non kmalloced area Maxime Bizon @ 2010-01-30 17:42 ` Maxime Bizon 2010-01-30 18:23 ` Wolfram Sang 1 sibling, 1 reply; 5+ messages in thread From: Maxime Bizon @ 2010-01-30 17:42 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-serial; +Cc: Ralf Baechle, linux-mips, Maxime Bizon The bcm6358 CPU has two uarts, make it possible to use the second one. Signed-off-by: Maxime Bizon <mbizon@freebox.fr> --- drivers/serial/bcm63xx_uart.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c index f78ede8..6ab959a 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/serial/bcm63xx_uart.c @@ -35,7 +35,7 @@ #include <bcm63xx_regs.h> #include <bcm63xx_io.h> -#define BCM63XX_NR_UARTS 1 +#define BCM63XX_NR_UARTS 2 static struct uart_port ports[BCM63XX_NR_UARTS]; @@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = { .dev_name = "ttyS", .major = TTY_MAJOR, .minor = 64, - .nr = 1, + .nr = 2, .cons = BCM63XX_CONSOLE, }; @@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev) port->dev = &pdev->dev; port->fifosize = 16; port->uartclk = clk_get_rate(clk) / 2; + port->line = pdev->id; clk_put(clk); ret = uart_add_one_port(&bcm_uart_driver, port); -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered. 2010-01-30 17:42 ` [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered Maxime Bizon @ 2010-01-30 18:23 ` Wolfram Sang 2010-02-01 22:29 ` Greg KH 0 siblings, 1 reply; 5+ messages in thread From: Wolfram Sang @ 2010-01-30 18:23 UTC (permalink / raw) To: Maxime Bizon; +Cc: Greg Kroah-Hartman, linux-serial, Ralf Baechle, linux-mips [-- Attachment #1: Type: text/plain, Size: 1095 bytes --] On Sat, Jan 30, 2010 at 06:42:57PM +0100, Maxime Bizon wrote: > The bcm6358 CPU has two uarts, make it possible to use the second one. > > Signed-off-by: Maxime Bizon <mbizon@freebox.fr> > --- > drivers/serial/bcm63xx_uart.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c > index f78ede8..6ab959a 100644 > --- a/drivers/serial/bcm63xx_uart.c > +++ b/drivers/serial/bcm63xx_uart.c > @@ -35,7 +35,7 @@ > #include <bcm63xx_regs.h> > #include <bcm63xx_io.h> > > -#define BCM63XX_NR_UARTS 1 > +#define BCM63XX_NR_UARTS 2 > > static struct uart_port ports[BCM63XX_NR_UARTS]; > > @@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = { > .dev_name = "ttyS", > .major = TTY_MAJOR, > .minor = 64, > - .nr = 1, > + .nr = 2, Err, why not using the #define here? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered. 2010-01-30 18:23 ` Wolfram Sang @ 2010-02-01 22:29 ` Greg KH 0 siblings, 0 replies; 5+ messages in thread From: Greg KH @ 2010-02-01 22:29 UTC (permalink / raw) To: Wolfram Sang Cc: Maxime Bizon, Greg Kroah-Hartman, linux-serial, Ralf Baechle, linux-mips On Sat, Jan 30, 2010 at 07:23:43PM +0100, Wolfram Sang wrote: > On Sat, Jan 30, 2010 at 06:42:57PM +0100, Maxime Bizon wrote: > > The bcm6358 CPU has two uarts, make it possible to use the second one. > > > > Signed-off-by: Maxime Bizon <mbizon@freebox.fr> > > --- > > drivers/serial/bcm63xx_uart.c | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c > > index f78ede8..6ab959a 100644 > > --- a/drivers/serial/bcm63xx_uart.c > > +++ b/drivers/serial/bcm63xx_uart.c > > @@ -35,7 +35,7 @@ > > #include <bcm63xx_regs.h> > > #include <bcm63xx_io.h> > > > > -#define BCM63XX_NR_UARTS 1 > > +#define BCM63XX_NR_UARTS 2 > > > > static struct uart_port ports[BCM63XX_NR_UARTS]; > > > > @@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = { > > .dev_name = "ttyS", > > .major = TTY_MAJOR, > > .minor = 64, > > - .nr = 1, > > + .nr = 2, > > Err, why not using the #define here? Good idea, I've tweaked the patch to do that. thanks, greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-01 22:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-01-30 17:42 bcm63xx_uart updates for 2.6.34 Maxime Bizon 2010-01-30 17:42 ` [PATCH 1/2] bcm63xx_uart: don't use kfree() on non kmalloced area Maxime Bizon 2010-01-30 17:42 ` [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered Maxime Bizon 2010-01-30 18:23 ` Wolfram Sang 2010-02-01 22:29 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox