linux-next: manual merge of the omap_dss2 tree with the arm-soctree

[Stephen Rothwell]

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-h4.c between commit be7324605873 ("ARM: OMAP2+:
Remove custom init_irq for remaining boards") from the arm-soc tree and
commit cbf1455bfc9f ("OMAP: H4: Port the display driver to new DSS2")
from the omap_dss2 tree.

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

diff --cc arch/arm/mach-omap2/board-h4.c
index a65effe,f7c09de..0000000
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -285,10 -301,17 +300,6 @@@ static struct omap_usb_config h4_usb_co
  	.hmc_mode	= 0x00,		/* 0:dev|otg 1:disable 2:disable */
  };
  
- static struct omap_board_config_kernel h4_config[] __initdata = {
- 	{ OMAP_TAG_LCD,		&h4_lcd_config },
- };
- 
 -static void __init omap_h4_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
 -
 -static void __init omap_h4_init_irq(void)
 -{
 -	omap2_init_irq();
 -}
 -
  static struct at24_platform_data m24c01 = {
  	.byte_len	= SZ_1K / 8,
  	.page_size	= 16,
@@@ -359,17 -379,24 +367,19 @@@ static void __init omap_h4_init(void
  	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
  	omap2_usbfs_init(&h4_usb_config);
  	omap_serial_init();
 +	omap_sdrc_init(NULL, NULL);
  	h4_init_flash();
+ 
+ 	omap_display_init(&h4_dss_data);
  }
  
 -static void __init omap_h4_map_io(void)
 -{
 -	omap2_set_globals_242x();
 -	omap242x_map_common_io();
 -}
 -
  MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
  	/* Maintainer: Paul Mundt <paul.mundt@xxxxxxxxx> */
 -	.boot_params	= 0x80000100,
 +	.atag_offset	= 0x100,
  	.reserve	= omap_reserve,
 -	.map_io		= omap_h4_map_io,
 -	.init_early	= omap_h4_init_early,
 -	.init_irq	= omap_h4_init_irq,
 +	.map_io		= omap242x_map_io,
 +	.init_early	= omap2420_init_early,
 +	.init_irq	= omap2_init_irq,
  	.init_machine	= omap_h4_init,
  	.timer		= &omap2_timer,
  MACHINE_END

Attachment: pgp00000.pgp
Description: PGP signature