Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7f314b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux 

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits)
  OMAP: DSS2: Fix omap_dss_probe() error path
  OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
  board-omap3-beagle: add DSS2 support
  OMAP2: DSS: Add missing line for update bg color
  OMAP3630: DSS2: Updating MAX divider value
  OMAP: RX51: Update board defconfig
  OMAP: DSS2: Add ACX565AKM Panel Driver
  OMAP: RX51: Add Touch Controller in SPI board info
  OMAP: RX51: Add LCD Panel support
  OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency
  OMAP: LCD LS037V7DW01: Add Backlight driver support
  OMAP: DSS2: Taal: Fix DSI bus locking problem
  OMAP: DSS2: Taal: add mutex to protect panel data
  OMAP: DSS2: Make partial update width even
  OMAP: DSS2: Fix device disable when driver is not loaded
  OMAP: DSS2: VENC: don't call platform_enable/disable() twice
  OMAP: DSS2: check lock_fb_info() return value
  OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order
  OMAP: DSS2: Use vdds_sdi regulator supply in SDI
  OMAP: DSS2: Remove redundant enable/disable calls from SDI
  ...
parents 2a8ba8f0 fce064cb

arch/arm/configs/am3517_evm_defconfig

+51 −1
Original line number Diff line number Diff line
@@ -774,7 +774,57 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB 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

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

# CONFIG_FB_SYS_FOPS is not set

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# CONFIG_FB_ARMCLCD is not set

# 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_BOOTLOADER_INIT is not set

CONFIG_OMAP2_VRAM=y

CONFIG_OMAP2_VRFB=y

CONFIG_OMAP2_DSS=y

CONFIG_OMAP2_VRAM_SIZE=4

CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y

# CONFIG_OMAP2_DSS_RFBI is not set

CONFIG_OMAP2_DSS_VENC=y

# CONFIG_OMAP2_DSS_SDI is not set

# CONFIG_OMAP2_DSS_DSI is not set

# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set

CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4

CONFIG_FB_OMAP2=y

CONFIG_FB_OMAP2_DEBUG_SUPPORT=y

# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set

CONFIG_FB_OMAP2_NUM_FBS=3



#

# OMAP2/3 Display Device Drivers

#

CONFIG_PANEL_GENERIC=y

# CONFIG_PANEL_SHARP_LS037V7DW01 is not set

CONFIG_PANEL_SHARP_LQ043T1DG01=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

arch/arm/configs/omap3_evm_defconfig

+50 −1
Original line number Diff line number Diff line
@@ -911,7 +911,56 @@ CONFIG_DAB=y 
#

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_FB 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

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

# CONFIG_FB_SYS_FOPS is not set

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# 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_BOOTLOADER_INIT is not set

CONFIG_OMAP2_VRAM=y

CONFIG_OMAP2_VRFB=y

CONFIG_OMAP2_DSS=y

CONFIG_OMAP2_VRAM_SIZE=4

# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set

# CONFIG_OMAP2_DSS_RFBI is not set

CONFIG_OMAP2_DSS_VENC=y

# CONFIG_OMAP2_DSS_SDI is not set

# CONFIG_OMAP2_DSS_DSI is not set

# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set

CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4

CONFIG_FB_OMAP2=y

# CONFIG_FB_OMAP2_DEBUG_SUPPORT is not set

# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set

CONFIG_FB_OMAP2_NUM_FBS=3



#

# OMAP2/3 Display Device Drivers

#

CONFIG_PANEL_GENERIC=y

# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set

CONFIG_PANEL_SHARP_LS037V7DW01=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

arch/arm/configs/rx51_defconfig

+38 −1
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ CONFIG_INPUT_KEYBOARD=y 
# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_KEYBOARD_GPIO=m

CONFIG_KEYBOARD_TWL4030=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set
@@ -809,6 +810,7 @@ CONFIG_INPUT_MISC=y 
# CONFIG_INPUT_POWERMATE is not set

# CONFIG_INPUT_YEALINK is not set

# CONFIG_INPUT_CM109 is not set

CONFIG_INPUT_TWL4030_PWRBUTTON=y

CONFIG_INPUT_UINPUT=m



#
@@ -1110,7 +1112,40 @@ CONFIG_RADIO_ADAPTERS=y 
#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set

CONFIG_FB=y

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y



# Frame buffer hardware drivers

#

CONFIG_OMAP2_VRAM=y

CONFIG_OMAP2_VRFB=y

CONFIG_OMAP2_DSS=y

CONFIG_OMAP2_VRAM_SIZE=0

# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set

# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set

# CONFIG_OMAP2_DSS_DPI is not set

# CONFIG_OMAP2_DSS_RFBI is not set

# CONFIG_OMAP2_DSS_VENC is not set

CONFIG_OMAP2_DSS_SDI=y

# CONFIG_OMAP2_DSS_DSI is not set

# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set

CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0

CONFIG_FB_OMAP2=y

CONFIG_FB_OMAP2_DEBUG_SUPPORT=y

CONFIG_FB_OMAP2_NUM_FBS=3



#

# OMAP2/3 Display Device Drivers

#

# CONFIG_PANEL_GENERIC is not set

# CONFIG_PANEL_SHARP_LS037V7DW01 is not set

# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set

# CONFIG_PANEL_TOPPOLY_TDO35S is not set

# CONFIG_PANEL_TPO_TD043MTEA1 is not set

CONFIG_PANEL_ACX565AKM=y



# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -1127,6 +1162,8 @@ CONFIG_DISPLAY_SUPPORT=y 
#

# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=y

# CONFIG_SOUND_OSS_CORE is not set

CONFIG_SND=y

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o 
obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \

					   board-rx51-sdram.o \

					   board-rx51-peripherals.o \

					   board-rx51-video.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom2.o \

					   board-zoom-peripherals.o \

arch/arm/mach-omap2/board-omap3beagle.c

+75 −26
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include <plat/board.h>

#include <plat/common.h>

#include <plat/display.h>

#include <plat/gpmc.h>

#include <plat/nand.h>

#include <plat/usb.h>
@@ -106,6 +107,77 @@ static struct platform_device omap3beagle_nand_device = { 
	.resource	= &omap3beagle_nand_resource,

};



/* DSS */



static int beagle_enable_dvi(struct omap_dss_device *dssdev)

{

	if (gpio_is_valid(dssdev->reset_gpio))

		gpio_set_value(dssdev->reset_gpio, 1);



	return 0;

}



static void beagle_disable_dvi(struct omap_dss_device *dssdev)

{

	if (gpio_is_valid(dssdev->reset_gpio))

		gpio_set_value(dssdev->reset_gpio, 0);

}



static struct omap_dss_device beagle_dvi_device = {

	.type = OMAP_DISPLAY_TYPE_DPI,

	.name = "dvi",

	.driver_name = "generic_panel",

	.phy.dpi.data_lines = 24,

	.reset_gpio = 170,

	.platform_enable = beagle_enable_dvi,

	.platform_disable = beagle_disable_dvi,

};



static struct omap_dss_device beagle_tv_device = {

	.name = "tv",

	.driver_name = "venc",

	.type = OMAP_DISPLAY_TYPE_VENC,

	.phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,

};



static struct omap_dss_device *beagle_dss_devices[] = {

	&beagle_dvi_device,

	&beagle_tv_device,

};



static struct omap_dss_board_info beagle_dss_data = {

	.num_devices = ARRAY_SIZE(beagle_dss_devices),

	.devices = beagle_dss_devices,

	.default_device = &beagle_dvi_device,

};



static struct platform_device beagle_dss_device = {

	.name          = "omapdss",

	.id            = -1,

	.dev            = {

		.platform_data = &beagle_dss_data,

	},

};



static struct regulator_consumer_supply beagle_vdac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");



static struct regulator_consumer_supply beagle_vdvi_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");



static void __init beagle_display_init(void)

{

	int r;



	r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");

	if (r < 0) {

		printk(KERN_ERR "Unable to get DVI reset GPIO\n");

		return;

	}



	gpio_direction_output(beagle_dvi_device.reset_gpio, 0);

}



#include "sdram-micron-mt46h32m32lf-6.h"



static struct omap2_hsmmc_info mmc[] = {
@@ -117,15 +189,6 @@ static struct omap2_hsmmc_info mmc[] = { 
	{}	/* Terminator */

};



static struct platform_device omap3_beagle_lcd_device = {

	.name		= "omap3beagle_lcd",

	.id		= -1,

};



static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {

	.ctrl_name	= "internal",

};



static struct regulator_consumer_supply beagle_vmmc1_supply = {

	.supply			= "vmmc",

};
@@ -181,16 +244,6 @@ static struct twl4030_gpio_platform_data beagle_gpio_data = { 
	.setup		= beagle_twl_gpio_setup,

};



static struct regulator_consumer_supply beagle_vdac_supply = {

	.supply		= "vdac",

	.dev		= &omap3_beagle_lcd_device.dev,

};



static struct regulator_consumer_supply beagle_vdvi_supply = {

	.supply		= "vdvi",

	.dev		= &omap3_beagle_lcd_device.dev,

};



/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */

static struct regulator_init_data beagle_vmmc1 = {

	.constraints = {
@@ -349,14 +402,8 @@ static struct platform_device keys_gpio = { 
	},

};



static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {

	{ OMAP_TAG_LCD,		&omap3_beagle_lcd_config },

};



static void __init omap3_beagle_init_irq(void)

{

	omap_board_config = omap3_beagle_config;

	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);

	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,

			     mt46h32m32lf6_sdrc_params);

	omap_init_irq();
@@ -367,9 +414,9 @@ static void __init omap3_beagle_init_irq(void) 
}



static struct platform_device *omap3_beagle_devices[] __initdata = {

	&omap3_beagle_lcd_device,

	&leds_gpio,

	&keys_gpio,

	&beagle_dss_device,

};



static void __init omap3beagle_flash_init(void)
@@ -456,6 +503,8 @@ static void __init omap3_beagle_init(void) 
	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);



	beagle_display_init();

}



static void __init omap3_beagle_map_io(void)