From patchwork Mon Feb 4 11:54:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14509 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 8312623F96 for ; Mon, 4 Feb 2013 11:57:49 +0000 (UTC) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by fiordland.canonical.com (Postfix) with ESMTP id 388DCA19236 for ; Mon, 4 Feb 2013 11:57:49 +0000 (UTC) Received: by mail-vc0-f171.google.com with SMTP id p1so3880999vcq.30 for ; Mon, 04 Feb 2013 03:57:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=95KF5XNO8Usjktt4Xso7CAG7I3zreZanwNKJxg89oug=; b=bOLX0QQIf9wIXp4kbfYRU/e8IEzhxV3UtmZA2fPowu1+IC70wsvnF8LpI+fuc0g7TJ 2gbRF1RQfejQuYqkrhWbjKp1QHRO6IUtplsh76jo3/OOP901ely/U/nSNXZpTJ0G1vjz h25+4Mwr8MJGGPWvmCY/gpu2Ef6hibzSRV7MnGgOreScm8m9J2vSLrFIBecCZkcmhYRm Oc4L0a7ZeZIOMmoRFAvDpZ7b/xgHdVtGxmjHovCv+YQyxYdO0m01cP5lv1FRkS3pXiju 6u1UepVM+6cBlrShcFrIR1qPBBAh+eCSGn+f8+eQVPpA9mHBeBeQiiDXXYQO8mVu9Pk3 InvA== X-Received: by 10.52.21.146 with SMTP id v18mr18933331vde.79.1359979068751; Mon, 04 Feb 2013 03:57:48 -0800 (PST) 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.58.252.8 with SMTP id zo8csp83123vec; Mon, 4 Feb 2013 03:57:48 -0800 (PST) X-Received: by 10.180.88.40 with SMTP id bd8mr9763616wib.33.1359979067715; Mon, 04 Feb 2013 03:57:47 -0800 (PST) Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]) by mx.google.com with ESMTPS id we3si5710953wjb.223.2013.02.04.03.57.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:47 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22a; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f170.google.com with SMTP id z53so4682078wey.15 for ; Mon, 04 Feb 2013 03:57:47 -0800 (PST) X-Received: by 10.194.179.34 with SMTP id dd2mr34915705wjc.1.1359979067283; Mon, 04 Feb 2013 03:57:47 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j9sm12937128wia.5.2013.02.04.03.57.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:46 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Mattias Wallin , Lee Jones Subject: [PATCH 60/73] ARM: ux500: regulators: Add LDO USB consumer Date: Mon, 4 Feb 2013 11:54:15 +0000 Message-Id: <1359978868-28736-61-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnw12l9teW1wWquTA+e2AYtMlwVADP7pu7aosdfLbLMl/17l5ri4LUUqZED3Q4Ny/ma0Pnp From: Mattias Wallin This patch makes it possible to control the LDO USB by adding a consumer to the regulator board file. Signed-off-by: Mattias Wallin Signed-off-by: Lee Jones Reviewed-by: Marcus COOPER Reviewed-by: Rickard ANDERSSON Reviewed-by: Jonas ABERG --- arch/arm/mach-ux500/board-mop500-regulators.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index cc6ec35..793bdae 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -155,6 +155,11 @@ static struct regulator_consumer_supply ab8500_vintcore_consumers[] = { REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"), }; +static struct regulator_consumer_supply ab8505_usb_consumers[] = { + /* HS USB OTG physical interface */ + REGULATOR_SUPPLY("v-usb", NULL), +}; + static struct regulator_consumer_supply ab8500_vana_consumers[] = { /* External displays, connector on board, 1v8 power supply */ REGULATOR_SUPPLY("vsmps2", "mcde.0"), @@ -915,6 +920,18 @@ struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = { .num_consumer_supplies = ARRAY_SIZE(ab8500_vintcore_consumers), .consumer_supplies = ab8500_vintcore_consumers, }, + /* supply for LDO USB */ + [AB8505_LDO_USB] = { + .constraints = { + .name = "V-USB", + .valid_ops_mask = REGULATOR_CHANGE_STATUS | + REGULATOR_CHANGE_MODE, + .valid_modes_mask = REGULATOR_MODE_NORMAL | + REGULATOR_MODE_IDLE, + }, + .num_consumer_supplies = ARRAY_SIZE(ab8505_usb_consumers), + .consumer_supplies = ab8505_usb_consumers, + }, /* supply for U8500 CSI-DSI, VANA LDO */ [AB8505_LDO_ANA] = { .constraints = {