public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the omap tree with Linus' tree
@ 2009-10-30  0:46 Stephen Rothwell
  2009-10-30 14:45 ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-30  0:46 UTC (permalink / raw)
  To: Tony Lindgren, linux-omap
  Cc: linux-next, linux-kernel, Janusz Krzysztofik, Alexander Shishkin,
	Ladislav Michl

Hi all,

Today's linux-next merge of the omap tree got a conflict in
arch/arm/mach-omap1/serial.c between commit
c33da3a80074094303d643a90ef589330b491270 ("omap1: Fix redundant UARTs pin
muxing that can break other hardware support") from Linus' tree and
commits 84f90c9cc81d8db172d4f768fc4010f508897366 ("omap: Change low-level
serial init to use ioremap") and acb1aed4a5f23c545073b0d65302e5949f239fa0
("omap: Eliminate OMAP_MAX_NR_PORTS") from the omap tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap1/serial.c
index d23979b,f82f66e..0000000
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@@ -130,7 -120,17 +120,15 @@@ void __init omap_serial_init(void
  		serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
  	}
  
- 	for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
+ 	for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) {
 -		unsigned char reg;
 -
+ 		/* Static mapping, never released */
+ 		serial_platform_data[i].membase =
+ 			ioremap(serial_platform_data[i].mapbase, SZ_2K);
+ 		if (!serial_platform_data[i].membase) {
+ 			printk(KERN_ERR "Could not ioremap uart%i\n", i);
+ 			continue;
+ 		}
+ 
  		switch (i) {
  		case 0:
  			uart1_ck = clk_get(NULL, "uart1_ck");

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the omap tree with Linus' tree
@ 2009-10-30  0:46 Stephen Rothwell
  2009-10-30 14:46 ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-30  0:46 UTC (permalink / raw)
  To: Tony Lindgren, linux-omap; +Cc: linux-next, linux-kernel, Janusz Krzysztofik

Hi all,

Today's linux-next merge of the omap tree got conflicts in
arch/arm/mach-omap2/board-3430sdp.c, arch/arm/mach-omap2/board-ldp.c,
arch/arm/mach-omap2/board-omap3evm.c,
arch/arm/mach-omap2/board-omap3pandora.c,
arch/arm/mach-omap2/board-rx51-peripherals.c,
arch/arm/mach-omap2/board-rx51.c and arch/arm/mach-omap2/board-zoom2.c
between commit 6135434a54719c45fdc6add1ba4965dea89ab069 ("omap: Fix
omap-keypad by restoring old keypad.h without breaking omap2 boards that
use matrix_keypad") from Linus' tree and commit
ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move remaining
headers from include/mach to include/plat") from the omap tree.

I fixed them up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 0acb556,607845b..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -30,16 -29,17 +30,16 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
  
- #include <mach/control.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/control.h>
 -#include <plat/keypad.h>
+ #include <plat/gpmc-smc91x.h>
  
  #include "sdram-qimonda-hyb18m512160af-6.h"
  #include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-ldp.c
index d57ec2f,5c82560..0000000
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -33,15 -32,16 +33,15 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
+ #include <plat/mcspi.h>
  #include <mach/gpio.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/gpmc.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/gpmc.h>
  
  #include <asm/delay.h>
- #include <mach/control.h>
- #include <mach/usb.h>
+ #include <plat/control.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
  
  #include "mmc-twl4030.h"
  
diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 4c4d7f8,5d2310e..0000000
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -33,11 -34,12 +35,11 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/board.h>
- #include <mach/mux.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/mcspi.h>
+ #include <plat/board.h>
+ #include <plat/mux.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/mcspi.h>
 -#include <plat/keypad.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 5326e0d,d6bcfaa..0000000
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -34,13 -33,14 +34,13 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/board.h>
- #include <mach/common.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
  #include <mach/gpio.h>
  #include <mach/hardware.h>
- #include <mach/mcspi.h>
- #include <mach/usb.h>
- #include <mach/mux.h>
+ #include <plat/mcspi.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
+ #include <plat/mux.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e34d96a,9e16d90..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -22,14 -21,15 +22,14 @@@
  #include <linux/gpio.h>
  #include <linux/mmc/host.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/onenand.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
 -#include <plat/keypad.h>
+ #include <plat/onenand.h>
+ #include <plat/gpmc-smc91x.h>
  
  #include "mmc-twl4030.h"
  
diff --cc arch/arm/mach-omap2/board-rx51.c
index 78869a9,060245e..0000000
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -22,13 -22,14 +22,13 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/usb.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
 -#include <plat/keypad.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
+ #include <plat/usb.h>
  
  static struct omap_lcd_config rx51_lcd_config = {
  	.ctrl_name	= "internal",
diff --cc arch/arm/mach-omap2/board-zoom2.c
index ea00486,56f9d84..0000000
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -21,8 -20,9 +21,8 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  
- #include <mach/common.h>
- #include <mach/usb.h>
+ #include <plat/common.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
  
  #include "mmc-twl4030.h"
  #include "sdram-micron-mt46h32m32lf-6.h"

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the omap tree with Linus' tree
  2009-10-30  0:46 linux-next: manual merge of the omap tree with Linus' tree Stephen Rothwell
@ 2009-10-30 14:45 ` Tony Lindgren
  2009-10-31  4:30   ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-10-30 14:45 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik,
	Alexander Shishkin, Ladislav Michl

* Stephen Rothwell <sfr@canb.auug.org.au> [091029 17:46]:
> Hi all,
> 
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap1/serial.c between commit
> c33da3a80074094303d643a90ef589330b491270 ("omap1: Fix redundant UARTs pin
> muxing that can break other hardware support") from Linus' tree and
> commits 84f90c9cc81d8db172d4f768fc4010f508897366 ("omap: Change low-level
> serial init to use ioremap") and acb1aed4a5f23c545073b0d65302e5949f239fa0
> ("omap: Eliminate OMAP_MAX_NR_PORTS") from the omap tree.
> 
> I fixed it up (see below) and can carry the fix for a while.

Thanks, will rebase omap for-next patches today.

Regards,

Tony

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-omap1/serial.c
> index d23979b,f82f66e..0000000
> --- a/arch/arm/mach-omap1/serial.c
> +++ b/arch/arm/mach-omap1/serial.c
> @@@ -130,7 -120,17 +120,15 @@@ void __init omap_serial_init(void
>   		serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
>   	}
>   
> - 	for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
> + 	for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) {
>  -		unsigned char reg;
>  -
> + 		/* Static mapping, never released */
> + 		serial_platform_data[i].membase =
> + 			ioremap(serial_platform_data[i].mapbase, SZ_2K);
> + 		if (!serial_platform_data[i].membase) {
> + 			printk(KERN_ERR "Could not ioremap uart%i\n", i);
> + 			continue;
> + 		}
> + 
>   		switch (i) {
>   		case 0:
>   			uart1_ck = clk_get(NULL, "uart1_ck");

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the omap tree with Linus' tree
  2009-10-30  0:46 Stephen Rothwell
@ 2009-10-30 14:46 ` Tony Lindgren
  2009-10-31  4:31   ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-10-30 14:46 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik

* Stephen Rothwell <sfr@canb.auug.org.au> [091029 17:46]:
> Hi all,
> 
> Today's linux-next merge of the omap tree got conflicts in
> arch/arm/mach-omap2/board-3430sdp.c, arch/arm/mach-omap2/board-ldp.c,
> arch/arm/mach-omap2/board-omap3evm.c,
> arch/arm/mach-omap2/board-omap3pandora.c,
> arch/arm/mach-omap2/board-rx51-peripherals.c,
> arch/arm/mach-omap2/board-rx51.c and arch/arm/mach-omap2/board-zoom2.c
> between commit 6135434a54719c45fdc6add1ba4965dea89ab069 ("omap: Fix
> omap-keypad by restoring old keypad.h without breaking omap2 boards that
> use matrix_keypad") from Linus' tree and commit
> ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move remaining
> headers from include/mach to include/plat") from the omap tree.
> 
> I fixed them up (see below) and can carry the fix for a while.

Thanks, will clear this too today.

Tony

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-omap2/board-3430sdp.c
> index 0acb556,607845b..0000000
> --- a/arch/arm/mach-omap2/board-3430sdp.c
> +++ b/arch/arm/mach-omap2/board-3430sdp.c
> @@@ -30,16 -29,17 +30,16 @@@
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>
>   
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/usb.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/usb.h>
> + #include <plat/common.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
>   
> - #include <mach/control.h>
> - #include <mach/gpmc-smc91x.h>
> + #include <plat/control.h>
>  -#include <plat/keypad.h>
> + #include <plat/gpmc-smc91x.h>
>   
>   #include "sdram-qimonda-hyb18m512160af-6.h"
>   #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-ldp.c
> index d57ec2f,5c82560..0000000
> --- a/arch/arm/mach-omap2/board-ldp.c
> +++ b/arch/arm/mach-omap2/board-ldp.c
> @@@ -33,15 -32,16 +33,15 @@@
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>
>   
> - #include <mach/mcspi.h>
> + #include <plat/mcspi.h>
>   #include <mach/gpio.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/gpmc.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> + #include <plat/gpmc.h>
>   
>   #include <asm/delay.h>
> - #include <mach/control.h>
> - #include <mach/usb.h>
> + #include <plat/control.h>
> + #include <plat/usb.h>
>  -#include <plat/keypad.h>
>   
>   #include "mmc-twl4030.h"
>   
> diff --cc arch/arm/mach-omap2/board-omap3evm.c
> index 4c4d7f8,5d2310e..0000000
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@@ -33,11 -34,12 +35,11 @@@
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>
>   
> - #include <mach/board.h>
> - #include <mach/mux.h>
> - #include <mach/usb.h>
> - #include <mach/common.h>
> - #include <mach/mcspi.h>
> + #include <plat/board.h>
> + #include <plat/mux.h>
> + #include <plat/usb.h>
> + #include <plat/common.h>
> + #include <plat/mcspi.h>
>  -#include <plat/keypad.h>
>   
>   #include "sdram-micron-mt46h32m32lf-6.h"
>   #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-omap3pandora.c
> index 5326e0d,d6bcfaa..0000000
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@@ -34,13 -33,14 +34,13 @@@
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>
>   
> - #include <mach/board.h>
> - #include <mach/common.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
>   #include <mach/gpio.h>
>   #include <mach/hardware.h>
> - #include <mach/mcspi.h>
> - #include <mach/usb.h>
> - #include <mach/mux.h>
> + #include <plat/mcspi.h>
> + #include <plat/usb.h>
>  -#include <plat/keypad.h>
> + #include <plat/mux.h>
>   
>   #include "sdram-micron-mt46h32m32lf-6.h"
>   #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
> index e34d96a,9e16d90..0000000
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@@ -22,14 -21,15 +22,14 @@@
>   #include <linux/gpio.h>
>   #include <linux/mmc/host.h>
>   
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> - #include <mach/onenand.h>
> - #include <mach/gpmc-smc91x.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
>  -#include <plat/keypad.h>
> + #include <plat/onenand.h>
> + #include <plat/gpmc-smc91x.h>
>   
>   #include "mmc-twl4030.h"
>   
> diff --cc arch/arm/mach-omap2/board-rx51.c
> index 78869a9,060245e..0000000
> --- a/arch/arm/mach-omap2/board-rx51.c
> +++ b/arch/arm/mach-omap2/board-rx51.c
> @@@ -22,13 -22,14 +22,13 @@@
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>
>   
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> - #include <mach/usb.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
>  -#include <plat/keypad.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
> + #include <plat/usb.h>
>   
>   static struct omap_lcd_config rx51_lcd_config = {
>   	.ctrl_name	= "internal",
> diff --cc arch/arm/mach-omap2/board-zoom2.c
> index ea00486,56f9d84..0000000
> --- a/arch/arm/mach-omap2/board-zoom2.c
> +++ b/arch/arm/mach-omap2/board-zoom2.c
> @@@ -21,8 -20,9 +21,8 @@@
>   #include <asm/mach-types.h>
>   #include <asm/mach/arch.h>
>   
> - #include <mach/common.h>
> - #include <mach/usb.h>
> + #include <plat/common.h>
> + #include <plat/usb.h>
>  -#include <plat/keypad.h>
>   
>   #include "mmc-twl4030.h"
>   #include "sdram-micron-mt46h32m32lf-6.h"

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the omap tree with Linus' tree
  2009-10-30 14:45 ` Tony Lindgren
@ 2009-10-31  4:30   ` Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-31  4:30 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik,
	Alexander Shishkin, Ladislav Michl

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, will rebase omap for-next patches today.

Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...

But thanks either way.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the omap tree with Linus' tree
  2009-10-30 14:46 ` Tony Lindgren
@ 2009-10-31  4:31   ` Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-31  4:31 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Hi Tony,

On Fri, 30 Oct 2009 07:46:04 -0700 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, will clear this too today.

OK, thanks.

[Please don't quote unnecessary parts of the emails that you respond to]

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-31  4:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-30  0:46 linux-next: manual merge of the omap tree with Linus' tree Stephen Rothwell
2009-10-30 14:45 ` Tony Lindgren
2009-10-31  4:30   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2009-10-30  0:46 Stephen Rothwell
2009-10-30 14:46 ` Tony Lindgren
2009-10-31  4:31   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox