Re: linux-next: manual merge of the omap_dss2 tree with the omaptree

[Tony Lindgren]

 * Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx> [091116 02:06]:
> On Mon, 2009-11-16 at 06:04 +0100, ext Stephen Rothwell wrote:
> > Hi Tomi,
> > 
> > Today's linux-next merge of the omap_dss2 tree got a conflict in
> > arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
> > omap_dss2 tree.
> > 
> > I just used the version from the omap tree as I can't figure out anything
> > better, sorry.
> 
> Tony, 
> 
> These patches in omap tree seem to cause the conflicts. Are they stable,
> ie. can I cherry pick them to my for-next tree, and put my patches on
> top of them?

Well all the board-*.c patches are still getting shuffled around
this week a bit.. But we can resolve it with the following two changes.
 
> b30dcf5f37023d591caee80c233bf33706bc5a21
> omap3: 3430sdp: Enable Linux Regulator framework

This we should keep as it is, but the commit ID may still change.
 
> fc89f86e06c11b8828ce1d6c669f724877546c03
> ARM: OMAP3: Fix 3430SDP defconfig

I've cut out the CONFIG_FB related sections of this patch in
omap for-next branch, see below.

Tomi, please update your patch by leaving out the now unnecessary
TWL4030 and regulator sections. See also the updated version of
your patch attached.

And please also use the static commit id I gave earlier, the other
patches can still change a bit.

Regards,

Tony
I've left out the CONFIG_FB related parts of
"ARM: OMAP3: Fix 3430SDP defconfig" and renamed
it to "ARM: OMAP3: Update 3430SDP defconfig".

--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
@@ -940,11 +940,9 @@ CONFIG_TWL4030_CORE=y
 # Graphics support
 #
 # CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -965,13 +963,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
 CONFIG_FB_OMAP=y
-# CONFIG_FB_OMAP_LCD_VGA is not set
 # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
-# CONFIG_FB_OMAP_LCD_MIPID is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -979,7 +972,11 @@ CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 #
 # Display device support
 #
-# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_DISPLAY_SUPPORT=y
+
+#
+# Display hardware drivers
+#
 
 #
 # Console display driver support