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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111124121611.fe102955910da2b603032d07@canb.auug.org.au>
Date:	Thu, 24 Nov 2011 12:16:11 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jamie Iles <jamie@...ieiles.com>, Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the at91 tree with the arm-soc tree

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@...b.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,
  };
  

Content of type "application/pgp-signature" skipped