From patchwork Fri Jun 24 14:37:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jassi Brar X-Patchwork-Id: 2297 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BDF7223F08 for ; Fri, 24 Jun 2011 14:37:37 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 85AB5A1817A for ; Fri, 24 Jun 2011 14:37:37 +0000 (UTC) Received: by qwb8 with SMTP id 8so2106753qwb.11 for ; Fri, 24 Jun 2011 07:37:37 -0700 (PDT) Received: by 10.229.137.149 with SMTP id w21mr2605793qct.59.1308926256920; Fri, 24 Jun 2011 07:37:36 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.230.139 with SMTP id jm11cs50061qcb; Fri, 24 Jun 2011 07:37:35 -0700 (PDT) Received: by 10.236.161.4 with SMTP id v4mr4872143yhk.355.1308926255204; Fri, 24 Jun 2011 07:37:35 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id b63si15455603yhe.29.2011.06.24.07.37.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 07:37:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of jaswinder.singh@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of jaswinder.singh@linaro.org) smtp.mail=jaswinder.singh@linaro.org Received: by pzk2 with SMTP id 2so2146186pzk.37 for ; Fri, 24 Jun 2011 07:37:33 -0700 (PDT) Received: by 10.68.12.133 with SMTP id y5mr1791648pbb.104.1308926253443; Fri, 24 Jun 2011 07:37:33 -0700 (PDT) Received: from localhost.localdomain ([122.167.86.144]) by mx.google.com with ESMTPS id g8sm2106985pba.5.2011.06.24.07.37.29 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 07:37:32 -0700 (PDT) From: Jassi Brar To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, balbi@ti.com, tony@atomide.com, Jassi Brar Subject: [PATCH] OMAP4: PANDA, SDP: Fix EHCI regulator supply Date: Fri, 24 Jun 2011 20:07:20 +0530 Message-Id: <1308926240-13888-1-git-send-email-jaswinder.singh@linaro.org> X-Mailer: git-send-email 1.7.4.1 VUSB is a fixed level line and hence have no set_voltage callback in regulator ops, but has apply_uV set to true. As a result it fails to register with the regulator core. Remove setting apply_uV. Also, assign name to VUSB supply, without which regulator core fails to find it and assigns the default 'dummy' regulator to the ehci-omap device. Signed-off-by: Jassi Brar --- arch/arm/mach-omap2/board-4430sdp.c | 6 +++++- arch/arm/mach-omap2/board-omap4panda.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 63de2d3..1ec60be 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -504,16 +504,20 @@ static struct regulator_init_data sdp4430_vdac = { }, }; +static struct regulator_consumer_supply sdp4430_vusb_supply = + REGULATOR_SUPPLY("hsusb0", "ehci-omap.0"); + static struct regulator_init_data sdp4430_vusb = { .constraints = { .min_uV = 3300000, .max_uV = 3300000, - .apply_uV = true, .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, + .num_consumer_supplies = 1, + .consumer_supplies = &sdp4430_vusb_supply, }; static struct regulator_init_data sdp4430_clk32kg = { diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index d4f9879..7429f7e 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -362,16 +362,20 @@ static struct regulator_init_data omap4_panda_vdac = { }, }; +static struct regulator_consumer_supply omap4_panda_vusb_supply = + REGULATOR_SUPPLY("hsusb0", "ehci-omap.0"); + static struct regulator_init_data omap4_panda_vusb = { .constraints = { .min_uV = 3300000, .max_uV = 3300000, - .apply_uV = true, .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, + .num_consumer_supplies = 1, + .consumer_supplies = &omap4_panda_vusb_supply, }; static struct regulator_init_data omap4_panda_clk32kg = {