linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2009-11-16  5:04 Stephen Rothwell
  2009-11-16 10:06 ` Tomi Valkeinen
  2009-11-17  3:08 ` Sid Boyce
  0 siblings, 2 replies; 35+ messages in thread
From: Stephen Rothwell @ 2009-11-16  5:04 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren, linux-omap

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

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2010-02-03  4:29 Stephen Rothwell
  2010-02-03 12:29 ` Grazvydas Ignotas
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2010-02-03  4:29 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Grazvydas Ignotas, Adrian Hunter,
	Tony Lindgren, linux-omap

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
f8b6f704105164eac7c043a48f79c4234e03e4b2 ("omap: Rename hsmmc symbols to
reflect independence from twl4030") from the omap tree and commit
aacb4387a1e6f3b57977375532c6d8e47fcd5652 ("OMAP: pandora: add DSS2
support and related regulators") from the omap_dss2 tree.

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-omap3pandora.c
index 9967b5d,bd3e577..0000000
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -192,7 -193,62 +193,62 @@@ static struct twl4030_keypad_data pando
  	.rep		= 1,
  };
  
+ static struct omap_dss_device pandora_lcd_device = {
+ 	.name			= "lcd",
+ 	.driver_name		= "tpo_td043mtea1_panel",
+ 	.type			= OMAP_DISPLAY_TYPE_DPI,
+ 	.phy.dpi.data_lines	= 24,
+ 	.reset_gpio		= 157,
+ };
+ 
+ static struct omap_dss_device pandora_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 *pandora_dss_devices[] = {
+ 	&pandora_lcd_device,
+ 	&pandora_tv_device,
+ };
+ 
+ static struct omap_dss_board_info pandora_dss_data = {
+ 	.num_devices	= ARRAY_SIZE(pandora_dss_devices),
+ 	.devices	= pandora_dss_devices,
+ 	.default_device	= &pandora_lcd_device,
+ };
+ 
+ static struct platform_device pandora_dss_device = {
+ 	.name		= "omapdss",
+ 	.id		= -1,
+ 	.dev		= {
+ 		.platform_data = &pandora_dss_data,
+ 	},
+ };
+ 
+ static struct regulator_consumer_supply pandora_vcc_lcd_supply = {
+ 	.supply		= "vcc",
+ 	.dev		= &pandora_lcd_device.dev,
+ };
+ 
+ static struct regulator_consumer_supply pandora_vdda_dac_supply = {
+ 	.supply		= "vdda_dac",
+ 	.dev		= &pandora_dss_device.dev,
+ };
+ 
+ static struct regulator_consumer_supply pandora_vdds_supplies[] = {
+ 	{
+ 		.supply		= "vdds_sdi",
+ 		.dev		= &pandora_dss_device.dev,
+ 	},
+ 	{
+ 		.supply		= "vdds_dsi",
+ 		.dev		= &pandora_dss_device.dev,
+ 	},
+ };
+ 
 -static struct twl4030_hsmmc_info omap3pandora_mmc[] = {
 +static struct omap2_hsmmc_info omap3pandora_mmc[] = {
  	{
  		.mmc		= 1,
  		.wires		= 4,

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2010-02-08  6:25 Stephen Rothwell
  2010-02-08  9:29 ` Tomi Valkeinen
  2010-02-10  9:52 ` Hiremath, Vaibhav
  0 siblings, 2 replies; 35+ messages in thread
From: Stephen Rothwell @ 2010-02-08  6:25 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Vaibhav Hiremath, Tony Lindgren,
	linux-omap

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
13560d875d67c06239c82a6148c1b87075701fe9 ("AM3517: Enable basic I2C
Support") from the omap tree and commit
56a3d0235cd50d14d7bd4d45e55d192aa0e78cac ("OMAP: AM3517: Enable DSS2 for
AM3517EVM board") from the omap_dss2 tree.

Juts overlapping additions.   I fixed it up (see below) and can carry the
fix as necessary.

P.S. Tomi, this omap_dss2 commit only has your Acked-by not Signed-off-by.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-am3517evm.c
index a166bcc,54af5f8..0000000
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -33,15 -33,147 +34,156 @@@
  
  #include "mux.h"
  
+ #define LCD_PANEL_PWR		176
+ #define LCD_PANEL_BKLIGHT_PWR	182
+ #define LCD_PANEL_PWM		181
+ 
+ static int lcd_enabled;
+ static int dvi_enabled;
+ 
+ static void __init am3517_evm_display_init(void)
+ {
+ 	int r;
+ 
+ 	omap_mux_init_gpio(LCD_PANEL_PWR, OMAP_PIN_INPUT_PULLUP);
+ 	omap_mux_init_gpio(LCD_PANEL_BKLIGHT_PWR, OMAP_PIN_INPUT_PULLDOWN);
+ 	omap_mux_init_gpio(LCD_PANEL_PWM, OMAP_PIN_INPUT_PULLDOWN);
+ 	/*
+ 	 * Enable GPIO 182 = LCD Backlight Power
+ 	 */
+ 	r = gpio_request(LCD_PANEL_BKLIGHT_PWR, "lcd_backlight_pwr");
+ 	if (r) {
+ 		printk(KERN_ERR "failed to get lcd_backlight_pwr\n");
+ 		return;
+ 	}
+ 	gpio_direction_output(LCD_PANEL_BKLIGHT_PWR, 1);
+ 	/*
+ 	 * Enable GPIO 181 = LCD Panel PWM
+ 	 */
+ 	r = gpio_request(LCD_PANEL_PWM, "lcd_pwm");
+ 	if (r) {
+ 		printk(KERN_ERR "failed to get lcd_pwm\n");
+ 		goto err_1;
+ 	}
+ 	gpio_direction_output(LCD_PANEL_PWM, 1);
+ 	/*
+ 	 * Enable GPIO 176 = LCD Panel Power enable pin
+ 	 */
+ 	r = gpio_request(LCD_PANEL_PWR, "lcd_panel_pwr");
+ 	if (r) {
+ 		printk(KERN_ERR "failed to get lcd_panel_pwr\n");
+ 		goto err_2;
+ 	}
+ 	gpio_direction_output(LCD_PANEL_PWR, 1);
+ 
+ 	printk(KERN_INFO "Display initialized successfully\n");
+ 	return;
+ 
+ err_2:
+ 	gpio_free(LCD_PANEL_PWM);
+ err_1:
+ 	gpio_free(LCD_PANEL_BKLIGHT_PWR);
+ }
+ 
+ static int am3517_evm_panel_enable_lcd(struct omap_dss_device *dssdev)
+ {
+ 	if (dvi_enabled) {
+ 		printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
+ 		return -EINVAL;
+ 	}
+ 	gpio_set_value(LCD_PANEL_PWR, 1);
+ 	lcd_enabled = 1;
+ 
+ 	return 0;
+ }
+ 
+ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev)
+ {
+ 	gpio_set_value(LCD_PANEL_PWR, 0);
+ 	lcd_enabled = 0;
+ }
+ 
+ static struct omap_dss_device am3517_evm_lcd_device = {
+ 	.type			= OMAP_DISPLAY_TYPE_DPI,
+ 	.name			= "lcd",
+ 	.driver_name		= "sharp_lq_panel",
+ 	.phy.dpi.data_lines 	= 16,
+ 	.platform_enable	= am3517_evm_panel_enable_lcd,
+ 	.platform_disable	= am3517_evm_panel_disable_lcd,
+ };
+ 
+ static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev)
+ {
+ 	return 0;
+ }
+ 
+ static void am3517_evm_panel_disable_tv(struct omap_dss_device *dssdev)
+ {
+ }
+ 
+ static struct omap_dss_device am3517_evm_tv_device = {
+ 	.type 			= OMAP_DISPLAY_TYPE_VENC,
+ 	.name 			= "tv",
+ 	.driver_name		= "venc",
+ 	.phy.venc.type		= OMAP_DSS_VENC_TYPE_SVIDEO,
+ 	.platform_enable	= am3517_evm_panel_enable_tv,
+ 	.platform_disable	= am3517_evm_panel_disable_tv,
+ };
+ 
+ static int am3517_evm_panel_enable_dvi(struct omap_dss_device *dssdev)
+ {
+ 	if (lcd_enabled) {
+ 		printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
+ 		return -EINVAL;
+ 	}
+ 	dvi_enabled = 1;
+ 
+ 	return 0;
+ }
+ 
+ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev)
+ {
+ 	dvi_enabled = 0;
+ }
+ 
+ static struct omap_dss_device am3517_evm_dvi_device = {
+ 	.type			= OMAP_DISPLAY_TYPE_DPI,
+ 	.name			= "dvi",
+ 	.driver_name		= "generic_panel",
+ 	.phy.dpi.data_lines	= 24,
+ 	.platform_enable	= am3517_evm_panel_enable_dvi,
+ 	.platform_disable	= am3517_evm_panel_disable_dvi,
+ };
+ 
+ static struct omap_dss_device *am3517_evm_dss_devices[] = {
+ 	&am3517_evm_lcd_device,
+ 	&am3517_evm_tv_device,
+ 	&am3517_evm_dvi_device,
+ };
+ 
+ static struct omap_dss_board_info am3517_evm_dss_data = {
+ 	.num_devices	= ARRAY_SIZE(am3517_evm_dss_devices),
+ 	.devices	= am3517_evm_dss_devices,
+ 	.default_device	= &am3517_evm_lcd_device,
+ };
+ 
+ struct platform_device am3517_evm_dss_device = {
+ 	.name		= "omapdss",
+ 	.id		= -1,
+ 	.dev		= {
+ 		.platform_data	= &am3517_evm_dss_data,
+ 	},
+ };
+ 
 +static int __init am3517_evm_i2c_init(void)
 +{
 +	omap_register_i2c_bus(1, 400, NULL, 0);
 +	omap_register_i2c_bus(2, 400, NULL, 0);
 +	omap_register_i2c_bus(3, 400, NULL, 0);
 +
 +	return 0;
 +}
 +
  /*
   * Board initialization
   */

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2010-05-07  3:43 Stephen Rothwell
  2010-05-10 20:20 ` Tony Lindgren
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2010-05-07  3:43 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Roger Quadros, Jarkko Nikula,
	Tony Lindgren, linux-omap

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e87da74e34ad151e6ae75ebb7a7bf447f02c0004 ("omap: rx51: Add supplies for
the tlv320aic3x codec driver") from the omap tree and commit
a693839eab0292aa234d7a6f48d40389389baebb ("OMAP: RX51: Add "vdds_sdi"
supply voltage for SDI") from the omap_dss2 tree.

Just overlapping additions. 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-rx51-peripherals.c
index 8179d55,020f354..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -287,35 -315,19 +315,48 @@@ static struct regulator_consumer_suppl
  	.dev_name = "mmci-omap-hs.1",
  };
  
 +static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
 +	/* tlv320aic3x analog supplies */
 +	{
 +		.supply		= "AVDD",
 +		.dev_name	= "2-0018",
 +	},
 +	{
 +		.supply		= "DRVDD",
 +		.dev_name	= "2-0018",
 +	},
 +	/* Keep vmmc as last item. It is not iterated for newer boards */
 +	{
 +		.supply		= "vmmc",
 +		.dev_name	= "mmci-omap-hs.1",
 +	},
 +};
 +
 +static struct regulator_consumer_supply rx51_vio_supplies[] = {
 +	/* tlv320aic3x digital supplies */
 +	{
 +		.supply		= "IOVDD",
 +		.dev_name	= "2-0018"
 +	},
 +	{
 +		.supply		= "DVDD",
 +		.dev_name	= "2-0018"
 +	},
 +};
 +
+ #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+ extern struct platform_device rx51_display_device;
+ #endif
+ 
+ static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
+ #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+ 	{
+ 		.supply	= "vdds_sdi",
+ 		.dev	= &rx51_display_device.dev,
+ 	},
+ #endif
+ };
+ 
  static struct regulator_init_data rx51_vaux1 = {
  	.constraints = {
  		.name			= "V28",

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2011-02-17  2:10 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2011-02-17  2:10 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Charulatha V, Govindraj.R,
	Tony Lindgren, linux-omap, Senthilvadivu Guruswamy, Sumit Semwal

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_2430_data.c between commit
1ae9e33689d1346f7f85845857639a923e0796e3 ("OMAP2430: hwmod data: Add
McSPI") from the omap tree and commit
452e3eed4ee6eb8d61b290dad53d48508a3438d8 ("OMAP2430: hwmod data: add DSS
DISPC RFBI VENC") from the omap_dss2 tree.

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/omap_hwmod_2430_data.c
index 60fe4aa,1ef3f3f..0000000
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@@ -18,7 -18,7 +18,8 @@@
  #include <plat/serial.h>
  #include <plat/i2c.h>
  #include <plat/gpio.h>
 +#include <plat/mcspi.h>
+ #include <plat/l3_2xxx.h>
  
  #include "omap_hwmod_common_data.h"
  

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2011-02-17  2:10 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2011-02-17  2:10 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Charulatha V, Govindraj.R,
	Tony Lindgren, linux-omap, Senthilvadivu Guruswamy, Sumit Semwal

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_2420_data.c between commit
eb969b4f07175960fa0b325e6c9bd2093ab49645 ("OMAP2420: hwmod data: Add
McSPI") from the omap tree and commit
e9ca66e751e89d2d5323d809ecb2b54f4e255d8d ("OMAP2420: hwmod data: add DSS
DISPC RFBI VENC") from the omap_dss2 tree.

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/omap_hwmod_2420_data.c
index 7fffd34,21014de..0000000
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@@ -18,8 -18,8 +18,9 @@@
  #include <plat/serial.h>
  #include <plat/i2c.h>
  #include <plat/gpio.h>
 +#include <plat/mcspi.h>
- 
+ #include <plat/l3_2xxx.h>
+ #include <plat/l4_2xxx.h>
  #include "omap_hwmod_common_data.h"
  
  #include "cm-regbits-24xx.h"

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2011-02-18  2:25 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2011-02-18  2:25 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Russell King, Tony Lindgren, linux-omap,
	Senthilvadivu Guruswamy, Sumit Semwal

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 ("ARM: OMAP2: use early init
hook") from the omap tree and commit
603aa0662c26ad05c3ecf1b912f8bebf76dab73d ("OMAP2, 3: DSS2: board files:
replace platform_device_register with omap_display_init()") 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-am3517evm.c
index d0d0f55,548f524..0000000
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -392,11 -384,7 +384,7 @@@ static struct omap_dss_board_info am351
  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_irq(void)
 +static void __init am3517_evm_init_early(void)
  {
  	omap_board_config = am3517_evm_config;
  	omap_board_config_size = ARRAY_SIZE(am3517_evm_config);

^ permalink raw reply	[flat|nested] 35+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the omap tree
@ 2011-02-21  3:16 Stephen Rothwell
  2011-02-21  8:47 ` Tomi Valkeinen
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2011-02-21  3:16 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: linux-next, linux-kernel, Tony Lindgren, linux-omap,
	Senthilvadivu Guruswamy

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commits
e109f171e2f4128e867b3445c369c18830c73751 ("omap3sdp: Fix regulator
mapping for ads7846 TS controller") and
6b272c098f64f0451d2b19bb911d65c6cd11cfc7 ("omap3sdp: clean regulator
supply mapping in board file") from the omap tree and various commits
from the omap_dss2 tree.

So, I have no idea how to fix this up ... Can you guys come to some
argreement about who does what, please?  I have ended up with the merge
fix below, but I have no idea if it will even build, much less be
semantically correct, sorry.

Do these trees get merged separately by Linus?  If not, then maybe I
should just be merging the one tree that combines all the omap work and
let you guys figure out the merge mess.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 76a260f,33ff4f6..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -307,18 -307,9 +307,6 @@@ static struct omap_dss_board_info sdp34
  	.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", "omap_venc");
 -
  static struct omap_board_config_kernel sdp3430_config[] __initdata = {
  };
  
@@@ -402,34 -413,6 +390,35 @@@ static struct twl4030_madc_platform_dat
  	.irq_line	= 1,
  };
  
 +/* regulator consumer mappings */
 +
 +/* ads7846 on SPI */
 +static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = {
 +	REGULATOR_SUPPLY("vcc", "spi1.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {
 +	REGULATOR_SUPPLY("vdda_dac", "omapdss"),
 +};
 +
 +/* VPLL2 for digital video outputs */
 +static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
 +	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
++	REGULATOR_SUPPLY("vdds_dsi", "omap_dsi1"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
 +};
 +
  /*
   * Apply all the fixed voltages since most versions of U-Boot
   * don't bother with that initialization.

^ permalink raw reply	[flat|nested] 35+ messages in thread
end of thread, other threads:[~2011-02-24 21:23 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-16  5:04 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2009-11-16 10:06 ` Tomi Valkeinen
2009-11-16 18:34   ` Tony Lindgren
2009-11-17 10:00     ` Tomi Valkeinen
2009-11-17 23:49       ` Stephen Rothwell
2009-11-17  3:08 ` Sid Boyce
2009-11-17 13:30   ` Is the OMAP patch process badly flawed? Sid Boyce
2009-11-17 13:34     ` Gadiyar, Anand
2009-11-17 14:00       ` Sid Boyce
2009-11-17 14:51         ` Gadiyar, Anand
2009-11-17 21:44           ` Sid Boyce
2009-11-17 22:07     ` Felipe Contreras
2009-11-18  3:20       ` Sid Boyce
  -- strict thread matches above, loose matches on Subject: below --
2010-02-03  4:29 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2010-02-03 12:29 ` Grazvydas Ignotas
2010-02-03 17:12   ` Tony Lindgren
2010-02-04  9:42     ` Tomi Valkeinen
2010-02-08  6:25 Stephen Rothwell
2010-02-08  9:29 ` Tomi Valkeinen
2010-02-08 10:57   ` Stephen Rothwell
2010-02-08 11:43     ` Tomi Valkeinen
2010-02-09 16:52   ` Tony Lindgren
2010-02-10  8:20     ` Tomi Valkeinen
2010-02-10  9:52 ` Hiremath, Vaibhav
2010-05-07  3:43 Stephen Rothwell
2010-05-10 20:20 ` Tony Lindgren
2010-05-12  8:59   ` Tomi Valkeinen
2010-05-14 19:09     ` Tony Lindgren
2010-05-17  7:07       ` Tomi Valkeinen
2011-02-17  2:10 Stephen Rothwell
2011-02-17  2:10 Stephen Rothwell
2011-02-18  2:25 Stephen Rothwell
2011-02-21  3:16 Stephen Rothwell
2011-02-21  8:47 ` Tomi Valkeinen
2011-02-24 21:23   ` Tony Lindgren

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).