Commit 7cab8713 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
parents c3bbcf5d d5e13227

arch/arm/mach-omap2/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -245,3 +245,6 @@ obj-y += $(smc91x-m) $(smc91x-y) 
smsc911x-$(CONFIG_SMSC911X)		:= gpmc-smsc911x.o

obj-y					+= $(smsc911x-m) $(smsc911x-y)

obj-$(CONFIG_ARCH_OMAP4)		+= hwspinlock.o



disp-$(CONFIG_OMAP2_DSS)		:= display.o

obj-y					+= $(disp-m) $(disp-y)

arch/arm/mach-omap2/board-3430sdp.c

+3 −12
Original line number Diff line number Diff line
@@ -307,17 +307,8 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
	.default_device	= &sdp3430_lcd_device,

};



static struct platform_device sdp3430_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &sdp3430_dss_data,

	},

};



static struct platform_device *sdp3430_devices[] __initdata = {

	&sdp3430_dss_device,

};

static struct regulator_consumer_supply sdp3430_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");



static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};
@@ -798,7 +789,7 @@ static void __init omap_3430sdp_init(void) 
{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3430_i2c_init();

	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;

	else

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

+1 −15
Original line number Diff line number Diff line
@@ -378,24 +378,12 @@ static struct omap_dss_board_info am3517_evm_dss_data = { 
	.default_device	= &am3517_evm_lcd_device,

};



static struct platform_device am3517_evm_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data	= &am3517_evm_dss_data,

	},

};



/*

 * Board initialization

 */

static struct omap_board_config_kernel am3517_evm_config[] __initdata = {

};



static struct platform_device *am3517_evm_devices[] __initdata = {

	&am3517_evm_dss_device,

};



static void __init am3517_evm_init_early(void)

{

	omap_board_config = am3517_evm_config;
@@ -498,9 +486,7 @@ static void __init am3517_evm_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);



	am3517_evm_i2c_init();

	platform_add_devices(am3517_evm_devices,

				ARRAY_SIZE(am3517_evm_devices));



	omap_display_init(&am3517_evm_dss_data);

	omap_serial_init();



	/* Configure GPIO for EHCI port */

arch/arm/mach-omap2/board-cm-t35.c

+5 −17
Original line number Diff line number Diff line
@@ -401,14 +401,6 @@ static struct omap_dss_board_info cm_t35_dss_data = { 
	.default_device	= &cm_t35_dvi_device,

};



static struct platform_device cm_t35_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &cm_t35_dss_data,

	},

};



static struct omap2_mcspi_device_config tdo24m_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */
@@ -468,7 +460,7 @@ static void __init cm_t35_init_display(void) 
	msleep(50);

	gpio_set_value(lcd_en_gpio, 1);



	err = platform_device_register(&cm_t35_dss_device);

	err = omap_display_init(&cm_t35_dss_data);

	if (err) {

		pr_err("CM-T35: failed to register DSS device\n");

		goto err_dev_reg;
@@ -495,15 +487,11 @@ static struct regulator_consumer_supply cm_t35_vsim_supply = { 
	.supply			= "vmmc_aux",

};



static struct regulator_consumer_supply cm_t35_vdac_supply = {

	.supply		= "vdda_dac",

	.dev		= &cm_t35_dss_device.dev,

};

static struct regulator_consumer_supply cm_t35_vdac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");



static struct regulator_consumer_supply cm_t35_vdvi_supply = {

	.supply		= "vdvi",

	.dev		= &cm_t35_dss_device.dev,

};

static struct regulator_consumer_supply cm_t35_vdvi_supply =

	REGULATOR_SUPPLY("vdvi", "omapdss");



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

static struct regulator_init_data cm_t35_vmmc1 = {

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

+1 −9
Original line number Diff line number Diff line
@@ -195,14 +195,6 @@ static struct omap_dss_board_info devkit8000_dss_data = { 
	.default_device = &devkit8000_lcd_device,

};



static struct platform_device devkit8000_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &devkit8000_dss_data,

	},

};



static struct regulator_consumer_supply devkit8000_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");
@@ -579,7 +571,6 @@ static void __init omap_dm9000_init(void) 
}



static struct platform_device *devkit8000_devices[] __initdata = {

	&devkit8000_dss_device,

	&leds_gpio,

	&keys_gpio,

	&omap_dm9000_dev,
@@ -801,6 +792,7 @@ static void __init devkit8000_init(void) 
	platform_add_devices(devkit8000_devices,

			ARRAY_SIZE(devkit8000_devices));



	omap_display_init(&devkit8000_dss_data);

	spi_register_board_info(devkit8000_spi_board_info,

	ARRAY_SIZE(devkit8000_spi_board_info));