linux-next: manual merge of the arm-soc tree with the pinctrl tree

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-samsung.c and drivers/pinctrl/pinctrl-samsung.h
between commit 61dd72613177 ("pinctrl: Add pinctrl-s3c64xx driver") from
the pinctrl tree and commit f67faf487fc1 ("pinctrl: exynos: add
exynos5250 SoC specific data") from the arm-soc tree.

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

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

diff --cc drivers/pinctrl/pinctrl-samsung.c
index 4f54faf,fe7ace2..0000000
--- a/drivers/pinctrl/pinctrl-samsung.c
+++ b/drivers/pinctrl/pinctrl-samsung.c
@@@ -970,11 -948,8 +970,13 @@@ static const struct of_device_id samsun
  		.data = (void *)exynos4210_pin_ctrl },
  	{ .compatible = "samsung,exynos4x12-pinctrl",
  		.data = (void *)exynos4x12_pin_ctrl },
 +#endif
 +#ifdef CONFIG_PINCTRL_S3C64XX
 +	{ .compatible = "samsung,s3c64xx-pinctrl",
 +		.data = s3c64xx_pin_ctrl },
 +#endif
+ 	{ .compatible = "samsung,exynos5250-pinctrl",
+ 		.data = (void *)exynos5250_pin_ctrl },
  	{},
  };
  MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);
diff --cc drivers/pinctrl/pinctrl-samsung.h
index 45f27b4,ee964aa..0000000
--- a/drivers/pinctrl/pinctrl-samsung.h
+++ b/drivers/pinctrl/pinctrl-samsung.h
@@@ -244,6 -237,6 +244,7 @@@ struct samsung_pmx_func 
  /* list of all exported SoC specific data */
  extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];
  extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c64xx_pin_ctrl[];
+ extern struct samsung_pin_ctrl exynos5250_pin_ctrl[];
  
  #endif /* __PINCTRL_SAMSUNG_H */


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

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit e32af8894588
("pinctrl/nomadik: add device tree support") from the pinctrl tree and
commit 6010d40320f8 ("ARM: nomadik: move GPIO and pinctrl to device
tree") from the arm-soc tree.

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

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

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 39c1651,ef21a66..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -2104,7 -1846,11 +2104,11 @@@ static struct pinctrl_desc nmk_pinctrl_
  
  static const struct of_device_id nmk_pinctrl_match[] = {
  	{
+ 		.compatible = "stericsson,nmk-pinctrl-stn8815",
+ 		.data = (void *)PINCTRL_NMK_STN8815,
+ 	},
+ 	{
 -		.compatible = "stericsson,nmk_pinctrl",
 +		.compatible = "stericsson,nmk-pinctrl",
  		.data = (void *)PINCTRL_NMK_DB8500,
  	},
  	{},

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

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

[Linus Walleij]

On Fri, Dec 21, 2012 at 4:38 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Stephen Rothwell wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got conflicts in
>> drivers/pinctrl/pinctrl-exynos5440.c and
>> drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
>> exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
>> pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
>> Staticize pcfgs") from the arm-soc tree.
>>
> Oops, the commit d5fd5da290ce already sent to Linus Torvalds via arm-soc
> tree today. In addition, I applied with Linus Walleij's ack ;-)
>
> Linus Walleij, please drop the patch in your tree. Sorry I didn't notify
> about that when I got the patch from Choi.

OK dropped it, sorry for the delay...

Yours,
Linus Walleij

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

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got conflicts in
> drivers/pinctrl/pinctrl-exynos5440.c and
> drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
> exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
> pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
> Staticize pcfgs") from the arm-soc tree.
> 
Oops, the commit d5fd5da290ce already sent to Linus Torvalds via arm-soc
tree today. In addition, I applied with Linus Walleij's ack ;-)

Linus Walleij, please drop the patch in your tree. Sorry I didn't notify
about that when I got the patch from Choi.

Thanks.

- Kukjin

> The former is a superset of the latter, so I used that (no action
> is required).
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-exynos5440.c and
drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
Staticize pcfgs") from the arm-soc tree.

The former is a superset of the latter, so I used that (no action
is required).

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

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

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

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/26/2012 10:34 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> arch/arm/boot/dts/Makefile between commit ec6754a7b9e9 ("arm: at91:
> dt: at91sam9 add serial pinctrl support") from the pinctrl tree and
> commit e8d623986990 ("Merge branch 'next/soc' into for-next") from
> the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

It seems to be the good way to fix it. Thanks Stephen, bye,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQs0BPAAoJEAf03oE53VmQTXwH/jMoCTS48phBHKB9kYSfPfkY
t9wgFhjTLOrtb/FCuoWxKPs1TN3F4t4zRcr4wRq+HvthuZ74kD+t6icoRxtjYkEB
Az8oSPN95///evy9ber+IbmJFJsxk6m9mcKTaJ6BYz3YhvA2CT0Qz4Z8c+1DbctC
kKsZ9Ngsb/suu/5xloPFdwO1KN5//PqPeOaXjlyY7eZabyIWf2u+OSG9rU0X3jH4
G+HXXW4AagUrxHrMY6CBKroXFj1VpVNyWq4EpQjmjjHuc01ofA5nLNmz99PW2wYX
2Xe/j8gUvE+3kmd+x7AV51NcZoGVDPDOYt0lTwjL6vXUwNxAgisOf5Be+nEA5f4=
=Y2lP
-----END PGP SIGNATURE-----

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/Makefile between commit ec6754a7b9e9 ("arm: at91: dt:
at91sam9 add serial pinctrl support") from the pinctrl tree and commit
e8d623986990 ("Merge branch 'next/soc' into for-next") from the arm-soc
tree.

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

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

diff --cc arch/arm/boot/dts/Makefile
index 204fd3c,cce80e2..0000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -1,38 -1,25 +1,41 @@@
  ifeq ($(CONFIG_OF),y)
  
 -dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \
 -	at91sam9263ek.dtb \
 -	at91sam9g20ek_2mmc.dtb \
 -	at91sam9g20ek.dtb \
 -	at91sam9g25ek.dtb \
 -	at91sam9m10g45ek.dtb \
 -	at91sam9n12ek.dtb \
 -	ethernut5.dtb \
 -	evk-pro3.dtb \
 -	kizbox.dtb \
 -	tny_a9260.dtb \
 -	tny_a9263.dtb \
 -	tny_a9g20.dtb \
 -	usb_a9260.dtb \
 -	usb_a9263.dtb \
 -	usb_a9g20.dtb
 +# Keep at91 dtb files sorted alphabetically for each SoC
 +# rm9200
 +dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
 +# sam9260
 +dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
 +dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
 +dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
 +dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
 +# sam9263
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
 +# sam9g20
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
 +dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
 +# sam9g45
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
 +# sam9n12
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
 +# sam9x5
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
 +
+ dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
+ 	da850-evm.dtb
  dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
  	dove-cubox.dtb \
  	dove-dove-db.dtb

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

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

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/13/2012 05:17 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 784557decc48
> ("tty: atmel_serial: add pinctrl support") from the pinctrl tree
> and commit bcd2360c1ff9 ("arm: at91: move platfarm_data to 
> include/linux/platform_data/atmel.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Stephen, it is the proper merge.

Thanks a lot.

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQogoUAAoJEAf03oE53VmQAt0H/iThKsKe+ag10z9Q8xlO6sqR
dvfFtRQxv7W1xVeRc/RJjnE/thKaa+FMiUfvFoj4Gls6UZD3vAvwatI+kkGY30yp
FbflguygU8OvAQcr/dpVx2tBzsqCk7Xynk+D0+DjlJXukP+JzP+3/tl7Gd0/lct7
nLccb1X0sNwTrvlLJO2WJuOGwFlTU3vO1wkehgic2ozfm3FzsaTLUjkUf6YXOG1N
BoABfHJL0PyNk6iENu26j6ulDPaWrpJe5531hTcJm16X+h2gnmnnjpYw9dTTQ5qO
La0UeqkqTxEUOFmo3cxbS0ryBeQBTmHss61JLVcqnlwApTscefmD4x8G310D7oA=
=mEy6
-----END PGP SIGNATURE-----

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 784557decc48 ("tty:
atmel_serial: add pinctrl support") from the pinctrl tree and commit
bcd2360c1ff9 ("arm: at91: move platfarm_data to
include/linux/platform_data/atmel.h") from the arm-soc tree.

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

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

diff --cc drivers/tty/serial/atmel_serial.c
index 65f891b,5660ec2..0000000
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -39,7 -39,7 +39,8 @@@
  #include <linux/atmel_pdc.h>
  #include <linux/atmel_serial.h>
  #include <linux/uaccess.h>
 +#include <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/atmel.h>
  
  #include <asm/io.h>
  #include <asm/ioctls.h>

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

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

[Linus Walleij]

On Fri, Nov 9, 2012 at 3:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/pinctrl/pinctrl-nomadik.c between commit 241e51ebd3b2
> ("pinctrl/nomadik: make independent of prcmu driver") from the pinctrl
> tree and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into
> for-next") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This looks like the correct fix, thanks a lot Stephen!

Yours,
Linus Walleij

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit 241e51ebd3b2
("pinctrl/nomadik: make independent of prcmu driver") from the pinctrl
tree and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into
for-next") from the arm-soc tree.

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

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

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 33c614e,3ad23fb..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -30,10 -30,23 +30,9 @@@
  #include <linux/pinctrl/pinconf.h>
  /* Since we request GPIOs from ourself */
  #include <linux/pinctrl/consumer.h>
 -/*
 - * For the U8500 archs, use the PRCMU register interface, for the older
 - * Nomadik, provide some stubs. The functions using these will only be
 - * called on the U8500 series.
 - */
 -#ifdef CONFIG_ARCH_U8500
 -#include <linux/mfd/dbx500-prcmu.h>
 -#else
 -static inline u32 prcmu_read(unsigned int reg) {
 -	return 0;
 -}
 -static inline void prcmu_write(unsigned int reg, u32 value) {}
 -static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 -#endif
  #include <linux/platform_data/pinctrl-nomadik.h>
- 
  #include <asm/mach/irq.h>
- 
+ #include <mach/irqs.h>
  #include "pinctrl-nomadik.h"
  
  /*

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

linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ux500/cpu-db8500.c between commit 63c53906312f
("pinctrl/nomadik: move the platform data header") from the pinctrl tree
and commit 4040d10a3d44 ("ARM: ux500: add DB serial number to entropy
pool") from the arm-soc tree.

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

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

diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 87a8f9f,50202a1..0000000
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -18,7 -18,7 +18,8 @@@
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
  #include <linux/platform_data/usb-musb-ux500.h>
 +#include <linux/platform_data/pinctrl-nomadik.h>
+ #include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>

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