* linux-next: manual merge of the davinci tree with the arm tree
@ 2010-10-17 23:31 Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2010-10-17 23:31 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Sekhar Nori, Nicolas Pitre
Hi Kevin,
Today's linux-next merge of the davinci tree got a conflicts in
arch/arm/mach-davinci/board-da830-evm.c and
arch/arm/mach-davinci/board-da850-evm.c between commit
861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
AM1x ARM9 microprocessors") from the davinci tree.
Just context changes, I fixed them up (see below) and can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-davinci/board-da830-evm.c
index 7f3cdbf,1bb89d3..0000000
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@@ -596,7 -608,9 +608,7 @@@ static void __init da830_evm_map_io(voi
da830_init();
}
- MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM")
+ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
- .phys_io = IO_PHYS,
- .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
.boot_params = (DA8XX_DDR_BASE + 0x100),
.map_io = da830_evm_map_io,
.init_irq = cp_intc_init,
diff --cc arch/arm/mach-davinci/board-da850-evm.c
index b26f5cb,ef97c7f..0000000
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -816,7 -868,9 +868,7 @@@ static void __init da850_evm_map_io(voi
da850_init();
}
- MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM")
+ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
- .phys_io = IO_PHYS,
- .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
.boot_params = (DA8XX_DDR_BASE + 0x100),
.map_io = da850_evm_map_io,
.init_irq = cp_intc_init,
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the davinci tree with the arm tree
2010-10-17 23:31 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
@ 2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2010-10-18 0:01 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Sekhar Nori, Nicolas Pitre
[Just cc'ing Russell, sorry about that]
On Mon, 18 Oct 2010 10:31:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes, I fixed them up (see below) and can carry the fix
> as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-davinci/board-da830-evm.c
> index 7f3cdbf,1bb89d3..0000000
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@@ -596,7 -608,9 +608,7 @@@ static void __init da830_evm_map_io(voi
> da830_init();
> }
>
> - MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM")
> + MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
> - .phys_io = IO_PHYS,
> - .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
> .boot_params = (DA8XX_DDR_BASE + 0x100),
> .map_io = da830_evm_map_io,
> .init_irq = cp_intc_init,
> diff --cc arch/arm/mach-davinci/board-da850-evm.c
> index b26f5cb,ef97c7f..0000000
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@@ -816,7 -868,9 +868,7 @@@ static void __init da850_evm_map_io(voi
> da850_init();
> }
>
> - MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM")
> + MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
> - .phys_io = IO_PHYS,
> - .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
> .boot_params = (DA8XX_DDR_BASE + 0x100),
> .map_io = da850_evm_map_io,
> .init_irq = cp_intc_init,
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the davinci tree with the arm tree
2010-10-17 23:31 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
@ 2010-10-19 15:46 ` Kevin Hilman
1 sibling, 0 replies; 7+ messages in thread
From: Kevin Hilman @ 2010-10-19 15:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Sekhar Nori, Nicolas Pitre,
Russell King
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes, I fixed them up (see below) and can carry the fix
> as necessary.
Hi Stephen,
Thanks for carrying this.
Russell has (temporarily) dropped his version of the patch, but when he
adds it back (today, I believe) I will fix this up in the davinci tree
by pre-merging his branch with mine to handle this conflict.
Kevin
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the davinci tree with the arm tree
@ 2010-05-19 1:10 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2010-05-19 1:10 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Russell King, Cyril Chemparathy
Hi Kevin,
Today's linux-next merge of the davinci tree got a conflict in
arch/arm/Kconfig between commit 717e7c2672e37253a4d3aa70e4716b5b0a658761
("ARM: remove 'select GENERIC_TIME'") from the arm tree and commit
b722049d7e60356fe04bcac6065a7c8b1c64c06f ("Davinci: allow SOCs based on
other ARM CPUs") from the davinci 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/Kconfig
index a07b6c4,1151d1a..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -760,9 -776,11 +760,8 @@@ config ARCH_NOMADI
config ARCH_DAVINCI
bool "TI DaVinci"
- select CPU_ARM926T
- select GENERIC_TIME
select GENERIC_CLOCKEVENTS
- select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
- select HAVE_CLK
select ZONE_DMA
select HAVE_IDE
select COMMON_CLKDEV
^ permalink raw reply [flat|nested] 7+ messages in thread* linux-next: manual merge of the davinci tree with the arm tree
@ 2010-01-29 0:13 Stephen Rothwell
2010-01-29 23:33 ` Kevin Hilman
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2010-01-29 0:13 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Kevin,
Today's linux-next merge of the davinci tree got a conflict in
arch/arm/mach-bcmring/core.c between commit
dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
clks_register() and similar") from the arm tree and commit
25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
and similar") from the davinci tree.
The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
the arm tree version.
--
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] 7+ messages in thread* Re: linux-next: manual merge of the davinci tree with the arm tree
2010-01-29 0:13 Stephen Rothwell
@ 2010-01-29 23:33 ` Kevin Hilman
2010-01-30 1:26 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Kevin Hilman @ 2010-01-29 23:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-bcmring/core.c between commit
> dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
> clks_register() and similar") from the arm tree and commit
> 25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
> and similar") from the davinci tree.
>
> The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
> the arm tree version.
OK, I'll drop the one from the davinci tree.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the davinci tree with the arm tree
2010-01-29 23:33 ` Kevin Hilman
@ 2010-01-30 1:26 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2010-01-30 1:26 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
Hi Kevin,
On Fri, 29 Jan 2010 15:33:29 -0800 Kevin Hilman <khilman@deeprootsystems.com> wrote:
>
> OK, I'll drop the one from the davinci tree.
OK, 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] 7+ messages in thread
end of thread, other threads:[~2010-10-19 15:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-17 23:31 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2010-05-19 1:10 Stephen Rothwell
2010-01-29 0:13 Stephen Rothwell
2010-01-29 23:33 ` Kevin Hilman
2010-01-30 1:26 ` Stephen Rothwell
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).