* linux-next: manual merge of the omap tree with the arm tree
@ 2010-02-04 23:20 Stephen Rothwell
2010-02-04 23:30 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2010-02-04 23:20 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-next, linux-kernel, Russell King
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/mach-omap1/include/mach/debug-macro.S
arch/arm/mach-omap2/include/mach/debug-macro.S between commit
7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree and commit 209f5d2d2c8e385834d138ac593df86504a28ffe ("omap: Make
uncompress code and DEBUG_LL code generic") from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/include/mach/debug-macro.S
index 8c74cab,0187391..0000000
--- a/arch/arm/mach-omap1/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap1/include/mach/debug-macro.S
@@@ -11,7 -11,43 +11,43 @@@
*
*/
+ #include <linux/serial_reg.h>
+
+ #include <plat/serial.h>
+
+ .pushsection .data
+ omap_uart_phys: .word 0x0
+ omap_uart_virt: .word 0x0
+ .popsection
+
+ /*
+ * Note that this code won't work if the bootloader passes
+ * a wrong machine ID number in r1. To debug, just hardcode
+ * the desired UART phys and virt addresses temporarily into
+ * the omap_uart_phys and omap_uart_virt above.
+ */
- .macro addruart,rx
+ .macro addruart, rx, tmp
+
+ /* Use omap_uart_phys/virt if already configured */
+ 9: mrc p15, 0, \rx, c1, c0
+ tst \rx, #1 @ MMU enabled?
+ ldreq \rx, =omap_uart_phys @ physical base address
+ ldrne \rx, =omap_uart_virt @ virtual base
+ ldr \rx, [\rx, #0]
+ cmp \rx, #0 @ is port configured?
+ bne 99f @ already configured
+
+ /* Check 7XX UART1 scratchpad register for uart to use */
+ mrc p15, 0, \rx, c1, c0
+ tst \rx, #1 @ MMU enabled?
+ moveq \rx, #0xff000000 @ physical base address
+ movne \rx, #0xfe000000 @ virtual base
+ orr \rx, \rx, #0x00fb0000 @ OMAP1UART1
+ ldrb \rx, [\rx, #(UART_SCR << OMAP7XX_PORT_SHIFT)]
+ cmp \rx, #0 @ anything in 7XX scratchpad?
+ bne 10f @ found 7XX uart
+
+ /* Check 15xx/16xx UART1 scratchpad register for uart to use */
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0xff000000 @ physical base address
diff --cc arch/arm/mach-omap2/include/mach/debug-macro.S
index 86979d7,eb05a22..0000000
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@@ -11,32 -11,107 +11,107 @@@
*
*/
+ #include <linux/serial_reg.h>
+
+ #include <plat/serial.h>
+
+ #define UART_OFFSET(addr) ((addr) & 0x00ffffff)
+
+ .pushsection .data
+ omap_uart_phys: .word 0
+ omap_uart_virt: .word 0
+ omap_uart_lsr: .word 0
+ .popsection
+
+ /*
+ * Note that this code won't work if the bootloader passes
+ * a wrong machine ID number in r1. To debug, just hardcode
+ * the desired UART phys and virt addresses temporarily into
+ * the omap_uart_phys and omap_uart_virt above.
+ */
- .macro addruart,rx
+ .macro addruart, rx, tmp
+
+ /* Use omap_uart_phys/virt if already configured */
+ 10: mrc p15, 0, \rx, c1, c0
+ tst \rx, #1 @ MMU enabled?
+ ldreq \rx, =omap_uart_phys @ physical base address
+ ldrne \rx, =omap_uart_virt @ virtual base address
+ ldr \rx, [\rx, #0]
+ cmp \rx, #0 @ is port configured?
+ bne 99f @ already configured
+
+ /* Check UART1 scratchpad register for uart to use */
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
- #ifdef CONFIG_ARCH_OMAP2
moveq \rx, #0x48000000 @ physical base address
movne \rx, #0xfa000000 @ virtual base
- orr \rx, \rx, #0x0006a000
- #ifdef CONFIG_OMAP_LL_DEBUG_UART2
- add \rx, \rx, #0x00002000 @ UART 2
- #endif
- #ifdef CONFIG_OMAP_LL_DEBUG_UART3
- add \rx, \rx, #0x00004000 @ UART 3
- #endif
-
- #elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
- moveq \rx, #0x48000000 @ physical base address
- movne \rx, #0xfa000000 @ virtual base
- orr \rx, \rx, #0x0006a000
- #ifdef CONFIG_OMAP_LL_DEBUG_UART2
- add \rx, \rx, #0x00002000 @ UART 2
- #endif
- #ifdef CONFIG_OMAP_LL_DEBUG_UART3
- add \rx, \rx, #0x00fb0000 @ UART 3
- add \rx, \rx, #0x00006000
- #endif
- #endif
+ orr \rx, \rx, #0x0006a000 @ uart1 on omap2/3/4
+ ldrb \rx, [\rx, #(UART_SCR << OMAP_PORT_SHIFT)] @ scratchpad
+
+ /* Select the UART to use based on the UART1 scratchpad value */
+ cmp \rx, #0 @ no port configured?
+ beq 21f @ if none, try to use UART1
+ cmp \rx, #OMAP2UART1 @ OMAP2/3/4UART1
+ beq 21f @ configure OMAP2/3/4UART1
+ cmp \rx, #OMAP2UART2 @ OMAP2/3/4UART2
+ beq 22f @ configure OMAP2/3/4UART2
+ cmp \rx, #OMAP2UART3 @ only on 24xx
+ beq 23f @ configure OMAP2UART3
+ cmp \rx, #OMAP3UART3 @ only on 34xx
+ beq 33f @ configure OMAP3UART3
+ cmp \rx, #OMAP4UART3 @ only on 44xx
+ beq 43f @ configure OMAP4UART3
+ cmp \rx, #OMAP3UART4 @ only on 36xx
+ beq 34f @ configure OMAP3UART4
+ cmp \rx, #OMAP4UART4 @ only on 44xx
+ beq 44f @ configure OMAP4UART4
+ cmp \rx, #ZOOM_UART @ only on zoom2/3
+ beq 95f @ configure ZOOM_UART
+
+ /* Configure the UART offset from the phys/virt base */
+ 21: mov \rx, #UART_OFFSET(OMAP2_UART1_BASE) @ omap2/3/4
+ b 98f
+ 22: mov \rx, #UART_OFFSET(OMAP2_UART2_BASE) @ omap2/3/4
+ b 98f
+ 23: mov \rx, #UART_OFFSET(OMAP2_UART3_BASE)
+ b 98f
+ 33: mov \rx, #UART_OFFSET(OMAP3_UART1_BASE)
+ add \rx, \rx, #0x00fb0000
+ add \rx, \rx, #0x00006000 @ OMAP3_UART3_BASE
+ b 98f
+ 34: mov \rx, #UART_OFFSET(OMAP3_UART1_BASE)
+ add \rx, \rx, #0x00fb0000
+ add \rx, \rx, #0x00028000 @ OMAP3_UART4_BASE
+ b 98f
+ 43: mov \rx, #UART_OFFSET(OMAP4_UART3_BASE)
+ b 98f
+ 44: mov \rx, #UART_OFFSET(OMAP4_UART4_BASE)
+ b 98f
+ 95: mov \rx, #ZOOM_UART_BASE
+ ldr r1, =omap_uart_phys
+ str \rx, [r1, #0]
+ mov \rx, #ZOOM_UART_VIRT
+ ldr r1, =omap_uart_virt
+ str \rx, [r1, #0]
+ mov \rx, #(UART_LSR << ZOOM_PORT_SHIFT)
+ ldr r1, =omap_uart_lsr
+ str \rx, [r1, #0]
+ b 10b
+
+ /* Store both phys and virt address for the uart */
+ 98: add \rx, \rx, #0x48000000 @ phys base
+ ldr r1, =omap_uart_phys
+ str \rx, [r1, #0]
+ sub \rx, \rx, #0x48000000 @ phys base
+ add \rx, \rx, #0xfa000000 @ virt base
+ ldr r1, =omap_uart_virt
+ str \rx, [r1, #0]
+ mov \rx, #(UART_LSR << OMAP_PORT_SHIFT)
+ ldr r1, =omap_uart_lsr
+ str \rx, [r1, #0]
+
+ b 10b
+ 99:
.endm
.macro senduart,rd,rx
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2010-02-04 23:20 linux-next: manual merge of the omap tree with the arm tree Stephen Rothwell
@ 2010-02-04 23:30 ` Tony Lindgren
2010-02-05 0:16 ` Stephen Rothwell
0 siblings, 1 reply; 24+ messages in thread
From: Tony Lindgren @ 2010-02-04 23:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-omap, linux-next, linux-kernel, Russell King
* Stephen Rothwell <sfr@canb.auug.org.au> [100204 15:17]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap1/include/mach/debug-macro.S
> arch/arm/mach-omap2/include/mach/debug-macro.S between commit
> 7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit 209f5d2d2c8e385834d138ac593df86504a28ffe ("omap: Make
> uncompress code and DEBUG_LL code generic") from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I'll sort it out in omap for-next tree so they merge
cleanly.
Tony
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap1/include/mach/debug-macro.S
> index 8c74cab,0187391..0000000
> --- a/arch/arm/mach-omap1/include/mach/debug-macro.S
> +++ b/arch/arm/mach-omap1/include/mach/debug-macro.S
> @@@ -11,7 -11,43 +11,43 @@@
> *
> */
>
> + #include <linux/serial_reg.h>
> +
> + #include <plat/serial.h>
> +
> + .pushsection .data
> + omap_uart_phys: .word 0x0
> + omap_uart_virt: .word 0x0
> + .popsection
> +
> + /*
> + * Note that this code won't work if the bootloader passes
> + * a wrong machine ID number in r1. To debug, just hardcode
> + * the desired UART phys and virt addresses temporarily into
> + * the omap_uart_phys and omap_uart_virt above.
> + */
> - .macro addruart,rx
> + .macro addruart, rx, tmp
> +
> + /* Use omap_uart_phys/virt if already configured */
> + 9: mrc p15, 0, \rx, c1, c0
> + tst \rx, #1 @ MMU enabled?
> + ldreq \rx, =omap_uart_phys @ physical base address
> + ldrne \rx, =omap_uart_virt @ virtual base
> + ldr \rx, [\rx, #0]
> + cmp \rx, #0 @ is port configured?
> + bne 99f @ already configured
> +
> + /* Check 7XX UART1 scratchpad register for uart to use */
> + mrc p15, 0, \rx, c1, c0
> + tst \rx, #1 @ MMU enabled?
> + moveq \rx, #0xff000000 @ physical base address
> + movne \rx, #0xfe000000 @ virtual base
> + orr \rx, \rx, #0x00fb0000 @ OMAP1UART1
> + ldrb \rx, [\rx, #(UART_SCR << OMAP7XX_PORT_SHIFT)]
> + cmp \rx, #0 @ anything in 7XX scratchpad?
> + bne 10f @ found 7XX uart
> +
> + /* Check 15xx/16xx UART1 scratchpad register for uart to use */
> mrc p15, 0, \rx, c1, c0
> tst \rx, #1 @ MMU enabled?
> moveq \rx, #0xff000000 @ physical base address
> diff --cc arch/arm/mach-omap2/include/mach/debug-macro.S
> index 86979d7,eb05a22..0000000
> --- a/arch/arm/mach-omap2/include/mach/debug-macro.S
> +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
> @@@ -11,32 -11,107 +11,107 @@@
> *
> */
>
> + #include <linux/serial_reg.h>
> +
> + #include <plat/serial.h>
> +
> + #define UART_OFFSET(addr) ((addr) & 0x00ffffff)
> +
> + .pushsection .data
> + omap_uart_phys: .word 0
> + omap_uart_virt: .word 0
> + omap_uart_lsr: .word 0
> + .popsection
> +
> + /*
> + * Note that this code won't work if the bootloader passes
> + * a wrong machine ID number in r1. To debug, just hardcode
> + * the desired UART phys and virt addresses temporarily into
> + * the omap_uart_phys and omap_uart_virt above.
> + */
> - .macro addruart,rx
> + .macro addruart, rx, tmp
> +
> + /* Use omap_uart_phys/virt if already configured */
> + 10: mrc p15, 0, \rx, c1, c0
> + tst \rx, #1 @ MMU enabled?
> + ldreq \rx, =omap_uart_phys @ physical base address
> + ldrne \rx, =omap_uart_virt @ virtual base address
> + ldr \rx, [\rx, #0]
> + cmp \rx, #0 @ is port configured?
> + bne 99f @ already configured
> +
> + /* Check UART1 scratchpad register for uart to use */
> mrc p15, 0, \rx, c1, c0
> tst \rx, #1 @ MMU enabled?
> - #ifdef CONFIG_ARCH_OMAP2
> moveq \rx, #0x48000000 @ physical base address
> movne \rx, #0xfa000000 @ virtual base
> - orr \rx, \rx, #0x0006a000
> - #ifdef CONFIG_OMAP_LL_DEBUG_UART2
> - add \rx, \rx, #0x00002000 @ UART 2
> - #endif
> - #ifdef CONFIG_OMAP_LL_DEBUG_UART3
> - add \rx, \rx, #0x00004000 @ UART 3
> - #endif
> -
> - #elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> - moveq \rx, #0x48000000 @ physical base address
> - movne \rx, #0xfa000000 @ virtual base
> - orr \rx, \rx, #0x0006a000
> - #ifdef CONFIG_OMAP_LL_DEBUG_UART2
> - add \rx, \rx, #0x00002000 @ UART 2
> - #endif
> - #ifdef CONFIG_OMAP_LL_DEBUG_UART3
> - add \rx, \rx, #0x00fb0000 @ UART 3
> - add \rx, \rx, #0x00006000
> - #endif
> - #endif
> + orr \rx, \rx, #0x0006a000 @ uart1 on omap2/3/4
> + ldrb \rx, [\rx, #(UART_SCR << OMAP_PORT_SHIFT)] @ scratchpad
> +
> + /* Select the UART to use based on the UART1 scratchpad value */
> + cmp \rx, #0 @ no port configured?
> + beq 21f @ if none, try to use UART1
> + cmp \rx, #OMAP2UART1 @ OMAP2/3/4UART1
> + beq 21f @ configure OMAP2/3/4UART1
> + cmp \rx, #OMAP2UART2 @ OMAP2/3/4UART2
> + beq 22f @ configure OMAP2/3/4UART2
> + cmp \rx, #OMAP2UART3 @ only on 24xx
> + beq 23f @ configure OMAP2UART3
> + cmp \rx, #OMAP3UART3 @ only on 34xx
> + beq 33f @ configure OMAP3UART3
> + cmp \rx, #OMAP4UART3 @ only on 44xx
> + beq 43f @ configure OMAP4UART3
> + cmp \rx, #OMAP3UART4 @ only on 36xx
> + beq 34f @ configure OMAP3UART4
> + cmp \rx, #OMAP4UART4 @ only on 44xx
> + beq 44f @ configure OMAP4UART4
> + cmp \rx, #ZOOM_UART @ only on zoom2/3
> + beq 95f @ configure ZOOM_UART
> +
> + /* Configure the UART offset from the phys/virt base */
> + 21: mov \rx, #UART_OFFSET(OMAP2_UART1_BASE) @ omap2/3/4
> + b 98f
> + 22: mov \rx, #UART_OFFSET(OMAP2_UART2_BASE) @ omap2/3/4
> + b 98f
> + 23: mov \rx, #UART_OFFSET(OMAP2_UART3_BASE)
> + b 98f
> + 33: mov \rx, #UART_OFFSET(OMAP3_UART1_BASE)
> + add \rx, \rx, #0x00fb0000
> + add \rx, \rx, #0x00006000 @ OMAP3_UART3_BASE
> + b 98f
> + 34: mov \rx, #UART_OFFSET(OMAP3_UART1_BASE)
> + add \rx, \rx, #0x00fb0000
> + add \rx, \rx, #0x00028000 @ OMAP3_UART4_BASE
> + b 98f
> + 43: mov \rx, #UART_OFFSET(OMAP4_UART3_BASE)
> + b 98f
> + 44: mov \rx, #UART_OFFSET(OMAP4_UART4_BASE)
> + b 98f
> + 95: mov \rx, #ZOOM_UART_BASE
> + ldr r1, =omap_uart_phys
> + str \rx, [r1, #0]
> + mov \rx, #ZOOM_UART_VIRT
> + ldr r1, =omap_uart_virt
> + str \rx, [r1, #0]
> + mov \rx, #(UART_LSR << ZOOM_PORT_SHIFT)
> + ldr r1, =omap_uart_lsr
> + str \rx, [r1, #0]
> + b 10b
> +
> + /* Store both phys and virt address for the uart */
> + 98: add \rx, \rx, #0x48000000 @ phys base
> + ldr r1, =omap_uart_phys
> + str \rx, [r1, #0]
> + sub \rx, \rx, #0x48000000 @ phys base
> + add \rx, \rx, #0xfa000000 @ virt base
> + ldr r1, =omap_uart_virt
> + str \rx, [r1, #0]
> + mov \rx, #(UART_LSR << OMAP_PORT_SHIFT)
> + ldr r1, =omap_uart_lsr
> + str \rx, [r1, #0]
> +
> + b 10b
> + 99:
> .endm
>
> .macro senduart,rd,rx
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2010-02-04 23:30 ` Tony Lindgren
@ 2010-02-05 0:16 ` Stephen Rothwell
2010-02-05 4:04 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2010-02-05 0:16 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap, linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
Hi Tony,
On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, I'll sort it out in omap for-next tree so they merge
> cleanly.
Thanks
--
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] 24+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm tree
2010-02-05 0:16 ` Stephen Rothwell
@ 2010-02-05 4:04 ` Tony Lindgren
2010-02-15 15:03 ` Russell King
0 siblings, 1 reply; 24+ messages in thread
From: Tony Lindgren @ 2010-02-05 4:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-omap, linux-next, linux-kernel, Russell King
* Stephen Rothwell <sfr@canb.auug.org.au> [100204 16:13]:
> Hi Tony,
>
> On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren <tony@atomide.com> wrote:
> >
> > Thanks, I'll sort it out in omap for-next tree so they merge
> > cleanly.
Tried figuring out a clean mergeable solution, but it looks like
I need to manually merge or rebase the omap patches with patch
"ARM: 5910/1: ARM: Add tmp register for addruart and loadsp".
If we move the related debug-macro.S changes from omap tree to
Russell's tree, then I can't build my following multi-omap
patches..
Russell, can you please let me know if you have some static
commit ID containing the patch above that I could use that as
base for my patches?
Regards,
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm tree
2010-02-05 4:04 ` Tony Lindgren
@ 2010-02-15 15:03 ` Russell King
2010-02-17 19:33 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Russell King @ 2010-02-15 15:03 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Stephen Rothwell, linux-omap, linux-next, linux-kernel
On Thu, Feb 04, 2010 at 08:04:44PM -0800, Tony Lindgren wrote:
> Russell, can you please let me know if you have some static
> commit ID containing the patch above that I could use that as
> base for my patches?
Right, when it eventually gets through linux-next, 4e6d488
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm tree
2010-02-15 15:03 ` Russell King
@ 2010-02-17 19:33 ` Tony Lindgren
0 siblings, 0 replies; 24+ messages in thread
From: Tony Lindgren @ 2010-02-17 19:33 UTC (permalink / raw)
To: Russell King; +Cc: Stephen Rothwell, linux-omap, linux-next, linux-kernel
* Russell King <rmk+lkml@arm.linux.org.uk> [100215 07:00]:
> On Thu, Feb 04, 2010 at 08:04:44PM -0800, Tony Lindgren wrote:
> > Russell, can you please let me know if you have some static
> > commit ID containing the patch above that I could use that as
> > base for my patches?
>
> Right, when it eventually gets through linux-next, 4e6d488
Thanks, I have updated omap for-next based on that.
Regards,
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* linux-next: manual merge of the omap tree with the arm tree
@ 2010-12-26 22:41 Stephen Rothwell
0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2010-12-26 22:41 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Jean-Christop PLAGNIOL-VILLARD,
Russell King, Ben Gamari
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/plat-omap/Kconfig between commit
6d803ba736abb5e122dede70a4720e4843dd6df4 ("ARM: 6483/1: arm & sh:
factorised duplicated clkdev.c") from the arm tree and commit
dc69d1af9e8d9cbbabff88bb35a6782187a22229 ("omap2: Make OMAP2PLUS select
OMAP_DM_TIMER") from the omap tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/Kconfig
index c940843,bc0c7aa..0000000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -17,7 -17,8 +17,8 @@@ config ARCH_OMAP
config ARCH_OMAP2PLUS
bool "TI OMAP2/3/4"
- select COMMON_CLKDEV
+ select CLKDEV_LOOKUP
+ select OMAP_DM_TIMER
help
"Systems based on OMAP2, OMAP3 or OMAP4"
^ permalink raw reply [flat|nested] 24+ messages in thread* linux-next: manual merge of the omap tree with the arm tree
@ 2010-07-08 1:37 Stephen Rothwell
2010-07-08 10:14 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2010-07-08 1:37 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Russell King, Mike Rapoport
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-3630sdp.c,
arch/arm/mach-omap2/board-am3517evm.c,
arch/arm/mach-omap2/board-cm-t35.c,
arch/arm/mach-omap2/board-devkit8000.c,
arch/arm/mach-omap2/board-igep0020.c,
arch/arm/mach-omap2/board-ldp.c,
arch/arm/mach-omap2/board-omap3beagle.c,
arch/arm/mach-omap2/board-omap3evm.c,
arch/arm/mach-omap2/board-omap3pandora.c,
arch/arm/mach-omap2/board-omap3touchbook.c,
arch/arm/mach-omap2/board-overo.c,
arch/arm/mach-omap2/board-zoom2.c and
arch/arm/mach-omap2/board-zoom3.c
between commit 1e6d923b4e5729b73518d241edf87a3ab2d5688c ("ARM: OMAP:
Convert to use ->reserve method to reserve boot time memory") from the
arm tree and commit c752ab9d5a5b6899f14fe1c6643c0fe0b499a4ba ("omap3:
introduce omap3_map_io") from the omap tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
P.S. Tony, that omap tree commit has a fairly unuseful changelog and no
SOB from its purported author ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-3430sdp.c
index dd9c031,e51f8e3..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -814,8 -808,7 +808,8 @@@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_3430sdp_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_3430sdp_init_irq,
.init_machine = omap_3430sdp_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-3630sdp.c
index 57290fb,8b7c2f9..0000000
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@@ -107,8 -100,7 +100,8 @@@ MACHINE_START(OMAP_3630SDP, "OMAP 3630S
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_sdp_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_sdp_init_irq,
.init_machine = omap_sdp_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-am3517evm.c
index 7da92de,bbfdc6e..0000000
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -471,8 -465,7 +465,8 @@@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = am3517_evm_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = am3517_evm_init_irq,
.init_machine = am3517_evm_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-cm-t35.c
index bc4c3f8,79d6b15..0000000
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@@ -836,8 -830,7 +830,8 @@@ MACHINE_START(CM_T35, "Compulab CM-T35"
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = cm_t35_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = cm_t35_init_irq,
.init_machine = cm_t35_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-devkit8000.c
index 922b746,4b7103a..0000000
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@@ -824,8 -826,7 +826,8 @@@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = devkit8000_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = devkit8000_init_irq,
.init_machine = devkit8000_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-igep0020.c
index 759e39d,b26319c..0000000
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@@ -542,8 -536,7 +536,8 @@@ MACHINE_START(IGEP0020, "IGEP v2 board"
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = igep2_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = igep2_init_irq,
.init_machine = igep2_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-ldp.c
index 9cd2669,6e3930e..0000000
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -416,8 -410,7 +410,8 @@@ MACHINE_START(OMAP_LDP, "OMAP LDP board
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_ldp_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_ldp_init_irq,
.init_machine = omap_ldp_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 0ab0c26,64aa557..0000000
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -518,8 -512,7 +512,8 @@@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beag
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap3_beagle_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap3_beagle_init_irq,
.init_machine = omap3_beagle_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-omap3evm.c
index a3d2e28,6cde29d..0000000
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -726,8 -720,7 +720,8 @@@ MACHINE_START(OMAP3EVM, "OMAP3 EVM"
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap3_evm_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap3_evm_init_irq,
.init_machine = omap3_evm_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index c0f4f12,f3b7a8a..0000000
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -600,8 -704,7 +704,8 @@@ MACHINE_START(OMAP3_PANDORA, "Pandora H
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap3pandora_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap3pandora_init_irq,
.init_machine = omap3pandora_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
index f05b867,820eaf1..0000000
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@@ -570,8 -564,7 +564,8 @@@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbo
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap3_touchbook_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap3_touchbook_init_irq,
.init_machine = omap3_touchbook_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-overo.c
index 87acb2f,b6bc315..0000000
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -494,8 -526,7 +526,8 @@@ MACHINE_START(OVERO, "Gumstix Overo"
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = overo_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = overo_init_irq,
.init_machine = overo_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-zoom2.c
index ffe188c,bbc7826..0000000
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -94,8 -103,7 +103,8 @@@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 b
.phys_io = ZOOM_UART_BASE,
.io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_zoom2_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_zoom2_init_irq,
.init_machine = omap_zoom2_init,
.timer = &omap_timer,
diff --cc arch/arm/mach-omap2/board-zoom3.c
index 5b605eb,0c6858b..0000000
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom3.c
@@@ -76,8 -85,7 +85,8 @@@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 b
.phys_io = ZOOM_UART_BASE,
.io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_zoom_map_io,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_zoom_init_irq,
.init_machine = omap_zoom_init,
.timer = &omap_timer,
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2010-07-08 1:37 Stephen Rothwell
@ 2010-07-08 10:14 ` Tony Lindgren
0 siblings, 0 replies; 24+ messages in thread
From: Tony Lindgren @ 2010-07-08 10:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Russell King, Mike Rapoport
* Stephen Rothwell <sfr@canb.auug.org.au> [100708 04:31]:
> 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-3630sdp.c,
> arch/arm/mach-omap2/board-am3517evm.c,
> arch/arm/mach-omap2/board-cm-t35.c,
> arch/arm/mach-omap2/board-devkit8000.c,
> arch/arm/mach-omap2/board-igep0020.c,
> arch/arm/mach-omap2/board-ldp.c,
> arch/arm/mach-omap2/board-omap3beagle.c,
> arch/arm/mach-omap2/board-omap3evm.c,
> arch/arm/mach-omap2/board-omap3pandora.c,
> arch/arm/mach-omap2/board-omap3touchbook.c,
> arch/arm/mach-omap2/board-overo.c,
> arch/arm/mach-omap2/board-zoom2.c and
> arch/arm/mach-omap2/board-zoom3.c
> between commit 1e6d923b4e5729b73518d241edf87a3ab2d5688c ("ARM: OMAP:
> Convert to use ->reserve method to reserve boot time memory") from the
> arm tree and commit c752ab9d5a5b6899f14fe1c6643c0fe0b499a4ba ("omap3:
> introduce omap3_map_io") from the omap tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, I'll merge with Russell's lmb branch when I
have confirmation that it will stay static.
> P.S. Tony, that omap tree commit has a fairly unuseful changelog and no
> SOB from its purported author ...
Oops, I'll check that.
Regards,
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* linux-next: manual merge of the omap tree with the arm tree
@ 2010-07-04 23:20 Stephen Rothwell
2010-07-05 1:46 ` Nicolas Pitre
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2010-07-04 23:20 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/kernel/entry-armv.S between commit
df0698be14c6683606d5df2d83e3ae40f85ed0d9 ("ARM: stack protector: change
the canary value per task") from the arm tree and commit
4481d0c7d25c9de9a3986c8b4c52389ca8bbf929 ("arm: Replace
CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6") from the omap
tree.
Just context changes (I think). I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/kernel/entry-armv.S
index 2d14081,a6cfb17..0000000
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@@ -739,17 -740,7 +740,12 @@@ ENTRY(__switch_to
#ifdef CONFIG_MMU
ldr r6, [r2, #TI_CPU_DOMAIN]
#endif
- #if defined(CONFIG_HAS_TLS_REG)
- mcr p15, 0, r3, c13, c0, 3 @ set TLS register
- #elif !defined(CONFIG_TLS_REG_EMUL)
- mov r4, #0xffff0fff
- str r3, [r4, #-15] @ TLS val at 0xffff0ff0
- #endif
+ set_tls r3, r4, r5
+#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
+ ldr r7, [r2, #TI_TASK]
+ ldr r8, =__stack_chk_guard
+ ldr r7, [r7, #TSK_STACK_CANARY]
+#endif
#ifdef CONFIG_MMU
mcr p15, 0, r6, c3, c0, 0 @ Set domain register
#endif
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2010-07-04 23:20 Stephen Rothwell
@ 2010-07-05 1:46 ` Nicolas Pitre
2010-07-05 7:14 ` Stephen Rothwell
0 siblings, 1 reply; 24+ messages in thread
From: Nicolas Pitre @ 2010-07-05 1:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tony Lindgren, linux-omap, linux-next, linux-kernel, Russell King
On Mon, 5 Jul 2010, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/kernel/entry-armv.S between commit
> df0698be14c6683606d5df2d83e3ae40f85ed0d9 ("ARM: stack protector: change
> the canary value per task") from the arm tree and commit
> 4481d0c7d25c9de9a3986c8b4c52389ca8bbf929 ("arm: Replace
> CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6") from the omap
> tree.
>
> Just context changes (I think). I fixed it up (see below) and can carry
> the fix as necessary.
Yes, the fix is fine. If you can carry it until either of those is
merged upstream that would be great.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/kernel/entry-armv.S
> index 2d14081,a6cfb17..0000000
> --- a/arch/arm/kernel/entry-armv.S
> +++ b/arch/arm/kernel/entry-armv.S
> @@@ -739,17 -740,7 +740,12 @@@ ENTRY(__switch_to
> #ifdef CONFIG_MMU
> ldr r6, [r2, #TI_CPU_DOMAIN]
> #endif
> - #if defined(CONFIG_HAS_TLS_REG)
> - mcr p15, 0, r3, c13, c0, 3 @ set TLS register
> - #elif !defined(CONFIG_TLS_REG_EMUL)
> - mov r4, #0xffff0fff
> - str r3, [r4, #-15] @ TLS val at 0xffff0ff0
> - #endif
> + set_tls r3, r4, r5
> +#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
> + ldr r7, [r2, #TI_TASK]
> + ldr r8, =__stack_chk_guard
> + ldr r7, [r7, #TSK_STACK_CANARY]
> +#endif
> #ifdef CONFIG_MMU
> mcr p15, 0, r6, c3, c0, 0 @ Set domain register
> #endif
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2010-07-05 1:46 ` Nicolas Pitre
@ 2010-07-05 7:14 ` Stephen Rothwell
2010-07-05 13:44 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2010-07-05 7:14 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Tony Lindgren, linux-omap, linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
Hi Nicolas,
On Sun, 04 Jul 2010 21:46:27 -0400 (EDT) Nicolas Pitre <nico@fluxnic.net> wrote:
>
> Yes, the fix is fine. If you can carry it until either of those is
> merged upstream that would be great.
Thanks for the confirmation. I can carry the merge fix as long as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm tree
2010-07-05 7:14 ` Stephen Rothwell
@ 2010-07-05 13:44 ` Tony Lindgren
0 siblings, 0 replies; 24+ messages in thread
From: Tony Lindgren @ 2010-07-05 13:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Nicolas Pitre, linux-omap, linux-next, linux-kernel, Russell King
* Stephen Rothwell <sfr@canb.auug.org.au> [100705 10:08]:
> Hi Nicolas,
>
> On Sun, 04 Jul 2010 21:46:27 -0400 (EDT) Nicolas Pitre <nico@fluxnic.net> wrote:
> >
> > Yes, the fix is fine. If you can carry it until either of those is
> > merged upstream that would be great.
>
> Thanks for the confirmation. I can carry the merge fix as long as
> necessary.
Thanks, I've dropped this patch from omap for-next branch, I'll send
it into Russell's patch system.
Regards,
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* linux-next: manual merge of the omap tree with the arm tree
@ 2009-08-19 5:04 Stephen Rothwell
2009-08-20 10:20 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2009-08-19 5:04 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Syed Rafiuddin, Russell King, Kalle Valo
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/mach-omap2/board-4430sdp.c between commit
085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
support") from the arm tree and commit
4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
from the omap tree.
Just context changes (I think). I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 1b22307,646079f..0000000
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -38,8 -38,8 +38,8 @@@ static struct platform_device *sdp4430_
&sdp4430_lcd_device,
};
- static struct omap_uart_config sdp4430_uart_config __initdata = {
+ static struct omap_uart_platform_data sdp4430_uart_config __initdata = {
- .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
+ .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
};
static struct omap_lcd_config sdp4430_lcd_config __initdata = {
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2009-08-19 5:04 Stephen Rothwell
@ 2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-24 13:07 ` Tony Lindgren
0 siblings, 2 replies; 24+ messages in thread
From: Tony Lindgren @ 2009-08-20 10:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Syed Rafiuddin,
Russell King, Kalle Valo
* Stephen Rothwell <sfr@canb.auug.org.au> [090819 08:04]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap2/board-4430sdp.c between commit
> 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> support") from the arm tree and commit
> 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
> from the omap tree.
>
> Just context changes (I think). I fixed it up (see below) and can carry
> the fix as necessary.
Thanks yeh the fix looks right. I'll take a look if I can squeeze something
like that into my queue so the merge conflict disappears.
Regards,
Tony
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap2/board-4430sdp.c
> index 1b22307,646079f..0000000
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@@ -38,8 -38,8 +38,8 @@@ static struct platform_device *sdp4430_
> &sdp4430_lcd_device,
> };
>
> - static struct omap_uart_config sdp4430_uart_config __initdata = {
> + static struct omap_uart_platform_data sdp4430_uart_config __initdata = {
> - .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
> + .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
> };
>
> static struct omap_lcd_config sdp4430_lcd_config __initdata = {
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: linux-next: manual merge of the omap tree with the arm tree
2009-08-20 10:20 ` Tony Lindgren
@ 2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-24 13:07 ` Tony Lindgren
1 sibling, 1 reply; 24+ messages in thread
From: Shilimkar, Santosh @ 2009-08-20 13:03 UTC (permalink / raw)
To: Tony Lindgren, Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Syed, Rafiuddin,
Russell King, Kalle Valo
> > Today's linux-next merge of the omap tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > support") from the arm tree and commit
> > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
> > from the omap tree.
> >
> > Just context changes (I think). I fixed it up (see below) and can carry
> > the fix as necessary.
>
> Thanks yeh the fix looks right. I'll take a look if I can squeeze
> something
> like that into my queue so the merge conflict disappears.
There is another issue with the same merge I noticed which not seems to be correct.
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=a11128de5baf523cf73176170659902fe1335527
< Code snippet >
102 static struct plat_serial8250_port serial_platform_data2[] = {
103 {
104 .membase = OMAP2_IO_ADDRESS(OMAP_UART3_BASE),
105 .mapbase = OMAP_UART3_BASE,
106 .irq = 74,
107 .flags = UPF_BOOT_AUTOCONF,
108 .iotype = UPIO_MEM,
109 .regshift = 2,
110 .uartclk = OMAP24XX_BASE_BAUD * 16,
111 }, {
112 #ifdef CONFIG_ARCH_OMAP4
113 .membase = IO_ADDRESS(OMAP_UART4_BASE),
114 .mapbase = OMAP_UART4_BASE,
115 .irq = 70,
116 .flags = UPF_BOOT_AUTOCONF,
117 .iotype = UPIO_MEM,
118 .regshift = 2,
119 .uartclk = OMAP24XX_BASE_BAUD * 16,
120 }, {
121 #endif
122 .flags = 0
123 }
124 };
This patch (ARM: OMAP4: Add UART4) was generated when there was single structure holding all three UARTs and fourth UART was added accordingly. And now it's been merged with serial.c which has UART's structures separated already.
Below patch fixes the same but don't know what is the way to get merged in such cases.
Tony,
Could you please review it?
>From c8be9f1b5d4fe1dce06b6f33be33fe57f376ea7f Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Thu, 20 Aug 2009 18:33:43 +0530
Subject: [PATCH] OMAP4: UART4 : Reworked patch to fix merge conflicts.
This patch adds UART4 support on OMAP4430 development platform.
The serial omap-patches has split the UART platform
data into separate structure hence needs rework.
Without this patch omap_serial_init() would produce kernel crash
on OMAP4430 platform while looping for the 4 th UART platform
data.
Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/serial.c | 27 ++++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index b0c7402..1b22307 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -39,7 +39,7 @@ static struct platform_device *sdp4430_devices[] __initdata = {
};
static struct omap_uart_config sdp4430_uart_config __initdata = {
- .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
+ .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
};
static struct omap_lcd_config sdp4430_lcd_config __initdata = {
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index a7421a5..b96cac4 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -112,7 +112,21 @@ static struct plat_serial8250_port serial_platform_data2[] = {
.flags = 0
}
};
-
+#ifdef CONFIG_ARCH_OMAP4
+static struct plat_serial8250_port serial_platform_data3[] = {
+ {
+ .membase = IO_ADDRESS(OMAP_UART4_BASE),
+ .mapbase = OMAP_UART3_BASE,
+ .irq = 70,
+ .flags = UPF_BOOT_AUTOCONF,
+ .iotype = UPIO_MEM,
+ .regshift = 2,
+ .uartclk = OMAP24XX_BASE_BAUD * 16,
+ }, {
+ .flags = 0
+ }
+};
+#endif
static inline unsigned int serial_read_reg(struct plat_serial8250_port *up,
int offset)
{
@@ -550,6 +564,17 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
},
},
},
+#ifdef CONFIG_ARCH_OMAP4
+ {
+ .pdev = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM2,
+ .dev = {
+ .platform_data = serial_platform_data2,
+ },
+ },
+ },
+#endif
};
void __init omap_serial_init(void)
--
1.5.4.7
Regrads
Santosh
^ permalink raw reply related [flat|nested] 24+ messages in thread* RE: linux-next: manual merge of the omap tree with the arm tree
2009-08-20 13:03 ` Shilimkar, Santosh
@ 2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-20 13:55 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Shilimkar, Santosh @ 2009-08-20 13:13 UTC (permalink / raw)
To: Shilimkar, Santosh, Tony Lindgren, Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Syed, Rafiuddin,
Russell King, Kalle Valo
(Resending with a correction)
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Shilimkar, Santosh
> Sent: Thursday, August 20, 2009 6:33 PM
> To: Tony Lindgren; Stephen Rothwell
> Cc: linux-omap@vger.kernel.org; linux-next@vger.kernel.org; linux-
> kernel@vger.kernel.org; Syed, Rafiuddin; Russell King; Kalle Valo
> Subject: RE: linux-next: manual merge of the omap tree with the arm tree
>
> > > Today's linux-next merge of the omap tree got a conflict in
> > > arch/arm/mach-omap2/board-4430sdp.c between commit
> > > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > > support") from the arm tree and commit
> > > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove
> OMAP_TAG_UART")
> > > from the omap tree.
> > >
> > > Just context changes (I think). I fixed it up (see below) and can
> carry
> > > the fix as necessary.
> >
> > Thanks yeh the fix looks right. I'll take a look if I can squeeze
> > something
> > like that into my queue so the merge conflict disappears.
>
> There is another issue with the same merge I noticed which not seems to be
> correct.
> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-
> next.git;a=commit;h=a11128de5baf523cf73176170659902fe1335527
>
> < Code snippet >
>
> 102 static struct plat_serial8250_port serial_platform_data2[] = {
> 103 {
> 104 .membase = OMAP2_IO_ADDRESS(OMAP_UART3_BASE),
> 105 .mapbase = OMAP_UART3_BASE,
> 106 .irq = 74,
> 107 .flags = UPF_BOOT_AUTOCONF,
> 108 .iotype = UPIO_MEM,
> 109 .regshift = 2,
> 110 .uartclk = OMAP24XX_BASE_BAUD * 16,
> 111 }, {
> 112 #ifdef CONFIG_ARCH_OMAP4
> 113 .membase = IO_ADDRESS(OMAP_UART4_BASE),
> 114 .mapbase = OMAP_UART4_BASE,
> 115 .irq = 70,
> 116 .flags = UPF_BOOT_AUTOCONF,
> 117 .iotype = UPIO_MEM,
> 118 .regshift = 2,
> 119 .uartclk = OMAP24XX_BASE_BAUD * 16,
> 120 }, {
> 121 #endif
> 122 .flags = 0
> 123 }
> 124 };
>
> This patch (ARM: OMAP4: Add UART4) was generated when there was single
> structure holding all three UARTs and fourth UART was added accordingly.
> And now it's been merged with serial.c which has UART's structures
> separated already.
> Below patch fixes the same but don't know what is the way to get merged in
> such cases.
>
> Tony,
> Could you please review it?
>From c8be9f1b5d4fe1dce06b6f33be33fe57f376ea7f Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Thu, 20 Aug 2009 18:33:43 +0530
Subject: [PATCH] OMAP4: UART4 : Reworked patch to fix merge conflicts.
This patch adds UART4 support on OMAP4430 development platform.
The serial omap patches has split the UART platform
data into separate structure hence needs rework.
Without this patch omap_serial_init() would produce kernel crash
on OMAP4430 platform while looping for the 4 th UART platform
data.
Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/serial.c | 27 ++++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index b0c7402..1b22307 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -39,7 +39,7 @@ static struct platform_device *sdp4430_devices[] __initdata = {
};
static struct omap_uart_config sdp4430_uart_config __initdata = {
- .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
+ .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
};
static struct omap_lcd_config sdp4430_lcd_config __initdata = {
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index a7421a5..b96cac4 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -112,7 +112,21 @@ static struct plat_serial8250_port serial_platform_data2[] = {
.flags = 0
}
};
-
+#ifdef CONFIG_ARCH_OMAP4
+static struct plat_serial8250_port serial_platform_data3[] = {
+ {
+ .membase = IO_ADDRESS(OMAP_UART4_BASE),
+ .mapbase = OMAP_UART4_BASE,
+ .irq = 70,
+ .flags = UPF_BOOT_AUTOCONF,
+ .iotype = UPIO_MEM,
+ .regshift = 2,
+ .uartclk = OMAP24XX_BASE_BAUD * 16,
+ }, {
+ .flags = 0
+ }
+};
+#endif
static inline unsigned int serial_read_reg(struct plat_serial8250_port *up,
int offset)
{
@@ -550,6 +564,17 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
},
},
},
+#ifdef CONFIG_ARCH_OMAP4
+ {
+ .pdev = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM2,
+ .dev = {
+ .platform_data = serial_platform_data3,
+ },
+ },
+ },
+#endif
};
void __init omap_serial_init(void)
--
1.5.4.7
Regards,
Santosh
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2009-08-20 13:13 ` Shilimkar, Santosh
@ 2009-08-20 13:55 ` Tony Lindgren
0 siblings, 0 replies; 24+ messages in thread
From: Tony Lindgren @ 2009-08-20 13:55 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: Stephen Rothwell, linux-omap, linux-next, linux-kernel, Syed,
Rafiuddin, Russell King, Kalle Valo
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [090820 16:13]:
> (Resending with a correction)
>
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> > owner@vger.kernel.org] On Behalf Of Shilimkar, Santosh
> > Sent: Thursday, August 20, 2009 6:33 PM
> > To: Tony Lindgren; Stephen Rothwell
> > Cc: linux-omap@vger.kernel.org; linux-next@vger.kernel.org; linux-
> > kernel@vger.kernel.org; Syed, Rafiuddin; Russell King; Kalle Valo
> > Subject: RE: linux-next: manual merge of the omap tree with the arm tree
> >
> > > > Today's linux-next merge of the omap tree got a conflict in
> > > > arch/arm/mach-omap2/board-4430sdp.c between commit
> > > > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > > > support") from the arm tree and commit
> > > > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove
> > OMAP_TAG_UART")
> > > > from the omap tree.
> > > >
> > > > Just context changes (I think). I fixed it up (see below) and can
> > carry
> > > > the fix as necessary.
> > >
> > > Thanks yeh the fix looks right. I'll take a look if I can squeeze
> > > something
> > > like that into my queue so the merge conflict disappears.
> >
> > There is another issue with the same merge I noticed which not seems to be
> > correct.
> > http://git.kernel.org/?p=linux/kernel/git/sfr/linux-
> > next.git;a=commit;h=a11128de5baf523cf73176170659902fe1335527
> >
> > < Code snippet >
> >
> > 102 static struct plat_serial8250_port serial_platform_data2[] = {
> > 103 {
> > 104 .membase = OMAP2_IO_ADDRESS(OMAP_UART3_BASE),
> > 105 .mapbase = OMAP_UART3_BASE,
> > 106 .irq = 74,
> > 107 .flags = UPF_BOOT_AUTOCONF,
> > 108 .iotype = UPIO_MEM,
> > 109 .regshift = 2,
> > 110 .uartclk = OMAP24XX_BASE_BAUD * 16,
> > 111 }, {
> > 112 #ifdef CONFIG_ARCH_OMAP4
> > 113 .membase = IO_ADDRESS(OMAP_UART4_BASE),
> > 114 .mapbase = OMAP_UART4_BASE,
> > 115 .irq = 70,
> > 116 .flags = UPF_BOOT_AUTOCONF,
> > 117 .iotype = UPIO_MEM,
> > 118 .regshift = 2,
> > 119 .uartclk = OMAP24XX_BASE_BAUD * 16,
> > 120 }, {
> > 121 #endif
> > 122 .flags = 0
> > 123 }
> > 124 };
> >
> > This patch (ARM: OMAP4: Add UART4) was generated when there was single
> > structure holding all three UARTs and fourth UART was added accordingly.
> > And now it's been merged with serial.c which has UART's structures
> > separated already.
> > Below patch fixes the same but don't know what is the way to get merged in
> > such cases.
> >
> > Tony,
> > Could you please review it?
Looks OK, except the OMAP_IO_ADDRESS() has been split to OMAP1_IO_ADDRESS()
and OMAP2_IO_ADDRESS in omap for-next tree.
Regards,
Tony
>
> From c8be9f1b5d4fe1dce06b6f33be33fe57f376ea7f Mon Sep 17 00:00:00 2001
> From: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Date: Thu, 20 Aug 2009 18:33:43 +0530
> Subject: [PATCH] OMAP4: UART4 : Reworked patch to fix merge conflicts.
>
> This patch adds UART4 support on OMAP4430 development platform.
> The serial omap patches has split the UART platform
> data into separate structure hence needs rework.
>
> Without this patch omap_serial_init() would produce kernel crash
> on OMAP4430 platform while looping for the 4 th UART platform
> data.
>
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/mach-omap2/board-4430sdp.c | 2 +-
> arch/arm/mach-omap2/serial.c | 27 ++++++++++++++++++++++++++-
> 2 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index b0c7402..1b22307 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -39,7 +39,7 @@ static struct platform_device *sdp4430_devices[] __initdata = {
> };
>
> static struct omap_uart_config sdp4430_uart_config __initdata = {
> - .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
> + .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
> };
>
> static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index a7421a5..b96cac4 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -112,7 +112,21 @@ static struct plat_serial8250_port serial_platform_data2[] = {
> .flags = 0
> }
> };
> -
> +#ifdef CONFIG_ARCH_OMAP4
> +static struct plat_serial8250_port serial_platform_data3[] = {
> + {
> + .membase = IO_ADDRESS(OMAP_UART4_BASE),
> + .mapbase = OMAP_UART4_BASE,
> + .irq = 70,
> + .flags = UPF_BOOT_AUTOCONF,
> + .iotype = UPIO_MEM,
> + .regshift = 2,
> + .uartclk = OMAP24XX_BASE_BAUD * 16,
> + }, {
> + .flags = 0
> + }
> +};
> +#endif
> static inline unsigned int serial_read_reg(struct plat_serial8250_port *up,
> int offset)
> {
> @@ -550,6 +564,17 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
> },
> },
> },
> +#ifdef CONFIG_ARCH_OMAP4
> + {
> + .pdev = {
> + .name = "serial8250",
> + .id = PLAT8250_DEV_PLATFORM2,
> + .dev = {
> + .platform_data = serial_platform_data3,
> + },
> + },
> + },
> +#endif
> };
>
> void __init omap_serial_init(void)
> --
> 1.5.4.7
>
> Regards,
> Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm tree
2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
@ 2009-08-24 13:07 ` Tony Lindgren
2009-08-24 13:14 ` Stephen Rothwell
1 sibling, 1 reply; 24+ messages in thread
From: Tony Lindgren @ 2009-08-24 13:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Syed Rafiuddin,
Russell King, Kalle Valo
* Tony Lindgren <tony@atomide.com> [090820 14:20]:
> * Stephen Rothwell <sfr@canb.auug.org.au> [090819 08:04]:
> > Hi all,
> >
> > Today's linux-next merge of the omap tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > support") from the arm tree and commit
> > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
> > from the omap tree.
> >
> > Just context changes (I think). I fixed it up (see below) and can carry
> > the fix as necessary.
>
> Thanks yeh the fix looks right. I'll take a look if I can squeeze something
> like that into my queue so the merge conflict disappears.
The merge conflict should be gone now, Kevin realized we don't need the
platform_data any longer. Will remove that for board-4430sdp.c and serial.h
as a fix once the other pending changes have been merged.
> Regards,
>
> Tony
>
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc arch/arm/mach-omap2/board-4430sdp.c
> > index 1b22307,646079f..0000000
> > --- a/arch/arm/mach-omap2/board-4430sdp.c
> > +++ b/arch/arm/mach-omap2/board-4430sdp.c
> > @@@ -38,8 -38,8 +38,8 @@@ static struct platform_device *sdp4430_
> > &sdp4430_lcd_device,
> > };
> >
> > - static struct omap_uart_config sdp4430_uart_config __initdata = {
> > + static struct omap_uart_platform_data sdp4430_uart_config __initdata = {
> > - .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2),
> > + .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
> > };
> >
> > static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2009-08-24 13:07 ` Tony Lindgren
@ 2009-08-24 13:14 ` Stephen Rothwell
0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2009-08-24 13:14 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, linux-next, linux-kernel, Syed Rafiuddin,
Russell King, Kalle Valo
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
Hi Tony,
On Mon, 24 Aug 2009 16:07:18 +0300 Tony Lindgren <tony@atomide.com> wrote:
>
> The merge conflict should be gone now, Kevin realized we don't need the
> platform_data any longer. Will remove that for board-4430sdp.c and serial.h
> as a fix once the other pending changes have been merged.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* linux-next: manual merge of the omap tree with the arm tree
@ 2009-05-28 4:31 Stephen Rothwell
2009-05-28 6:25 ` Shilimkar, Santosh
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2009-05-28 4:31 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Russell King, Santosh Shilimkar
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/Makefile between commit b4175b89921fefb2f352472fa6dccb0fc4fb37d9
("[ARM] sort machine- and plat- by CONFIG* name") from the arm tree and
commit 68394eae0fc4e801fc2ae33055b24a9754669a7b ("ARM: OMAP4: Add support
for 4430 SDP") from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Makefile
index e97c21b,676d10d..0000000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -99,72 -99,65 +99,73 @@@ CHECKFLAGS += -D__arm_
#Default value
head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
textofs-y := 0x00008000
-
- machine-$(CONFIG_ARCH_RPC) := rpc
- machine-$(CONFIG_ARCH_EBSA110) := ebsa110
- machine-$(CONFIG_FOOTBRIDGE) := footbridge
- machine-$(CONFIG_ARCH_SHARK) := shark
- machine-$(CONFIG_ARCH_SA1100) := sa1100
-ifeq ($(CONFIG_ARCH_SA1100),y)
+textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
- textofs-$(CONFIG_SA1111) := 0x00208000
+ifeq ($(CONFIG_ARCH_SA1100),y)
+textofs-$(CONFIG_SA1111) := 0x00208000
endif
- machine-$(CONFIG_ARCH_PXA) := pxa
- machine-$(CONFIG_ARCH_MMP) := mmp
- plat-$(CONFIG_PLAT_PXA) := pxa
- machine-$(CONFIG_ARCH_L7200) := l7200
- machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
- machine-$(CONFIG_ARCH_GEMINI) := gemini
- textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
- machine-$(CONFIG_ARCH_CLPS711X) := clps711x
- machine-$(CONFIG_ARCH_IOP32X) := iop32x
- machine-$(CONFIG_ARCH_IOP33X) := iop33x
- machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
- plat-$(CONFIG_PLAT_IOP) := iop
- machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
- machine-$(CONFIG_ARCH_IXP2000) := ixp2000
- machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
- machine-$(CONFIG_ARCH_OMAP1) := omap1
- machine-$(CONFIG_ARCH_OMAP2) := omap2
- machine-$(CONFIG_ARCH_OMAP3) := omap2
- machine-$(CONFIG_ARCH_OMAP4) := omap2
- plat-$(CONFIG_ARCH_OMAP) := omap
- machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
- machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
- plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
- machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
- plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
- machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
- machine-$(CONFIG_ARCH_VERSATILE) := versatile
- machine-$(CONFIG_ARCH_IMX) := imx
- machine-$(CONFIG_ARCH_H720X) := h720x
- machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
- machine-$(CONFIG_ARCH_REALVIEW) := realview
- machine-$(CONFIG_ARCH_AT91) := at91
- machine-$(CONFIG_ARCH_EP93XX) := ep93xx
- machine-$(CONFIG_ARCH_PNX4008) := pnx4008
- machine-$(CONFIG_ARCH_NETX) := netx
- machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
- machine-$(CONFIG_ARCH_DAVINCI) := davinci
- machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
- machine-$(CONFIG_ARCH_KS8695) := ks8695
- plat-$(CONFIG_ARCH_MXC) := mxc
- machine-$(CONFIG_ARCH_MX2) := mx2
- machine-$(CONFIG_ARCH_MX3) := mx3
- machine-$(CONFIG_ARCH_MX1) := mx1
- machine-$(CONFIG_ARCH_ORION5X) := orion5x
- plat-$(CONFIG_PLAT_ORION) := orion
- machine-$(CONFIG_ARCH_MSM) := msm
- machine-$(CONFIG_ARCH_LOKI) := loki
- machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
- machine-$(CONFIG_ARCH_W90X900) := w90x900
+
+# Machine directory name. This list is sorted alphanumerically
+# by CONFIG_* macro name.
+machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
+machine-$(CONFIG_ARCH_AT91) := at91
+machine-$(CONFIG_ARCH_CLPS711X) := clps711x
+machine-$(CONFIG_ARCH_DAVINCI) := davinci
+machine-$(CONFIG_ARCH_EBSA110) := ebsa110
+machine-$(CONFIG_ARCH_EP93XX) := ep93xx
+machine-$(CONFIG_ARCH_GEMINI) := gemini
+machine-$(CONFIG_ARCH_H720X) := h720x
+machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
+machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
+machine-$(CONFIG_ARCH_IOP32X) := iop32x
+machine-$(CONFIG_ARCH_IOP33X) := iop33x
+machine-$(CONFIG_ARCH_IXP2000) := ixp2000
+machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
+machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
+machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
+machine-$(CONFIG_ARCH_KS8695) := ks8695
+machine-$(CONFIG_ARCH_L7200) := l7200
+machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
+machine-$(CONFIG_ARCH_LOKI) := loki
+machine-$(CONFIG_ARCH_MMP) := mmp
+machine-$(CONFIG_ARCH_MSM) := msm
+machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
+machine-$(CONFIG_ARCH_MX1) := mx1
+machine-$(CONFIG_ARCH_MX2) := mx2
+machine-$(CONFIG_ARCH_MX3) := mx3
+machine-$(CONFIG_ARCH_NETX) := netx
+machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
+machine-$(CONFIG_ARCH_OMAP1) := omap1
+machine-$(CONFIG_ARCH_OMAP2) := omap2
+machine-$(CONFIG_ARCH_OMAP3) := omap2
++machine-$(CONFIG_ARCH_OMAP4) := omap2
+machine-$(CONFIG_ARCH_ORION5X) := orion5x
+machine-$(CONFIG_ARCH_PNX4008) := pnx4008
+machine-$(CONFIG_ARCH_PXA) := pxa
+machine-$(CONFIG_ARCH_REALVIEW) := realview
+machine-$(CONFIG_ARCH_RPC) := rpc
+machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
+machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
+machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
+machine-$(CONFIG_ARCH_SA1100) := sa1100
+machine-$(CONFIG_ARCH_SHARK) := shark
+machine-$(CONFIG_ARCH_STMP378X) := stmp378x
+machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx
+machine-$(CONFIG_ARCH_U300) := u300
+machine-$(CONFIG_ARCH_VERSATILE) := versatile
+machine-$(CONFIG_ARCH_W90X900) := w90x900
+machine-$(CONFIG_FOOTBRIDGE) := footbridge
+
+# Platform directory name. This list is sorted alphanumerically
+# by CONFIG_* macro name.
+plat-$(CONFIG_ARCH_MXC) := mxc
+plat-$(CONFIG_ARCH_OMAP) := omap
+plat-$(CONFIG_PLAT_IOP) := iop
+plat-$(CONFIG_PLAT_ORION) := orion
+plat-$(CONFIG_PLAT_PXA) := pxa
+plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
+plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
+plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
ifeq ($(CONFIG_ARCH_EBSA110),y)
# This is what happens if you forget the IOCS16 line.
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: linux-next: manual merge of the omap tree with the arm tree
2009-05-28 4:31 Stephen Rothwell
@ 2009-05-28 6:25 ` Shilimkar, Santosh
2009-05-28 6:34 ` Stephen Rothwell
0 siblings, 1 reply; 24+ messages in thread
From: Shilimkar, Santosh @ 2009-05-28 6:25 UTC (permalink / raw)
To: Stephen Rothwell, Tony Lindgren, linux-omap
Cc: linux-next, linux-kernel, Russell King
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Thursday, May 28, 2009 10:02 AM
> To: Tony Lindgren; linux-omap@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org;
> Russell King; Shilimkar, Santosh
> Subject: linux-next: manual merge of the omap tree with the arm tree
>
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/Makefile between commit
> b4175b89921fefb2f352472fa6dccb0fc4fb37d9
> ("[ARM] sort machine- and plat- by CONFIG* name") from the
> arm tree and
> commit 68394eae0fc4e801fc2ae33055b24a9754669a7b ("ARM: OMAP4:
> Add support
> for 4430 SDP") from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/Makefile
> index e97c21b,676d10d..0000000
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@@ -99,72 -99,65 +99,73 @@@ CHECKFLAGS += -D__arm_
> #Default value
> head-y := arch/arm/kernel/head$(MMUEXT).o
> arch/arm/kernel/init_task.o
> textofs-y := 0x00008000
- machine-$(CONFIG_ARCH_W90X900) := w90x900
> +
> +# Machine directory name. This list is sorted alphanumerically
> +# by CONFIG_* macro name.
> +machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
> +machine-$(CONFIG_ARCH_AT91) := at91
> +machine-$(CONFIG_ARCH_CLPS711X) := clps711x
> +machine-$(CONFIG_ARCH_DAVINCI) := davinci
> +machine-$(CONFIG_ARCH_EBSA110) := ebsa110
> +machine-$(CONFIG_ARCH_EP93XX) := ep93xx
> +machine-$(CONFIG_ARCH_GEMINI) := gemini
> +machine-$(CONFIG_ARCH_H720X) := h720x
> +machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
> +machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
> +machine-$(CONFIG_ARCH_IOP32X) := iop32x
> +machine-$(CONFIG_ARCH_IOP33X) := iop33x
> +machine-$(CONFIG_ARCH_IXP2000) := ixp2000
> +machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
> +machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
> +machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
> +machine-$(CONFIG_ARCH_KS8695) := ks8695
> +machine-$(CONFIG_ARCH_L7200) := l7200
> +machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
> +machine-$(CONFIG_ARCH_LOKI) := loki
> +machine-$(CONFIG_ARCH_MMP) := mmp
> +machine-$(CONFIG_ARCH_MSM) := msm
> +machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
> +machine-$(CONFIG_ARCH_MX1) := mx1
> +machine-$(CONFIG_ARCH_MX2) := mx2
> +machine-$(CONFIG_ARCH_MX3) := mx3
> +machine-$(CONFIG_ARCH_NETX) := netx
> +machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
> +machine-$(CONFIG_ARCH_OMAP1) := omap1
> +machine-$(CONFIG_ARCH_OMAP2) := omap2
> +machine-$(CONFIG_ARCH_OMAP3) := omap2
> ++machine-$(CONFIG_ARCH_OMAP4) := omap2
++ Is this really ok ?
> +machine-$(CONFIG_ARCH_ORION5X) := orion5x
> +machine-$(CONFIG_ARCH_PNX4008) := pnx4008
> +machine-$(CONFIG_ARCH_PXA) := pxa
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: linux-next: manual merge of the omap tree with the arm tree
2009-05-28 6:25 ` Shilimkar, Santosh
@ 2009-05-28 6:34 ` Stephen Rothwell
2009-05-28 6:40 ` Shilimkar, Santosh
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2009-05-28 6:34 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: Tony Lindgren, linux-omap, linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Hi,
On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh" <santosh.shilimkar@ti.com> wrote:
>
> > +machine-$(CONFIG_ARCH_OMAP2) := omap2
> > +machine-$(CONFIG_ARCH_OMAP3) := omap2
> > ++machine-$(CONFIG_ARCH_OMAP4) := omap2
>
> ++ Is this really ok ?
Yeah, this is a diff of a git merge. The ++ just means it was added on
neither side of the merge - I modified the change from the omap tree
slightly to fit in better with the cleanups from the arm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: linux-next: manual merge of the omap tree with the arm tree
2009-05-28 6:34 ` Stephen Rothwell
@ 2009-05-28 6:40 ` Shilimkar, Santosh
0 siblings, 0 replies; 24+ messages in thread
From: Shilimkar, Santosh @ 2009-05-28 6:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tony Lindgren, linux-omap, linux-next, linux-kernel, Russell King
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Thursday, May 28, 2009 12:05 PM
> To: Shilimkar, Santosh
> Cc: Tony Lindgren; linux-omap@vger.kernel.org;
> linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Russell King
> Subject: Re: linux-next: manual merge of the omap tree with
> the arm tree
>
> Hi,
>
> On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh"
> <santosh.shilimkar@ti.com> wrote:
> >
> > > +machine-$(CONFIG_ARCH_OMAP2) := omap2
> > > +machine-$(CONFIG_ARCH_OMAP3) := omap2
> > > ++machine-$(CONFIG_ARCH_OMAP4) := omap2
> >
> > ++ Is this really ok ?
>
> Yeah, this is a diff of a git merge. The ++ just means it
> was added on
> neither side of the merge - I modified the change from the omap tree
> slightly to fit in better with the cleanups from the arm tree.
Ok. Thanks !!
Regards,
Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2010-12-26 22:42 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-04 23:20 linux-next: manual merge of the omap tree with the arm tree Stephen Rothwell
2010-02-04 23:30 ` Tony Lindgren
2010-02-05 0:16 ` Stephen Rothwell
2010-02-05 4:04 ` Tony Lindgren
2010-02-15 15:03 ` Russell King
2010-02-17 19:33 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2010-12-26 22:41 Stephen Rothwell
2010-07-08 1:37 Stephen Rothwell
2010-07-08 10:14 ` Tony Lindgren
2010-07-04 23:20 Stephen Rothwell
2010-07-05 1:46 ` Nicolas Pitre
2010-07-05 7:14 ` Stephen Rothwell
2010-07-05 13:44 ` Tony Lindgren
2009-08-19 5:04 Stephen Rothwell
2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-20 13:55 ` Tony Lindgren
2009-08-24 13:07 ` Tony Lindgren
2009-08-24 13:14 ` Stephen Rothwell
2009-05-28 4:31 Stephen Rothwell
2009-05-28 6:25 ` Shilimkar, Santosh
2009-05-28 6:34 ` Stephen Rothwell
2009-05-28 6:40 ` Shilimkar, Santosh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).