linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zumeng Chen <zumeng.chen@gmail.com>
To: tony@atomide.com, jon-hunter@ti.com, grinberg@compulab.co.il,
	linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, khilman@ti.com,
	khasim@ti.com, ajay.gupta@ti.com, hvaibhav@ti.com,
	dmitry.torokhov@gmail.com, linux-input@vger.kernel.org
Subject: [PATCH V2 2/5] ARM: OMAP3EVM: Adding USB internal LDOs board file
Date: Wed, 13 Jun 2012 09:44:07 +0800	[thread overview]
Message-ID: <1339551850-20827-3-git-send-email-zumeng.chen@gmail.com> (raw)
In-Reply-To: <1339551850-20827-1-git-send-email-zumeng.chen@gmail.com>

From: Zumeng Chen <zumeng.chen@windriver.com>

EHCI PHY requires these regulators:
        EVM Rev >=E  --> VAUX2
        EVM Rev < E  --> VUSB1V5, VUSB1V8

Adding USB internal LDOs (vusb1v5 & vusb1v8) and VAUX2 to omap3evm
board file. Also removing vaux2_{1/2/3} supplies as they are not
used on omap3 evm.

But we need not to add vaux2 in twl4030_platform_data since it will
be added conditionally.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
---
 arch/arm/mach-omap2/board-omap3evm.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 0b83d0e..3c91534 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -466,6 +466,30 @@ struct wl12xx_platform_data omap3evm_wlan_data __initdata = {
 };
 #endif
 
+/* VAUX2 for USB */
+static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = {
+	REGULATOR_SUPPLY("VDD_CSIPHY1", "omap3isp"),	/* OMAP ISP */
+	REGULATOR_SUPPLY("VDD_CSIPHY2", "omap3isp"),	/* OMAP ISP */
+	REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"),
+	{
+		.supply		= "vaux2",
+	}
+};
+
+static struct regulator_init_data omap3evm_vaux2 = {
+	.constraints = {
+		.min_uV		= 2800000,
+		.max_uV		= 2800000,
+		.apply_uV	= true,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies		= ARRAY_SIZE(omap3evm_vaux2_supplies),
+	.consumer_supplies		= omap3evm_vaux2_supplies,
+};
+
 static struct twl4030_platform_data omap3evm_twldata = {
 	/* platform_data for children goes here */
 	.keypad		= &omap3evm_kp_data,
@@ -659,6 +683,9 @@ static void __init omap3_evm_init(void)
 	omap_mux_init_gpio(63, OMAP_PIN_INPUT);
 	omap_hsmmc_init(mmc);
 
+	if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
+		omap3evm_twldata.vaux2 = &omap3evm_vaux2;
+
 	omap3_evm_i2c_init();
 
 	omap_display_init(&omap3_evm_dss_data);
-- 
1.7.5.4


  parent reply	other threads:[~2012-06-13  1:44 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-13  1:44 [PATCH v2 0/5] ARM OMAP3530evm misc fixes for linux-omap Zumeng Chen
2012-06-13  1:44 ` [PATCH V2 1/5] ARM: OMAP3EVM: Add NAND flash definition Zumeng Chen
2012-06-13  7:57   ` Igor Grinberg
2012-06-13  8:16     ` Zumeng Chen
2012-06-13  1:44 ` Zumeng Chen [this message]
2012-06-13  8:16   ` [PATCH V2 2/5] ARM: OMAP3EVM: Adding USB internal LDOs board file Igor Grinberg
2012-06-13  8:23     ` Zumeng Chen
2012-06-13  1:44 ` [PATCH V2 3/5] ARM: omap3evm: enable VBUS switch for EHCI tranceiver Zumeng Chen
2012-06-13  1:44 ` [PATCH V2 4/5] ARM: OMAP3EVM: cosmetic fixes for parent clk set Zumeng Chen
2012-06-13  1:44 ` [PATCH V2 5/5] Input: ads7846: set proper debounce time in driver level Zumeng Chen
2012-06-13  7:51   ` Igor Grinberg
2012-06-13  9:03     ` Zumeng Chen
2012-06-13 10:13       ` Igor Grinberg
2012-06-16 13:27         ` Marek Vasut
2012-06-13 12:18   ` Hiremath, Vaibhav
2012-06-14  3:29     ` Zumeng Chen
2012-06-14  4:46     ` Zumeng Chen
2012-06-14  6:31       ` Hiremath, Vaibhav
2012-06-14  6:59         ` Zumeng Chen
2012-06-16  0:15           ` zumeng.chen
2012-06-20  5:28           ` Zumeng Chen
2012-06-14  6:44       ` Igor Grinberg
2012-06-14  7:08         ` Zumeng Chen
2012-06-14  8:06           ` Igor Grinberg
2012-06-14  8:18             ` Zumeng Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339551850-20827-3-git-send-email-zumeng.chen@gmail.com \
    --to=zumeng.chen@gmail.com \
    --cc=ajay.gupta@ti.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=grinberg@compulab.co.il \
    --cc=hvaibhav@ti.com \
    --cc=jon-hunter@ti.com \
    --cc=khasim@ti.com \
    --cc=khilman@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).