From patchwork Mon Feb 4 11:53:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14464 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 70E3F23F96 for ; Mon, 4 Feb 2013 11:56:18 +0000 (UTC) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by fiordland.canonical.com (Postfix) with ESMTP id 24252A18F62 for ; Mon, 4 Feb 2013 11:56:18 +0000 (UTC) Received: by mail-ve0-f182.google.com with SMTP id ox1so3783991veb.27 for ; Mon, 04 Feb 2013 03:56:17 -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=6AQky6gwKK+dpS4y17XuXt1KBIMeDb3V/b57LIowHk0=; b=OYgYuVg9kTbK/yS1ed9anHrch/D2gg9nwZtzjif+wactr8VPcq38DJq79mkQ9N6aU6 71TXjeMbfJAvvN3Ahp4cAZLMdI2888j45vOETJe3o5d9WILKapmwHOdcwhKNYQR9KGLF yOk73i+1AcTGSg50J08JNm57uNuBwp+o/dz3e4Fe1q3ekqRFiFmT82OI4ASlopjGaNwc 460Iiij77iiUGw6axZ6pNhvzdoh16tz8tGAenDOwBwQQwtF/qyTJgg4KjTA8+bKaPZde R+ID3fWk70CVk/Hx46GW5jAfY9aJ0q9R3jRHElt+gtXJkyFGPrrSqkfhpcFV2fpz18TN 0S7Q== X-Received: by 10.220.219.77 with SMTP id ht13mr21467558vcb.66.1359978977661; Mon, 04 Feb 2013 03:56:17 -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 zo8csp83038vec; Mon, 4 Feb 2013 03:56:16 -0800 (PST) X-Received: by 10.180.79.201 with SMTP id l9mr7117007wix.20.1359978976393; Mon, 04 Feb 2013 03:56:16 -0800 (PST) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by mx.google.com with ESMTPS id o10si5719802wjx.82.2013.02.04.03.56.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.173 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.173; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.173 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-wi0-f173.google.com with SMTP id hq4so2766389wib.6 for ; Mon, 04 Feb 2013 03:56:15 -0800 (PST) X-Received: by 10.195.13.11 with SMTP id eu11mr34708440wjd.39.1359978975895; Mon, 04 Feb 2013 03:56:15 -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.56.14 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:15 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Lee Jones Subject: [PATCH 15/73] ARM: ux500: Update displays in vaux1 consumer list Date: Mon, 4 Feb 2013 11:53:30 +0000 Message-Id: <1359978868-28736-16-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: ALoCoQlvyJ/8/WCPMm2xyDmYxL1uWh2jRP/HnIoMW5pVrmeROzBqQ9yWYEUA1/zQezIfDf4nEZyx Add 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs). Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 76f5f4c..c58fc86 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -53,8 +53,12 @@ struct regulator_init_data tps61052_regulator = { }; static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { - /* External displays, connector on board 2v5 power supply */ - REGULATOR_SUPPLY("vaux12v5", "mcde.0"), + /* Main display, u8500 R3 uib */ + REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"), + /* Main display, u8500 uib and ST uib */ + REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.0"), + /* Secondary display, ST uib */ + REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.1"), /* SFH7741 proximity sensor */ REGULATOR_SUPPLY("vcc", "gpio-keys.0"), /* BH1780GLS ambient light sensor */