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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the usb tree got conflicts in
arch/arm/mach-exynos/mach-nuri.c  and
arch/arm/mach-exynos/mach-universal_c210.c between commits db6856e8d8ab
("ARM: EXYNOS: Add DRM core support for NURI board") and 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
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-exynos/mach-nuri.c
index 17cce18,2c6d701..0000000
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@@ -25,7 -25,7 +25,8 @@@
  #include <linux/mmc/host.h>
  #include <linux/fb.h>
  #include <linux/pwm_backlight.h>
+ #include <linux/platform_data/s3c-hsotg.h>
 +#include <drm/exynos_drm.h>
  
  #include <video/platform_lcd.h>
  #include <media/m5mols.h>
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index 00c1a7b,bc8bf3b..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/i2c-gpio.h>
  #include <linux/i2c/mcs.h>
  #include <linux/i2c/atmel_mxt_ts.h>
+ #include <linux/platform_data/s3c-hsotg.h>
 +#include <drm/exynos_drm.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>

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

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

[Greg KH]

On Mon, May 14, 2012 at 05:47:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got conflicts in
> arch/arm/mach-exynos/mach-nuri.c  and
> arch/arm/mach-exynos/mach-universal_c210.c between commits db6856e8d8ab
> ("ARM: EXYNOS: Add DRM core support for NURI board") and 6dafa4aead1b
> ("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
> from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
> Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
> tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good to me, thanks.

greg k-h

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

[Greg KH]

On Fri, May 18, 2012 at 05:22:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
> ("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
> from the s5p tree and commit 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
> device support for Universal C210 board") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good to me, thanks.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
device support for Universal C210 board") from the usb 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/mach-universal_c210.c
index dd8ec8d4,9be8a07..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/i2c-gpio.h>
  #include <linux/i2c/mcs.h>
  #include <linux/i2c/atmel_mxt_ts.h>
 +#include <drm/exynos_drm.h>
+ #include <linux/platform_data/s3c-hsotg.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>
@@@ -1076,9 -1058,7 +1085,10 @@@ static struct platform_device *universa
  	&s5p_device_onenand,
  	&s5p_device_fimd0,
  	&s5p_device_jpeg,
 +#ifdef CONFIG_DRM_EXYNOS
 +	&exynos_device_drm,
 +#endif
+ 	&s3c_device_usb_hsotg,
  	&s5p_device_mfc,
  	&s5p_device_mfc_l,
  	&s5p_device_mfc_r,

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

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

[Greg KH]

On Wed, May 16, 2012 at 06:03:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
> ("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
> from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
> Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
> tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good to me, thanks.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
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-exynos/mach-universal_c210.c
index dd8ec8d4,bc8bf3b..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/i2c-gpio.h>
  #include <linux/i2c/mcs.h>
  #include <linux/i2c/atmel_mxt_ts.h>
+ #include <linux/platform_data/s3c-hsotg.h>
 +#include <drm/exynos_drm.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>

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

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

[Greg KH]

On Thu, Apr 14, 2011 at 02:15:26PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos4/mach-nuri.c between commit d2a852f78de6 ("ARM:
> EXYNOS4: Add Atmel mXT touchscreen device to the NURI board") from the
> s5p tree and commit 01da92f7f643 ("ARM: EXYNOS4: Add usb ehci device to
> the NURI board") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix looks fine, I knew something like this would happen, and
it would be easy to handle the merge.

thanks,

greg k-h

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos4/mach-nuri.c between commit d2a852f78de6 ("ARM:
EXYNOS4: Add Atmel mXT touchscreen device to the NURI board") from the
s5p tree and commit 01da92f7f643 ("ARM: EXYNOS4: Add usb ehci device to
the NURI board") from the usb 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-exynos4/mach-nuri.c
index d13c5e8,bb5d12f..0000000
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@@ -31,8 -30,8 +31,10 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/sdhci.h>
 +#include <plat/gpio-cfg.h>
 +#include <plat/iic.h>
+ #include <plat/ehci.h>
+ #include <plat/clock.h>
  
  #include <mach/map.h>
  
@@@ -355,7 -282,7 +367,8 @@@ static struct platform_device *nuri_dev
  	&s3c_device_hsmmc3,
  	&s3c_device_wdt,
  	&s3c_device_timer[0],
 +	&s3c_device_i2c3,
+ 	&s5p_device_ehci,
  
  	/* NURI Devices */
  	&nuri_gpio_keys,
@@@ -373,13 -300,13 +386,16 @@@ static void __init nuri_map_io(void
  static void __init nuri_machine_init(void)
  {
  	nuri_sdhci_init();
 +	nuri_tsp_init();
  
  	i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
 +	s3c_i2c3_set_platdata(&i2c3_data);
 +	i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
  	i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
  
+ 	nuri_ehci_init();
+ 	clk_xusbxti.rate = 24000000;
+ 
  	/* Last */
  	platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
  }

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

[Kukjin Kim]

Lars-Peter Clausen wrote:
> 
> On 03/11/2011 07:09 AM, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
> > S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
> > tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
> > controlled UDC pullup implementation") from the usb tree.
> >
> > The latter commit removes the function gta02_udc_command() which is
> > modified by the former.  I removed the function.
> >
> 
> Hi
> 
> Kukjin could you drop 326d05c15f7f ("ARM: S3C2440: Request usb pullup pin
> before using it on GTA02") from your tree? It has been superseded by the
> other
> commit in Gregs tree.
> 
Hi,

Ok, I did it.

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 usb tree with the s5p tree

[Lars-Peter Clausen]

On 03/11/2011 07:09 AM, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
> S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
> tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
> controlled UDC pullup implementation") from the usb tree.
> 
> The latter commit removes the function gta02_udc_command() which is
> modified by the former.  I removed the function.
> 

Hi

Kukjin could you drop 326d05c15f7f ("ARM: S3C2440: Request usb pullup pin
before using it on GTA02") from your tree? It has been superseded by the other
commit in Gregs tree.

- Lars

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
controlled UDC pullup implementation") from the usb tree.

The latter commit removes the function gta02_udc_command() which is
modified by the former.  I removed the function.

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

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