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

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

[Stephen Rothwell]

Hi Nicolas,

Today's linux-next merge of the at91 tree got a conflict in:

  arch/arm/boot/dts/at91-tse850-3.dts

between commit:

  e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")

from the arm-soc tree and commit:

  29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")

from the at91 tree.

I fixed it up (I used the arm-soc tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

[Nicolas.Ferre]

> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in:
> 
>  arch/arm/boot/dts/at91-tse850-3.dts
> between commit:
>
> e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the arm-soc tree and commit:
>
>  29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the at91 tree.
>
> I fixed it up (I used the arm-soc tree version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Stephen,

Yes, the use of arm-soc version was the way to go. I now have updated my at91-next tree to match Alexandre's pull-request and hope it is not in conflict anymore.

Thanks for your fix.
Best regards,

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

[Stephen Rothwell]

Hi Nicolas,

Today's linux-next merge of the at91 tree got a conflict in:

  arch/arm/mach-at91/Kconfig

between commit:

  cc7a938f5f30 ("ARM: at91: select CONFIG_ARM_CPU_SUSPEND")

from the arm-soc tree and commit:

  81c0bb0b6ad1 ("ARM: at91: Add armv7m support")

from the at91 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/mach-at91/Kconfig
index cbd959b73654,7497a28a79d1..000000000000
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  menuconfig ARCH_AT91
  	bool "Atmel SoCs"
- 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
+ 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
 +	select ARM_CPU_SUSPEND if PM
  	select COMMON_CLK_AT91
  	select GPIOLIB
  	select PINCTRL

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

[Stephen Rothwell]

Hi Nicolas,

Today's linux-next merge of the at91 tree got a conflict in:

  arch/arm/mach-at91/sama5.c

between commit:

  19c233b79d1a ("ARM: appropriate __init annotation for const data")

from the arm-soc tree and commit:

  a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC")

from the at91 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-at91/sama5.c
index 8fc47630bbc8,90c3c3051ae7..000000000000
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@@ -63,7 -65,8 +65,8 @@@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5
  	.dt_compat	= sama5_dt_board_compat,
  MACHINE_END
  
 -static const char *sama5_alt_dt_board_compat[] __initconst = {
 +static const char *const sama5_alt_dt_board_compat[] __initconst = {
+ 	"atmel,sama5d2",
  	"atmel,sama5d4",
  	NULL
  };

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

[Nicolas Ferre]

Le 31/07/2015 00:38, Stephen Rothwell a écrit :
> Hi Nicolas,
> 
> Today's linux-next merge of the at91 tree got a conflict in:
> 
>   arch/arm/mach-at91/sama5.c
> 
> between commit:
> 
>   19c233b79d1a ("ARM: appropriate __init annotation for const data")
> 
> from the arm-soc tree and commit:
> 
>   a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC")
> 
> from the at91 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The merge is correct. Thanks Stephen!

Bye,
-- 
Nicolas Ferre

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

[Stephen Rothwell]

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

Hi Nicolas,

Today's linux-next merge of the at91 tree got a conflict in
arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
from the arm-soc tree and commit 822cfdfb9511 ("ARM:
multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 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/configs/multi_v7_defconfig
index 492f6289a29e,cf56d4072a90..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -272,9 -278,9 +283,10 @@@ CONFIG_I2C_DAVINCI=
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
+ CONFIG_I2C_AT91=m
  CONFIG_I2C_CADENCE=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
 +CONFIG_I2C_DIGICOLOR=m
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_EXYNOS5=y
  CONFIG_I2C_MV64XXX=y
@@@ -514,8 -523,9 +530,10 @@@ CONFIG_RTC_DRV_TPS6586X=
  CONFIG_RTC_DRV_TPS65910=y
  CONFIG_RTC_DRV_S35390A=m
  CONFIG_RTC_DRV_EM3027=y
 +CONFIG_RTC_DRV_DIGICOLOR=m
  CONFIG_RTC_DRV_PL031=y
+ CONFIG_RTC_DRV_AT91RM9200=m
+ CONFIG_RTC_DRV_AT91SAM9=m
  CONFIG_RTC_DRV_VT8500=y
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y
@@@ -599,14 -613,6 +622,17 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
 +CONFIG_ARM_CRYPTO=y
 +CONFIG_CRYPTO_SHA1_ARM=m
 +CONFIG_CRYPTO_SHA1_ARM_NEON=m
 +CONFIG_CRYPTO_SHA1_ARM_CE=m
 +CONFIG_CRYPTO_SHA2_ARM_CE=m
 +CONFIG_CRYPTO_SHA256_ARM=m
 +CONFIG_CRYPTO_SHA512_ARM=m
 +CONFIG_CRYPTO_AES_ARM=m
 +CONFIG_CRYPTO_AES_ARM_BS=m
 +CONFIG_CRYPTO_AES_ARM_CE=m
 +CONFIG_CRYPTO_GHASH_ARM_CE=m
+ CONFIG_CRYPTO_DEV_ATMEL_AES=m
+ CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+ CONFIG_CRYPTO_DEV_ATMEL_SHA=m

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Nicolas Ferre]

Le 20/05/2015 02:08, Stephen Rothwell a écrit :
> Hi Nicolas,
> 
> Today's linux-next merge of the at91 tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
> multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
> from the arm-soc tree and commit 822cfdfb9511 ("ARM:
> multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix seems perfect: thanks Stephen.

Bye,
-- 
Nicolas Ferre

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the at91 tree got conflicts in
arch/arm/mach-at91/board-cap9adk.c, arch/arm/mach-at91/board-cpu9krea.c,
arch/arm/mach-at91/board-cpuat91.c,
arch/arm/mach-at91/board-snapper9260.c and
arch/arm/mach-at91/include/mach/board.h between commit 84e0cdb0a262
("macb: unify at91 and avr32 platform data") from the arm-soc tree and
commit 1509f4847dd1 ("at91/boards: use -EINVAL for invalid gpio") from
the at91 tree.

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

However, it looks to me that struct macb_platform_data (in
include/linux/platform_data/macb.h) will need its phy_irq_pin members
changed to int as well (which may have other consequences).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-at91/board-cap9adk.c
index af5520c,abadf5d..0000000
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@@ -153,7 -154,8 +154,8 @@@ static struct at91_mmc_data __initdata 
  /*
   * MACB Ethernet device
   */
 -static struct at91_eth_data __initdata cap9adk_macb_data = {
 +static struct macb_platform_data __initdata cap9adk_macb_data = {
+ 	.phy_irq_pin	= -EINVAL,
  	.is_rmii	= 1,
  };
  
diff --cc arch/arm/mach-at91/board-cpu9krea.c
index 04d2b9b,d583805..0000000
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
@@@ -99,7 -100,8 +100,8 @@@ static struct at91_udc_data __initdata 
  /*
   * MACB Ethernet device
   */
 -static struct at91_eth_data __initdata cpu9krea_macb_data = {
 +static struct macb_platform_data __initdata cpu9krea_macb_data = {
+ 	.phy_irq_pin	= -EINVAL,
  	.is_rmii	= 1,
  };
  
diff --cc arch/arm/mach-at91/board-cpuat91.c
index 7a4c82e,e1991d6..0000000
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@@ -82,7 -82,8 +82,8 @@@ static void __init cpuat91_init_early(v
  	at91_set_serial_console(0);
  }
  
 -static struct at91_eth_data __initdata cpuat91_eth_data = {
 +static struct macb_platform_data __initdata cpuat91_eth_data = {
+ 	.phy_irq_pin	= -EINVAL,
  	.is_rmii	= 1,
  };
  
diff --cc arch/arm/mach-at91/board-snapper9260.c
index fbec934,752fd05..0000000
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@@ -63,9 -64,11 +64,11 @@@ static struct at91_udc_data __initdata 
  	.vbus_pin		= SNAPPER9260_IO_EXP_GPIO(5),
  	.vbus_active_low	= 1,
  	.vbus_polled		= 1,
+ 	.pullup_pin		= -EINVAL,
  };
  
 -static struct at91_eth_data snapper9260_macb_data = {
 +static struct macb_platform_data snapper9260_macb_data = {
+ 	.phy_irq_pin	= -EINVAL,
  	.is_rmii	= 1,
  };
  

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

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

[Jamie Iles]

Hi Stephen,

On Thu, Nov 24, 2011 at 12:16:11PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the at91 tree got conflicts in
> arch/arm/mach-at91/board-cap9adk.c, arch/arm/mach-at91/board-cpu9krea.c,
> arch/arm/mach-at91/board-cpuat91.c,
> arch/arm/mach-at91/board-snapper9260.c and
> arch/arm/mach-at91/include/mach/board.h between commit 84e0cdb0a262
> ("macb: unify at91 and avr32 platform data") from the arm-soc tree and
> commit 1509f4847dd1 ("at91/boards: use -EINVAL for invalid gpio") from
> the at91 tree.
> 
> I fixed them up (see below) and can carry the fix as necessary.
> 
> However, it looks to me that struct macb_platform_data (in
> include/linux/platform_data/macb.h) will need its phy_irq_pin members
> changed to int as well (which may have other consequences).

That looks correct to me.  I've just posted a patch to convert 
phy_irq_pin to an int and from inspection that shouldn't break anything 
by itself.

The macb driver doesn't currently use the phy_irq_pin member, but the 
at91_ether driver does and that compares to 0 for no IRQ so the 
assignment of -EINVAL _could_.

Jamie

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

[Nicolas Ferre]

On 11/24/2011 10:56 AM, Jamie Iles :
> Hi Stephen,
> 
> On Thu, Nov 24, 2011 at 12:16:11PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the at91 tree got conflicts in
>> arch/arm/mach-at91/board-cap9adk.c, arch/arm/mach-at91/board-cpu9krea.c,
>> arch/arm/mach-at91/board-cpuat91.c,
>> arch/arm/mach-at91/board-snapper9260.c and
>> arch/arm/mach-at91/include/mach/board.h between commit 84e0cdb0a262
>> ("macb: unify at91 and avr32 platform data") from the arm-soc tree and
>> commit 1509f4847dd1 ("at91/boards: use -EINVAL for invalid gpio") from
>> the at91 tree.
>>
>> I fixed them up (see below) and can carry the fix as necessary.
>>
>> However, it looks to me that struct macb_platform_data (in
>> include/linux/platform_data/macb.h) will need its phy_irq_pin members
>> changed to int as well (which may have other consequences).
> 
> That looks correct to me.  I've just posted a patch to convert 
> phy_irq_pin to an int and from inspection that shouldn't break anything 
> by itself.

Good, I will Acknowledge it.

> The macb driver doesn't currently use the phy_irq_pin member, but the 
> at91_ether driver does and that compares to 0 for no IRQ so the 
> assignment of -EINVAL _could_.

Yes indeed, I have a patch to address that and I send it now. However, I
guess that this will go on top of Jean-Christophe's gpio patch series.

Best regards,
-- 
Nicolas Ferre