linux-next: manual merge of the s5p tree with the arm tree

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/Kconfig between commit 5f23188e036a ("ARM: 6900/1: Suspend: Fix
build error on ARCH_S5PC100") from the arm tree and commit a73ddc61e8f1
("ARM: S5P6442: Removing ARCH_S5P6442") from the s5p tree.

I fixed it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/Kconfig
index af8e274,e81c72c..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -2021,7 -1998,7 +2009,7 @@@ menu "Power management options
  source "kernel/power/Kconfig"
  
  config ARCH_SUSPEND_POSSIBLE
- 	depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
 -	depends on !ARCH_S5P64X0
++	depends on !ARCH_S5P64X0 && !ARCH_S5PC100
  	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
  		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
  	def_bool y

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
> Today's linux-next merge of the s5p tree got a lot of conflicts caused by
> duplicates of commits in your tree and Russell's.  It looks like you have
> merged a version of Russell's tree and then it has been rebased and added
> to.  You need to fix up your tree with respect to Russell's.
> 
Oops, yeah. I will remove Russell's old tree in my next and sorry for
bothering.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a lot of conflicts caused by
duplicates of commits in your tree and Russell's.  It looks like you have
merged a version of Russell's tree and then it has been rebased and added
to.  You need to fix up your tree with respect to Russell's.

This is a summary of the conflicts I get when I merge the s5p tree (after
merging the arm tree):

CONFLICT (modify/delete): arch/arm/plat-samsung/include/plat/system-reset.h deleted in HEAD and modified in s5p/for-next. Version s5p/for-next of arch/arm/plat-samsung/include/plat/system-reset.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/system.h
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/crag6410.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c2410/include/mach/system.h
CONFLICT (modify/delete): arch/arm/mach-s3c2410/include/mach/system-reset.h deleted in HEAD and modified in s5p/for-next. Version s5p/for-next of arch/arm/mach-s3c2410/include/mach/system-reset.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-rpc/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-realview/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-prima2/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-pnx4008/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-orion5x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ti8168evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-netx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-mv78xx0/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mmp/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-ks8695/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-kirkwood/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp2000/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop33x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop32x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop13xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-h720x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-footbridge/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (add/add): Merge conflict in arch/arm/mach-exynos/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ebsa110/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-dove/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-cns3xxx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-clps711x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/generic.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Russell King wrote:
> 
> On Wed, Jan 04, 2012 at 01:18:30PM +1100, Stephen Rothwell wrote:
> > Hi Kukjin,
> >
> > Today's linux-next merge of the s5p tree got a conflict in
> > arch/arm/plat-samsung/include/plat/system-reset.h between commit
> > 281c8724c10c ("ARM: restart: Temporary #error to persuade platform
> > maintainers to take the restart changes seriously") from the arm tree
> and
> > commit 08c6fc52956c ("ARM: restart: EXYNOS: use new restart hook") from
> > the s5p tree.
> >
> > The arm tree patch seems to have had the desired affect so I used the
> s5p
> > tree version.
> 
> Err, what are the Samsung people playing at, merging the patches that
> they've sent me for merging into their own tree?
> 
Russell, no. They will be removed in my tree.

> This is a recipe for breakage, especially as the exynos patch depends
> on previous patches in my tree _and_ patches in my tree depend on that
> patch as well.
> 
Yes, you're right. So they should be sent to upstream via arm tree.

> Well, we'll see what we end up with when you do the next linux-next,
> as by then my public tree should be updated with yesterdays work by
> then.
> 
> I've a feeling that this coming merge window is going to be a horrible
> mess.
> 

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the s5p tree with the arm tree

[Russell King]

On Wed, Jan 04, 2012 at 01:18:30PM +1100, Stephen Rothwell wrote:
> Hi Kukjin,
> 
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/plat-samsung/include/plat/system-reset.h between commit
> 281c8724c10c ("ARM: restart: Temporary #error to persuade platform
> maintainers to take the restart changes seriously") from the arm tree and
> commit 08c6fc52956c ("ARM: restart: EXYNOS: use new restart hook") from
> the s5p tree.
> 
> The arm tree patch seems to have had the desired affect so I used the s5p
> tree version.

Err, what are the Samsung people playing at, merging the patches that
they've sent me for merging into their own tree?

This is a recipe for breakage, especially as the exynos patch depends
on previous patches in my tree _and_ patches in my tree depend on that
patch as well.

Well, we'll see what we end up with when you do the next linux-next,
as by then my public tree should be updated with yesterdays work by
then.

I've a feeling that this coming merge window is going to be a horrible
mess.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/plat-samsung/include/plat/system-reset.h between commit
281c8724c10c ("ARM: restart: Temporary #error to persuade platform
maintainers to take the restart changes seriously") from the arm tree and
commit 08c6fc52956c ("ARM: restart: EXYNOS: use new restart hook") from
the s5p tree.

The arm tree patch seems to have had the desired affect so I used the s5p
tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p64x0/init.c between commit 95af214becab ("ARM: 7246/1:
> S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
> and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
> 's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.
> 
> I just removed the file, but the latter patch will probably need applying
> in some form to arch/arm/mach-s5p64x0/common.c.

OK, let me fix it.
Thanks for your time :)

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi Stephen :)

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s3c64xx/Makefile between commit b024043b6d0d ("ARM: 7245/1:
> S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> and commits 8f8a8d269bb4 ("ARM: S3C64XX: Add basic cpuidle driver"),
> a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from platform
> data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI platform
> devices to plat-samsung") and 4566c7f7612f ("ARM: S3C64XX: Modified files
> for SPI consolidation work") from the s5p tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> 

Looks good to me.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-s3c64xx/Makefile
> index f37016c,2244c42..0000000
> --- a/arch/arm/mach-s3c64xx/Makefile
> +++ b/arch/arm/mach-s3c64xx/Makefile
> @@@ -19,29 -19,29 +19,29 @@@ obj-y				+= common.o
> clock.
>   obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
>   obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
> 
>  -obj-y				+= irq.o
>  -obj-y				+= irq-eint.o
>  +# PM
>  +
>  +obj-$(CONFIG_PM)		+= pm.o irq-pm.o sleep.o
> ++obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
> 
>   # DMA support
> 
>   obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
> 
>  -# Device setup
>  +# Device support
> 
>  -obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
>  -obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
>  -obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
>  -obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
>  -obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
>  -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
>  -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
>  +obj-y				+= dev-uart.o
>  +obj-y				+= dev-audio.o
> - obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
> 
>  -# PM
>  +# Device setup
> 
>  -obj-$(CONFIG_PM)		+= pm.o
>  -obj-$(CONFIG_PM)		+= sleep.o
>  -obj-$(CONFIG_PM)		+= irq-pm.o
>  -obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
>  +obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
>  +obj-$(CONFIG_S3C64XX_SETUP_I2C0)	+= setup-i2c0.o
>  +obj-$(CONFIG_S3C64XX_SETUP_I2C1)	+= setup-i2c1.o
>  +obj-$(CONFIG_S3C64XX_SETUP_IDE)		+= setup-ide.o
>  +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)	+= setup-keypad.o
> - obj-$(CONFIG_S3C64XX_SETUP_SDHCI)	+= setup-sdhci.o
>  +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
> ++obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o
> 
>   # Machine support
> 

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5pv210/init.c between commit 3fa754c298b7 ("ARM: 7248/1:
S5PV210: introduce arch/arm/mach-s5pv210/common.[ch]") from the arm tree
and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.

I just removed the file, but the latter patch will probably need applying
in some form to arch/arm/mach-s5pv210//common.c.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/cpu.c between commit 95af214becab ("ARM: 7246/1:
S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
and commit ebc433c2890f ("ARM: S5P64X0: Add HSMMC setup for host
Controller") from the s5p tree.

I just removed the file, but the s5p tree patch may need applying to
arch/arm/mach-s5p64x0/common.c.

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

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/init.c between commit 95af214becab ("ARM: 7246/1:
S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.

I just removed the file, but the latter patch will probably need applying
in some form to arch/arm/mach-s5p64x0/common.c.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5pv210/Makefile between commit 3fa754c298b7 ("ARM: 7248/1:
S5PV210: introduce arch/arm/mach-s5pv210/common.[ch]") from the arm tree
and commit a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from
platform data") from the s5p 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-s5pv210/Makefile
index 4c59186,471df5d..0000000
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -29,14 -27,12 +29,13 @@@ obj-$(CONFIG_MACH_TORBRECK)	+= mach-tor
  # device support
  
  obj-y				+= dev-audio.o
- obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
  
 +obj-y					+= setup-i2c0.o
  obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
  obj-$(CONFIG_S5PV210_SETUP_FIMC)	+= setup-fimc.o
 -obj-$(CONFIG_S5PV210_SETUP_I2C1) 	+= setup-i2c1.o
 -obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o
 +obj-$(CONFIG_S5PV210_SETUP_I2C1)	+= setup-i2c1.o
 +obj-$(CONFIG_S5PV210_SETUP_I2C2)	+= setup-i2c2.o
  obj-$(CONFIG_S5PV210_SETUP_IDE)		+= setup-ide.o
  obj-$(CONFIG_S5PV210_SETUP_KEYPAD)	+= setup-keypad.o
- obj-$(CONFIG_S5PV210_SETUP_SDHCI)	+= setup-sdhci.o
  obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+ obj-$(CONFIG_S5PV210_SETUP_SPI)		+= setup-spi.o

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5pc100/Makefile between commit dd4153d9af67 ("ARM: 7247/1:
S5PC100: introduce arch/arm/mach-s5pc100/common.[ch]") from the arm tree
and commit a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from
platform data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI
platform devices to plat-samsung") and 323d7717455e ("ARM: S5PC100:
Modified files for SPI consolidation work") from the s5p tree.

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

diff --cc arch/arm/mach-s5pc100/Makefile
index c3166c4,291e246..0000000
--- a/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@@ -20,14 -32,4 +20,13 @@@ obj-y				+= dma.
  obj-$(CONFIG_MACH_SMDKC100)	+= mach-smdkc100.o
  
  # device support
 +
  obj-y				+= dev-audio.o
- obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 +
 +obj-y					+= setup-i2c0.o
 +obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
 +obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o
 +obj-$(CONFIG_S5PC100_SETUP_IDE)		+= setup-ide.o
 +obj-$(CONFIG_S5PC100_SETUP_KEYPAD)	+= setup-keypad.o
- obj-$(CONFIG_S5PC100_SETUP_SDHCI)	+= setup-sdhci.o
 +obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
++obj-$(CONFIG_S5PC100_SETUP_SPI)		+= setup-spi.o

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c64xx/Makefile between commit b024043b6d0d ("ARM: 7245/1:
S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
and commits 8f8a8d269bb4 ("ARM: S3C64XX: Add basic cpuidle driver"),
a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from platform
data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI platform
devices to plat-samsung") and 4566c7f7612f ("ARM: S3C64XX: Modified files
for SPI consolidation work") from the s5p tree.

I fixed it up (I think - see below) and can carry the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s3c64xx/Makefile
index f37016c,2244c42..0000000
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -19,29 -19,29 +19,29 @@@ obj-y				+= common.o clock.
  obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
  obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
  
 -obj-y				+= irq.o
 -obj-y				+= irq-eint.o
 +# PM
 +
 +obj-$(CONFIG_PM)		+= pm.o irq-pm.o sleep.o
++obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  
  # DMA support
  
  obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
  
 -# Device setup
 +# Device support
  
 -obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
 -obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 -obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
 -obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
 -obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
 -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
 +obj-y				+= dev-uart.o
 +obj-y				+= dev-audio.o
- obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
  
 -# PM
 +# Device setup
  
 -obj-$(CONFIG_PM)		+= pm.o
 -obj-$(CONFIG_PM)		+= sleep.o
 -obj-$(CONFIG_PM)		+= irq-pm.o
 -obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
 +obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
 +obj-$(CONFIG_S3C64XX_SETUP_I2C0)	+= setup-i2c0.o
 +obj-$(CONFIG_S3C64XX_SETUP_I2C1)	+= setup-i2c1.o
 +obj-$(CONFIG_S3C64XX_SETUP_IDE)		+= setup-ide.o
 +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)	+= setup-keypad.o
- obj-$(CONFIG_S3C64XX_SETUP_SDHCI)	+= setup-sdhci.o
 +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
++obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o
  
  # Machine support
  

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit 774b51f8f826 ("ARM:
s3c64xx: convert to MULTI_IRQ_HANDLER") from the arm tree and commit
8504a3cb5cbc ("ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore")
from the s5p 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/mach-s3c64xx/mach-crag6410.c
index 988ac2e,b2381c1..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/mfd/wm831x/irq.h>
  #include <linux/mfd/wm831x/gpio.h>
  
+ #include <sound/wm1250-ev1.h>
+ 
 +#include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/include/mach/entry-macro.S between commit
4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") from
the arm tree and commit 3a7c87154294 ("ARM: SAMSUNG: Move timer irq numbers
to end of linux irq space") from the s5p tree.

The former removed the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/cpu.c between commit db0d4db22a78 ("ARM: gic: allow
GIC to support non-banked setups") from the  tree and commit fae3f1696b33
("ARM: EXYNOS: Enable conversion of GIC dt irq specifier to linux virq")
from the s5p 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-exynos/cpu.c
index 6e34485,8e09f34..0000000
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -206,6 -231,24 +230,13 @@@ void __init exynos4_init_clocks(int xta
  	exynos4_setup_clocks();
  }
  
 -static void exynos4_gic_irq_fix_base(struct irq_data *d)
 -{
 -	struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
 -
 -	gic_data->cpu_base = S5P_VA_GIC_CPU +
 -			    (gic_bank_offset * smp_processor_id());
 -
 -	gic_data->dist_base = S5P_VA_GIC_DIST +
 -			    (gic_bank_offset * smp_processor_id());
 -}
 -
+ #ifdef CONFIG_OF
+ static const struct of_device_id exynos4_dt_irq_match[] = {
+ 	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+ 	{},
+ };
+ #endif
+ 
  void __init exynos4_init_irq(void)
  {
  	int irq;
@@@ -213,8 -255,17 +244,13 @@@
  
  	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
  
- 	gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ 	if (!of_have_populated_dt())
 -		gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
++		gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ #ifdef CONFIG_OF
+ 	else
+ 		of_irq_init(exynos4_dt_irq_match);
+ #endif
  
 -	gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
 -	gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
 -	gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
 -
  	for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
  
  		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/Kconfig between commit 15e0d9e37c7f ("ARM: pm: let
platforms select cpu_suspend support") from the arm tree and commits
bf856fbb5e10 ("ARM: EXYNOS4: Use generic DMA PL330 driver"), 0da3beadcbed
("ARM: S5P: Make the common S5P PM code conditionally compile") and
e2e13621b267 ("ARM: S5P: Make the sleep code common for S5P series SoCs")
from the s5p tree.

I did the obvious fixup (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-exynos4/Kconfig
index a652735,dd660eb..0000000
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,9 +11,10 @@@ if ARCH_EXYNOS
  
  config CPU_EXYNOS4210
  	bool
- 	select S3C_PL330_DMA
+ 	select SAMSUNG_DMADEV
+ 	select S5P_PM if PM
+ 	select S5P_SLEEP if PM
 +	select ARM_CPU_SUSPEND if PM
  	help
  	  Enable EXYNOS4210 CPU support
  

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
drivers/gpio/Makefile between commit 2428835fc6a5 ("ARM: 7049/1:
mach-sa1100: move SA1100 GPIO driver to GPIO subsystem") from the arm
tree and commit 1b39d5f2cc5c ("gpio/samsung: gpio-samsung.c to support
Samsung GPIOs") from the s5p tree.

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

diff --cc drivers/gpio/Makefile
index 84bc738,62db458..0000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5
  obj-$(CONFIG_GPIO_BT8XX)	+= gpio-bt8xx.o
  obj-$(CONFIG_GPIO_CS5535)	+= gpio-cs5535.o
  obj-$(CONFIG_GPIO_DA9052)	+= gpio-da9052.o
 +obj-$(CONFIG_ARCH_DAVINCI)	+= gpio-davinci.o
  obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
  obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o
  obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o
 +obj-$(CONFIG_MACH_KS8695)	+= gpio-ks8695.o
  obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.o
 +obj-$(CONFIG_ARCH_LPC32XX)	+= gpio-lpc32xx.o
  obj-$(CONFIG_GPIO_MAX730X)	+= gpio-max730x.o
  obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
  obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o
@@@ -41,11 -37,7 +40,8 @@@ obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf8
  obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o
  obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o
  obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
- 
- obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
- obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
- obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o
 +obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
+ obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o
  obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
  obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o
  obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Russell,
> 
Hi Russell and Stephen,

> On Wed, 20 Jul 2011 09:04:41 +0100 Russell King <rmk@arm.linux.org.uk>
wrote:
> >
> > On Wed, Jul 20, 2011 at 11:35:58AM +1000, Stephen Rothwell wrote:
> > > BTW, Russell, commit 29cb3cd208dd above changed the return type of
> > > exynos4_cpu_suspend() from void to int but did not add any return
> > > statement ...
> >
> > That's fine - it ends with a call to panic() which is declared as a
> > function which never returns.  Therefore, exynos4_cpu_suspend() itself
> > never returns.
> 
> Ah, yes.  Unfortunately, the s5p tree changes removed the panic.  So, I
> guess the merge needs some other fixup.
> 
Oops, yes. I fixed it and thanks a lot for pointing out.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Russell,

On Wed, 20 Jul 2011 09:04:41 +0100 Russell King <rmk@arm.linux.org.uk> wrote:
>
> On Wed, Jul 20, 2011 at 11:35:58AM +1000, Stephen Rothwell wrote:
> > BTW, Russell, commit 29cb3cd208dd above changed the return type of
> > exynos4_cpu_suspend() from void to int but did not add any return
> > statement ...
> 
> That's fine - it ends with a call to panic() which is declared as a
> function which never returns.  Therefore, exynos4_cpu_suspend() itself
> never returns.

Ah, yes.  Unfortunately, the s5p tree changes removed the panic.  So, I
guess the merge needs some other fixup.

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

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

Re: linux-next: manual merge of the s5p tree with the arm tree

[Russell King]

On Wed, Jul 20, 2011 at 11:35:58AM +1000, Stephen Rothwell wrote:
> BTW, Russell, commit 29cb3cd208dd above changed the return type of
> exynos4_cpu_suspend() from void to int but did not add any return
> statement ...

That's fine - it ends with a call to panic() which is declared as a
function which never returns.  Therefore, exynos4_cpu_suspend() itself
never returns.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/pm.c between commits e7089da9567f ("ARM: pm:
samsung: move cpu_suspend into C code") and 29cb3cd208dd ("ARM: pm: allow
suspend finisher to return error codes") from the arm tree and commit
f8ab7d1a953b ("ARM: EXYNOS4: Add save/restore for other ARM registers")
from the s5p tree.

I fixed it up (see below) and can carry the fix as necessary.

BTW, Russell, commit 29cb3cd208dd above changed the return type of
exynos4_cpu_suspend() from void to int but did not add any return
statement ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-exynos4/pm.c
index 533c28f,45f7fd3..0000000
--- a/arch/arm/mach-exynos4/pm.c
+++ b/arch/arm/mach-exynos4/pm.c
@@@ -280,37 -216,11 +216,11 @@@ static struct sleep_save exynos4_l2cc_s
  	SAVE_ITEM(S5P_VA_L2CC + L2X0_AUX_CTRL),
  };
  
+ /* For Cortex-A9 Diagnostic and Power control register */
+ static unsigned int save_arm_register[2];
+ 
 -void exynos4_cpu_suspend(unsigned long arg)
 +static int exynos4_cpu_suspend(unsigned long arg)
  {
- 	unsigned long tmp;
- 	unsigned long mask = 0xFFFFFFFF;
- 
- 	/* Setting Central Sequence Register for power down mode */
- 
- 	tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
- 	tmp &= ~(S5P_CENTRAL_LOWPWR_CFG);
- 	__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
- 
- 	/* Setting Central Sequence option Register */
- 
- 	tmp = __raw_readl(S5P_CENTRAL_SEQ_OPTION);
- 	tmp &= ~(S5P_USE_MASK);
- 	tmp |= S5P_USE_STANDBY_WFI0;
- 	__raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
- 
- 	/* Clear all interrupt pending to avoid early wakeup */
- 
- 	__raw_writel(mask, (S5P_VA_GIC_DIST + 0x280));
- 	__raw_writel(mask, (S5P_VA_GIC_DIST + 0x284));
- 	__raw_writel(mask, (S5P_VA_GIC_DIST + 0x288));
- 
- 	/* Disable all interrupt */
- 
- 	__raw_writel(0x0, (S5P_VA_GIC_CPU + 0x000));
- 	__raw_writel(0x0, (S5P_VA_GIC_DIST + 0x000));
- 	__raw_writel(mask, (S5P_VA_GIC_DIST + 0x184));
- 	__raw_writel(mask, (S5P_VA_GIC_DIST + 0x188));
- 
  	outer_flush_all();
  
  	/* issue the standby signal into the pm unit. */

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen wrote:
> 
> Hi Kukjin,
> 
Hi Stephen,

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
> (S5P6440 and S5P6450) initialization support") from the s5p tree.
> 
> The latter removed the file modified by the former.  I did that.
> 
> The appropriate part of the above arm commit needs to be done for the new
> file arch/arm/mach-s5p64x0/include/mach/debug-macro.S .  Unfortunately, I
> am unqualified to do that ...

I fixed it up and finished test on the board also..if any problems, please
let me know.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen wrote:
> 
> Hi Kukjin,
> 
Hi ;-)

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p64x0/mach-smdk6440.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> cae6a3066d19a0c8b69cb25ee42b949ad6fb8c66 ("ARM: S5P64X0: Move SMDK6440
> board file and Add SMDK6450 board file") from the s5p tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  I also
> applied the following merge fix patch:
> 
Ok...thanks, if need any my handling, please let me know.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Oct 2010 10:52:24 +1100
> Subject: [PATCH] s5p: merge fix for removal of fielda from machine_desc
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/mach-s5p64x0/mach-smdk6450.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-
> s5p64x0/mach-smdk6450.c
> index 8e98217..d609f5a 100644
> --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
> @@ -171,8 +171,6 @@ static void __init smdk6450_machine_init(void)
> 
>  MACHINE_START(SMDK6450, "SMDK6450")
>  	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
> -	.phys_io	= S5P6450_PA_UART(0) & 0xfff00000,
> -	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
>  	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
> 
>  	.init_irq	= s5p6450_init_irq,
> --
> 1.7.1
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
> index 59d9f5b,28de0a5..0000000
> --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
> @@@ -135,7 -152,9 +152,7 @@@ static void __init smdk6440_machine_ini
> 
>   MACHINE_START(SMDK6440, "SMDK6440")
>   	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
> - 	.boot_params	= S5P_PA_SDRAM + 0x100,
>  -	.phys_io	= S5P6440_PA_UART(0) & 0xfff00000,
>  -	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
> + 	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
> 
>   	.init_irq	= s5p6440_init_irq,
>   	.map_io		= smdk6440_map_io,

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

RE: linux-next: manual merge of the s5p tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi Stephen :-)

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
> (S5P6440 and S5P6450) initialization support") from the s5p tree.
> 
Hmm...ok...

> The latter removed the file modified by the former.  I did that.
> 
Ok.

> The appropriate part of the above arm commit needs to be done for the new
> file arch/arm/mach-s5p64x0/include/mach/debug-macro.S .  Unfortunately, I
> am unqualified to do that ...

I see...so may I do only fix
arch/arm/mach-s5p64x0/include/mach/debug-macro.S in my tree?
Or...need to fix other things?

Anyway, thanks for your linux-next ;-)

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/mach-smdk6440.c between commit
861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
cae6a3066d19a0c8b69cb25ee42b949ad6fb8c66 ("ARM: S5P64X0: Move SMDK6440
board file and Add SMDK6450 board file") from the s5p tree.

I fixed it up (see below) and can carry the fix as necessary.  I also
applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 10:52:24 +1100
Subject: [PATCH] s5p: merge fix for removal of fielda from machine_desc

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-s5p64x0/mach-smdk6450.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 8e98217..d609f5a 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -171,8 +171,6 @@ static void __init smdk6450_machine_init(void)
 
 MACHINE_START(SMDK6450, "SMDK6450")
 	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-	.phys_io	= S5P6450_PA_UART(0) & 0xfff00000,
-	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
 	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
 
 	.init_irq	= s5p6450_init_irq,
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
index 59d9f5b,28de0a5..0000000
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@@ -135,7 -152,9 +152,7 @@@ static void __init smdk6440_machine_ini
  
  MACHINE_START(SMDK6440, "SMDK6440")
  	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
- 	.boot_params	= S5P_PA_SDRAM + 0x100,
 -	.phys_io	= S5P6440_PA_UART(0) & 0xfff00000,
 -	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
+ 	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
  
  	.init_irq	= s5p6440_init_irq,
  	.map_io		= smdk6440_map_io,

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

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

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
virtual addresses from addruart") from the arm tree and commit
29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
(S5P6440 and S5P6450) initialization support") from the s5p tree.

The latter removed the file modified by the former.  I did that.

The appropriate part of the above arm commit needs to be done for the new
file arch/arm/mach-s5p64x0/include/mach/debug-macro.S .  Unfortunately, I
am unqualified to do that ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/Kconfig between commits c9c6fe5033191d82e1d819105485c795062107fd
("ARM: Remove support for LinkUp Systems L7200 SDP") and
bde28b846e7e0ea6fea78f6ad1c43091fdf4d3e0  ("ARM: 6218/1: Versatile
Express: add support for local timers on CA9X4 daughterboard") from the
arm tree and commit 9d2ef2d3944bb387df220fdeec93abc38b62b627 ("ARM:
S5PV310: Add new Kconfig and Makefiles") from the s5p 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 e39caa8,c797a8b..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1171,9 -1198,9 +1196,9 @@@ config LOCAL_TIMER
  	bool "Use local timer interrupts"
  	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
  		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
- 		ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 -		ARCH_U8500 || ARCH_S5PV310)
++		ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)
  	default y
- 	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)
 -	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310)
++	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310)
  	help
  	  Enable support for local timers on SMP platforms, rather then the
  	  legacy IPI broadcast method.  Local timers allows the system
@@@ -1184,10 -1211,11 +1209,11 @@@ source kernel/Kconfig.preemp
  
  config HZ
  	int
- 	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
 -	default 128 if ARCH_L7200
+ 	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || \
+ 		       ARCH_S5PV210 || ARCH_S5PV310
  	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
  	default AT91_TIMER_HZ if ARCH_AT91
 +	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
  	default 100
  
  config THUMB2_KERNEL