linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Herbert,

Today's linux-next merge of the crypto tree got conflicts in
arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c
between commit b024a0c80435 ("ARM: ux500: move top level platform devices
in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be
("mach-ux500: crypto - core support for CRYP/HASH module") from the
crypto tree.

Just context changes.  I fixed them up (see below) and can carry the
fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-ux500/board-mop500.c
index 77d03c1,4e9bcd6..0000000
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@ -595,13 -627,19 +635,19 @@@ static struct amba_pl011_data uart2_pla
  #endif
  };
  
 -static void __init mop500_uart_init(void)
 +static void __init mop500_uart_init(struct device *parent)
  {
 -	db8500_add_uart0(&uart0_plat);
 -	db8500_add_uart1(&uart1_plat);
 -	db8500_add_uart2(&uart2_plat);
 +	db8500_add_uart0(parent, &uart0_plat);
 +	db8500_add_uart1(parent, &uart1_plat);
 +	db8500_add_uart2(parent, &uart2_plat);
  }
  
+ static void __init u8500_cryp1_hash1_init(void)
+ {
+ 	db8500_add_cryp1(&u8500_cryp1_platform_data);
+ 	db8500_add_hash1(&u8500_hash1_platform_data);
+ }
+ 
  static struct platform_device *snowball_platform_devs[] __initdata = {
  	&snowball_led_dev,
  	&snowball_key_dev,
@@@ -621,10 -657,8 +667,12 @@@ static void __init mop500_init_machine(
  
  	mop500_pins_init();
  
+ 	u8500_cryp1_hash1_init();
+ 
 +	/* FIXME: parent of ab8500 should be prcmu */
 +	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
 +		mop500_platform_devs[i]->dev.parent = parent;
 +
  	platform_add_devices(mop500_platform_devs,
  			ARRAY_SIZE(mop500_platform_devs));
  
diff --cc arch/arm/mach-ux500/board-u5500.c
index 0ff4be7,865aaf8..0000000
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@@ -135,19 -182,13 +182,20 @@@ static void __init u5500_uart_init(stru
  
  static void __init u5500_init_machine(void)
  {
 -	u5500_init_devices();
 +	struct device *parent = NULL;
 +	int i;
 +
 +	parent = u5500_init_devices();
  	nmk_config_pins(u5500_pins, ARRAY_SIZE(u5500_pins));
 -	u5500_i2c_init();
 -	u5500_sdi_init();
 -	u5500_uart_init();
 +
 +	u5500_i2c_init(parent);
 +	u5500_sdi_init(parent);
 +	u5500_uart_init(parent);
+ 	u5500_cryp1_hash1_init();
  
 +	for (i = 0; i < ARRAY_SIZE(u5500_platform_devices); i++)
 +		u5500_platform_devices[i]->dev.parent = parent;
 +
  	platform_add_devices(u5500_platform_devices,
  		ARRAY_SIZE(u5500_platform_devices));
  }

Attachment: pgpUV5LhH6PQq.pgp
Description: PGP signature