From patchwork Wed Feb 6 10:53:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14588 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 9B52C2423C for ; Wed, 6 Feb 2013 10:55:09 +0000 (UTC) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by fiordland.canonical.com (Postfix) with ESMTP id 4CF20A187D8 for ; Wed, 6 Feb 2013 10:55:09 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id fl17so748107vcb.13 for ; Wed, 06 Feb 2013 02:55:08 -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=1nNvWl3Z//cIh+Yhln1vQ51UYrDCqgpNnsk6N8akMFg=; b=AQitvDHFi8Urmy0852E/cgDV737Xk6/FuDLXGFGkSvCtGoZ4qgnaCtkg4Abq5nCgM1 Sd3QQKry6NxqYSE+M8yYS/vD2alRmdN1CagALW+jnQ8VJFLhqk+2rmqKHwlSuyg8kA7t N9oX2b7srgcVUhTMBAuaO1tChUbDoVYNoO5VGyX9FUJroNYVXtJWTo9WfzuVkf8DVXeR nrYnytMx0RTyc51cZXhdA4eZMRfRvqD1K19IFW6b6nTImxuwsZi8axOz0jIrQfdotQsJ DlFriVpttCyPDSq9lg4jUMSlvtvAwc/fyVyU7L4SuIgAYRmI8I/P4DOYJt5AP6M+lflz w5Ng== X-Received: by 10.52.27.50 with SMTP id q18mr28448528vdg.20.1360148108824; Wed, 06 Feb 2013 02:55:08 -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 zo8csp12940vec; Wed, 6 Feb 2013 02:55:08 -0800 (PST) X-Received: by 10.180.80.197 with SMTP id t5mr3970368wix.22.1360148090230; Wed, 06 Feb 2013 02:54:50 -0800 (PST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id b5si512345wiy.46.2013.02.06.02.54.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 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-f172.google.com with SMTP id ez12so5379204wid.17 for ; Wed, 06 Feb 2013 02:54:49 -0800 (PST) X-Received: by 10.194.78.207 with SMTP id d15mr48695314wjx.52.1360148087918; Wed, 06 Feb 2013 02:54: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 be1sm2406649wib.10.2013.02.06.02.54.47 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:47 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list Date: Wed, 6 Feb 2013 10:53:31 +0000 Message-Id: <1360148051-7560-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlLjIaISrD1DRGv5Wm/X0NMmCHFZdYwKcU/6LQN8a782LcaC70VgfW8PwpAjKn/HXRh1gdU 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 7cb52e6..dbbeb20 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -54,8 +54,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 */