Pull request for MIPS-specific driver bits
Below three patches for MIPS-specific drivers that I can't get anybody else interested in merging. To be accurate drivers/video/gbefb.c is shared with SGI's x86-based Visual Workstation which is more or less the same system architecture than the MIPS-based O2.
Please pull them from
git://ftp.linux-mips.org/pub/scm/upstream-linus.git upstream
This would be the last MIPS-related patches I have pending for 2.6.32.
Thanks,
Ralf
commit 3063ae66aa9024d92d613e41264b590838a56a92
Author: Maxime Bizon <[email protected]> Date: Wed Nov 4 14:11:15 2009 +0100
MIPS: BCM63xx: Fix serial driver compile breakage.
The driver missed an API change.
commit 6a830e0a79a530328fb24aca0dc1682db9e163e0
Author: Julia Lawall <[email protected]> Date: Sun Aug 9 11:42:32 2009 +0200
VIDEO: Correct use of request_region/request_mem_region
request_region should be used with release_region, not request_mem_region.
Geert Uytterhoeven pointed out that in the case of drivers/video/gbefb.c,
the problem is actually the other way around; request_mem_region should be
used instead of request_region.
The semantic patch that finds/fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r1@
expression start;
@@
request_region(start,...)
@b1@
expression r1.start;
@@
request_mem_region(start,...)
@depends on !b1@
expression r1.start;
expression E;
@@
- release_mem_region
+ release_region
(start,E)
// </smpl>
Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Ralf Baechle <[email protected]>commit 5a635a204e649d997b9f67c62d6e7d0e615d2619
Author: Atsushi Nemoto <[email protected]> Date: Thu Sep 3 22:59:01 2009 +0900
SPI: spi_txx9: Fix bit rate calculation
TXx9 SPI bit rate is calculated by:
fBR = (spi-baseclk) / (n + 1)
Fix calculation of min_speed_hz, max_speed_hz and n.
drivers/serial/bcm63xx_uart.c | 4 ++-- drivers/spi/spi_txx9.c | 13 ++++++------- drivers/video/gbefb.c | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-)
Quoted 4 lines · Ralf Baechle
Please pull them from
git://ftp.linux-mips.org/pub/scm/upstream-linus.gitupstream
There are no driver updates there. It looks like you overwrote that branch with your other MIPS build fixes that you had a separate pull request for.
Linus
Quoted 8 lines · Linus Torvalds
Quoted 4 lines · Ralf Baechle
Please pull them from
git://ftp.linux-mips.org/pub/scm/upstream-linus.gitupstreamThere are no driver updates there. It looks like you overwrote that branch with your other MIPS build fixes that you had a separate pull request for.
Correct - but that pull request was obsolete anyway as one of the driver patches had independentaly submitted to both me and gregkh and you pulled Greg's version yesterday.
I spun a new tree which again is at:
git://ftp.linux-mips.org/pub/scm/upstream-linus.git upstream
Please pull, thanks!
Ralf
commit 0fdd07f77fd9cc6a7d49076793daef06ea5d8f13
Author: Julia Lawall <[email protected]> Date: Sun Aug 9 11:42:32 2009 +0200
VIDEO: Correct use of request_region/request_mem_region
request_region should be used with release_region, not request_mem_region.
Geert Uytterhoeven pointed out that in the case of drivers/video/gbefb.c,
the problem is actually the other way around; request_mem_region should be
used instead of request_region.
The semantic patch that finds/fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r1@
expression start;
@@
request_region(start,...)
@b1@
expression r1.start;
@@
request_mem_region(start,...)
@depends on !b1@
expression r1.start;
expression E;
@@
- release_mem_region
+ release_region
(start,E)
// </smpl>
Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Ralf Baechle <[email protected]>commit dbf763a2f1c117cfe45bbbd2c874a150f0e0900b
Author: Atsushi Nemoto <[email protected]> Date: Thu Sep 3 22:59:01 2009 +0900
SPI: spi_txx9: Fix bit rate calculation
TXx9 SPI bit rate is calculated by:
fBR = (spi-baseclk) / (n + 1)
Fix calculation of min_speed_hz, max_speed_hz and n.
drivers/spi/spi_txx9.c | 13 ++++++------- drivers/video/gbefb.c | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-)