linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-04  4:06 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  4:06 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-ldp.c between commit 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") from the arm-soc tree and commit
14dd72d8542f ("OMAP: LDP: Port the display driver to new DSS2") from the
omap_dss2 tree.

Just context changes.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-ldp.c
index 5797917,689ed49..0000000
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -179,19 -183,103 +183,97 @@@ static inline void __init ldp_init_smsc
  	gpmc_smsc911x_init(&smsc911x_cfg);
  }
  
- static struct platform_device ldp_lcd_device = {
- 	.name		= "ldp_lcd",
- 	.id		= -1,
+ /* LCD */
+ 
+ static int ldp_backlight_gpio;
+ static int ldp_lcd_enable_gpio;
+ 
+ #define LCD_PANEL_RESET_GPIO		55
+ #define LCD_PANEL_QVGA_GPIO		56
+ 
+ static int ldp_panel_enable_lcd(struct omap_dss_device *dssdev)
+ {
+ 	if (gpio_is_valid(ldp_lcd_enable_gpio))
+ 		gpio_direction_output(ldp_lcd_enable_gpio, 1);
+ 	if (gpio_is_valid(ldp_backlight_gpio))
+ 		gpio_direction_output(ldp_backlight_gpio, 1);
+ 
+ 	return 0;
+ }
+ 
+ static void ldp_panel_disable_lcd(struct omap_dss_device *dssdev)
+ {
+ 	if (gpio_is_valid(ldp_lcd_enable_gpio))
+ 		gpio_direction_output(ldp_lcd_enable_gpio, 0);
+ 	if (gpio_is_valid(ldp_backlight_gpio))
+ 		gpio_direction_output(ldp_backlight_gpio, 0);
+ }
+ 
+ static struct panel_generic_dpi_data ldp_panel_data = {
+ 	.name			= "nec_nl2432dr22-11b",
+ 	.platform_enable	= ldp_panel_enable_lcd,
+ 	.platform_disable	= ldp_panel_disable_lcd,
  };
  
- static struct omap_lcd_config ldp_lcd_config __initdata = {
- 	.ctrl_name	= "internal",
+ static struct omap_dss_device ldp_lcd_device = {
+ 	.name			= "lcd",
+ 	.driver_name		= "generic_dpi_panel",
+ 	.type			= OMAP_DISPLAY_TYPE_DPI,
+ 	.phy.dpi.data_lines	= 18,
+ 	.data			= &ldp_panel_data,
+ };
+ 
+ static struct omap_dss_device *ldp_dss_devices[] = {
+ 	&ldp_lcd_device,
  };
  
- static struct omap_board_config_kernel ldp_config[] __initdata = {
- 	{ OMAP_TAG_LCD,		&ldp_lcd_config },
+ static struct omap_dss_board_info ldp_dss_data = {
+ 	.num_devices	= ARRAY_SIZE(ldp_dss_devices),
+ 	.devices	= ldp_dss_devices,
+ 	.default_device	= &ldp_lcd_device,
  };
  
+ static void __init ldp_display_init(void)
+ {
+ 	int r;
+ 
+ 	static struct gpio gpios[] __initdata = {
+ 		{LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"},
+ 		{LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"},
+ 	};
+ 
+ 	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+ 	if (r) {
+ 		pr_err("Cannot request LCD GPIOs, error %d\n", r);
+ 		return;
+ 	}
+ 
+ 	omap_display_init(&ldp_dss_data);
+ }
+ 
 -static void __init omap_ldp_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
 -
+ static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
+ {
+ 	int r;
+ 
+ 	struct gpio gpios[] = {
+ 		{gpio + 7 , GPIOF_OUT_INIT_LOW, "LCD ENABLE"},
+ 		{gpio + 15, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT"},
+ 	};
+ 
+ 	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+ 	if (r) {
+ 		pr_err("Cannot request LCD GPIOs, error %d\n", r);
+ 		ldp_backlight_gpio = -EINVAL;
+ 		ldp_lcd_enable_gpio = -EINVAL;
+ 		return r;
+ 	}
+ 
+ 	ldp_backlight_gpio = gpio + 15;
+ 	ldp_lcd_enable_gpio = gpio + 7;
+ 
+ 	return 0;
+ }
+ 
  static struct twl4030_gpio_platform_data ldp_gpio_data = {
  	.gpio_base	= OMAP_MAX_GPIO_LINES,
  	.irq_base	= TWL4030_GPIO_IRQ_BASE,

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2014-05-30  3:38 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2014-05-30  3:38 UTC (permalink / raw)
  To: Tomi Valkeinen, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Pekon Gupta, Sathya Prakash M R

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

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/boot/dts/am437x-gp-evm.dts between commit 99ffa6425f1b ("ARM:
dts: am437x-gp-evm: add support for parallel NAND flash") from the
arm-soc tree and commit 0186bec97131 ("ARM: dts: am437x-gp-evm: add LCD
data") from the omap_dss2 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/am437x-gp-evm.dts
index c25d15837ce9,3acccdf258e9..000000000000
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@@ -151,26 -193,46 +193,67 @@@
  		>;
  	};
  
 +	nand_flash_x8: nand_flash_x8 {
 +		pinctrl-single,pins = <
 +			0x26c(PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* spi2_cs0.gpio/eMMCorNANDsel */
 +			0x0  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */
 +			0x4  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */
 +			0x8  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */
 +			0xc  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad3.gpmc_ad3 */
 +			0x10 (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad4.gpmc_ad4 */
 +			0x14 (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad5.gpmc_ad5 */
 +			0x18 (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad6.gpmc_ad6 */
 +			0x1c (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad7.gpmc_ad7 */
 +			0x70 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_wait0.gpmc_wait0 */
 +			0x74 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_wpn.gpmc_wpn */
 +			0x7c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_csn0.gpmc_csn0  */
 +			0x90 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_advn_ale.gpmc_advn_ale */
 +			0x94 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_oen_ren.gpmc_oen_ren */
 +			0x98 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_wen.gpmc_wen */
 +			0x9c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_be0n_cle.gpmc_be0n_cle */
 +		>;
 +	};
++
+ 	dss_pins: dss_pins {
+ 		pinctrl-single,pins = <
+ 			0x020 (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 8 -> DSS DATA 23 */
+ 			0x024 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x028 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x02c (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x030 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x034 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x038 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+ 			0x03c (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 15 -> DSS DATA 16 */
+ 			0x0a0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS DATA 0 */
+ 			0x0a4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0a8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0ac (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0b0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0b4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0b8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0bc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0c0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0c4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0c8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0cc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0d0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0d4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0d8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+ 			0x0dc (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS DATA 15 */
+ 			0x0e0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS VSYNC */
+ 			0x0e4 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS HSYNC */
+ 			0x0e8 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS PCLK */
+ 			0x0ec (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS AC BIAS EN */
+ 
+ 		>;
+ 	};
+ 
+ 	lcd_pins: lcd_pins {
+ 		pinctrl-single,pins = <
+ 			/* GPIO 5_8 to select LCD / HDMI */
+ 			0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
+ 		>;
+ 	};
  };
  
  &i2c0 {
@@@ -273,89 -330,16 +356,103 @@@
  	phy-mode = "rgmii";
  };
  
 +&elm {
 +	status = "okay";
 +};
 +
 +&gpmc {
 +	status = "okay";
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&nand_flash_x8>;
 +	ranges = <0 0 0 0x01000000>;	/* minimum GPMC partition = 16MB */
 +	nand@0,0 {
 +		reg = <0 0 4>;		/* device IO registers */
 +		ti,nand-ecc-opt = "bch8";
 +		ti,elm-id = <&elm>;
 +		nand-bus-width = <8>;
 +		gpmc,device-width = <1>;
 +		gpmc,sync-clk-ps = <0>;
 +		gpmc,cs-on-ns = <0>;
 +		gpmc,cs-rd-off-ns = <40>;
 +		gpmc,cs-wr-off-ns = <40>;
 +		gpmc,adv-on-ns = <0>;
 +		gpmc,adv-rd-off-ns = <25>;
 +		gpmc,adv-wr-off-ns = <25>;
 +		gpmc,we-on-ns = <0>;
 +		gpmc,we-off-ns = <20>;
 +		gpmc,oe-on-ns = <3>;
 +		gpmc,oe-off-ns = <30>;
 +		gpmc,access-ns = <30>;
 +		gpmc,rd-cycle-ns = <40>;
 +		gpmc,wr-cycle-ns = <40>;
 +		gpmc,wait-pin = <0>;
 +		gpmc,wait-on-read;
 +		gpmc,wait-on-write;
 +		gpmc,bus-turnaround-ns = <0>;
 +		gpmc,cycle2cycle-delay-ns = <0>;
 +		gpmc,clk-activation-ns = <0>;
 +		gpmc,wait-monitoring-ns = <0>;
 +		gpmc,wr-access-ns = <40>;
 +		gpmc,wr-data-mux-bus-ns = <0>;
 +		/* MTD partition table */
 +		/* All SPL-* partitions are sized to minimal length
 +		 * which can be independently programmable. For
 +		 * NAND flash this is equal to size of erase-block */
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		partition@0 {
 +			label = "NAND.SPL";
 +			reg = <0x00000000 0x00040000>;
 +		};
 +		partition@1 {
 +			label = "NAND.SPL.backup1";
 +			reg = <0x00040000 0x00040000>;
 +		};
 +		partition@2 {
 +			label = "NAND.SPL.backup2";
 +			reg = <0x00080000 0x00040000>;
 +		};
 +		partition@3 {
 +			label = "NAND.SPL.backup3";
 +			reg = <0x000c0000 0x00040000>;
 +		};
 +		partition@4 {
 +			label = "NAND.u-boot-spl-os";
 +			reg = <0x00100000 0x00080000>;
 +		};
 +		partition@5 {
 +			label = "NAND.u-boot";
 +			reg = <0x00180000 0x00100000>;
 +		};
 +		partition@6 {
 +			label = "NAND.u-boot-env";
 +			reg = <0x00280000 0x00040000>;
 +		};
 +		partition@7 {
 +			label = "NAND.u-boot-env.backup1";
 +			reg = <0x002c0000 0x00040000>;
 +		};
 +		partition@8 {
 +			label = "NAND.kernel";
 +			reg = <0x00300000 0x00700000>;
 +		};
 +		partition@9 {
 +			label = "NAND.file-system";
 +			reg = <0x00a00000 0x1f600000>;
 +		};
 +	};
 +};
++
+ &dss {
+ 	status = "ok";
+ 
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&dss_pins>;
+ 
+ 	port {
+ 		dpi_out: endpoint@0 {
+ 			remote-endpoint = <&lcd_in>;
+ 			data-lines = <24>;
+ 		};
+ 	};
+ };

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-11  5:50 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-11  5:50 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

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

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@canb.auug.org.au

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@nokia.com> */
 -	.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 #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-04  4:06 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  4:06 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-2430sdp.c between commit 8f5b5a41ebc7 ("ARM:
OMAP: Introduce SoC specific early_init") from the arm-soc tree and
commit 6e896ff9ff1c ("OMAP: 2420SDP: Port the display driver to new
DSS2") from the omap_dss2 tree.

Just context changes.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-2430sdp.c
index 4191743,6ab6350..0000000
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -137,10 -192,12 +192,6 @@@ static inline void board_smc91x_init(vo
  
  #endif
  
- static struct omap_board_config_kernel sdp2430_config[] __initdata = {
- 	{OMAP_TAG_LCD, &sdp2430_lcd_config},
- };
- 
 -static void __init omap_2430sdp_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
 -
  static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {
  	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
  };

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-04  4:06 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  4:06 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-apollon.c between commit a4ca9dbe44a1 ("ARM:
OMAP: Move omap2_init_common_devices out of init_early") from the arm-soc
tree and commit da91e89fb2f5 ("OMAP: Apollon: Port the display driver to
new DSS2") from the omap_dss2 tree.

Just context changes.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-apollon.c
index 868d5f0,d8eb81e..0000000
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -265,14 -262,34 +262,28 @@@ static struct omap_usb_config apollon_u
  	.pins[0]	= 6,
  };
  
- static struct omap_lcd_config apollon_lcd_config __initdata = {
- 	.ctrl_name	= "internal",
+ static struct panel_generic_dpi_data apollon_panel_data = {
+ 	.name			= "apollon",
  };
  
- static struct omap_board_config_kernel apollon_config[] __initdata = {
- 	{ OMAP_TAG_LCD,		&apollon_lcd_config },
+ static struct omap_dss_device apollon_lcd_device = {
+ 	.name			= "lcd",
+ 	.driver_name		= "generic_dpi_panel",
+ 	.type			= OMAP_DISPLAY_TYPE_DPI,
+ 	.phy.dpi.data_lines	= 18,
+ 	.data			= &apollon_panel_data,
+ };
+ 
+ static struct omap_dss_device *apollon_dss_devices[] = {
+ 	&apollon_lcd_device,
+ };
+ 
+ static struct omap_dss_board_info apollon_dss_data = {
+ 	.num_devices	= ARRAY_SIZE(apollon_dss_devices),
+ 	.devices	= apollon_dss_devices,
+ 	.default_device	= &apollon_lcd_device,
  };
  
 -static void __init omap_apollon_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
 -
  static struct gpio apollon_gpio_leds[] __initdata = {
  	{ LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */
  	{ LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6  */
@@@ -334,7 -349,8 +343,9 @@@ static void __init omap_apollon_init(vo
  	 */
  	platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices));
  	omap_serial_init();
 +	omap_sdrc_init(NULL, NULL);
+ 
+ 	omap_display_init(&apollon_dss_data);
  }
  
  static void __init omap_apollon_map_io(void)

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-04  4:06 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  4:06 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

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 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") 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.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/arm/mach-omap2/board-h4.c
index f0ddc27,f7c09de..0000000
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -285,10 -301,12 +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();
@@@ -364,8 -379,9 +372,10 @@@ 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)

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-10-04  4:06 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  4:06 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51.c between commit 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") from the arm-soc tree and commit
cc9347352509 ("OMAP: RX51: Remove unused old omapfb stuff") from the
omap_dss2 tree.

Just context changes.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-rx51.c
index e2e958a,9e7dde6..0000000
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -79,29 -79,15 +79,6 @@@ static struct cpuidle_params rx51_cpuid
  	{7505 + 15274, 484329, 1},
  };
  
- static struct omap_lcd_config rx51_lcd_config = {
- 	.ctrl_name	= "internal",
- };
- 
- static struct omap_fbmem_config rx51_fbmem0_config = {
- 	.size = 752 * 1024,
- };
- 
- static struct omap_fbmem_config rx51_fbmem1_config = {
- 	.size = 752 * 1024,
- };
- 
- static struct omap_fbmem_config rx51_fbmem2_config = {
- 	.size = 752 * 1024,
- };
- 
- static struct omap_board_config_kernel rx51_config[] = {
- 	{ OMAP_TAG_FBMEM,	&rx51_fbmem0_config },
- 	{ OMAP_TAG_FBMEM,	&rx51_fbmem1_config },
- 	{ OMAP_TAG_FBMEM,	&rx51_fbmem2_config },
- 	{ OMAP_TAG_LCD,		&rx51_lcd_config },
- };
- 
 -static void __init rx51_init_early(void)
 -{
 -	struct omap_sdrc_params *sdrc_params;
 -
 -	omap2_init_common_infrastructure();
 -	sdrc_params = nokia_get_sdram_timings();
 -	omap2_init_common_devices(sdrc_params, sdrc_params);
 -}
 -
  extern void __init rx51_peripherals_init(void);
  
  #ifdef CONFIG_OMAP_MUX
@@@ -118,17 -104,9 +95,15 @@@ static struct omap_musb_board_data musb
  
  static void __init rx51_init(void)
  {
 +	struct omap_sdrc_params *sdrc_params;
 +
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
- 	omap_board_config = rx51_config;
- 	omap_board_config_size = ARRAY_SIZE(rx51_config);
  	omap3_pm_init_cpuidle(rx51_cpuidle_params);
  	omap_serial_init();
 +
 +	sdrc_params = nokia_get_sdram_timings();
 +	omap_sdrc_init(sdrc_params, sdrc_params);
 +
  	usb_musb_init(&musb_board_data);
  	rx51_peripherals_init();
  

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
  2011-09-21  2:58 Stephen Rothwell
@ 2011-09-21  6:12 ` Tomi Valkeinen
  0 siblings, 0 replies; 9+ messages in thread
From: Tomi Valkeinen @ 2011-09-21  6:12 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tony Lindgren, Arnd Bergmann

Hi Stephen,

On Wed, 2011-09-21 at 12:58 +1000, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-4430sdp.c between commit 8f5b5a41ebc7 ("ARM:
> OMAP: Introduce SoC specific early_init") from the arm-soc tree and
> commit 58282610da02 ("OMAP: 4430SDP: Remove unneeded lcd config") from
> the omap_dss2 tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, looks correct.

 Tomi

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
@ 2011-09-21  2:58 Stephen Rothwell
  2011-09-21  6:12 ` Tomi Valkeinen
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-09-21  2:58 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren, Arnd Bergmann

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-4430sdp.c between commit 8f5b5a41ebc7 ("ARM:
OMAP: Introduce SoC specific early_init") from the arm-soc tree and
commit 58282610da02 ("OMAP: 4430SDP: Remove unneeded lcd config") from
the omap_dss2 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f3917b3,d3874a6..0000000
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -381,14 -379,12 +379,6 @@@ static struct platform_device *sdp4430_
  	&sdp4430_vbat,
  };
  
- static struct omap_lcd_config sdp4430_lcd_config __initdata = {
- 	.ctrl_name	= "internal",
- };
- 
- static struct omap_board_config_kernel sdp4430_config[] __initdata = {
- 	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },
- };
- 
 -static void __init omap_4430sdp_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
 -
  static struct omap_musb_board_data musb_board_data = {
  	.interface_type		= MUSB_INTERFACE_UTMI,
  	.mode			= MUSB_OTG,

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-05-30  3:38 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-04  4:06 linux-next: manual merge of the omap_dss2 tree with the arm-soc tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-05-30  3:38 Stephen Rothwell
2011-10-11  5:50 Stephen Rothwell
2011-10-04  4:06 Stephen Rothwell
2011-10-04  4:06 Stephen Rothwell
2011-10-04  4:06 Stephen Rothwell
2011-10-04  4:06 Stephen Rothwell
2011-09-21  2:58 Stephen Rothwell
2011-09-21  6:12 ` Tomi Valkeinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).