From patchwork Thu Mar 21 15:59:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2314611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 46B69DF264 for ; Thu, 21 Mar 2013 16:11:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIi1p-00042n-Me; Thu, 21 Mar 2013 16:07:46 +0000 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIhuc-00011c-0i for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 16:00:24 +0000 Received: by mail-wi0-f172.google.com with SMTP id hj13so615129wib.5 for ; Thu, 21 Mar 2013 09:00:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=jY3jYniBP07IGIfwMqXImIFbkX7fYi1pVaY/BWrbLYQ=; b=CRt+TMAvdPfWljlTJfKnTcQiBSu73kYw7Z7hWZBUEU9cyoprtF9PNo2hburji3NOcs w/97ahmOTE9aAfB3IZvhIZwz/m/2In0GuQfhsk/q4ST1ipWRdNel3isCd+Z57VTMaH4h XVW1QNPZL4oj4dcp7vlEOrpQRYvWzYOh/MSsn1pn/Tb6GAdYBQs+04c+J9w5oULVShU3 3yTUAT6o/jato68bwdkb9Cj96X3w/44iMRZY0VDPA9UJMpQRD4xzG+6NNZolB9l5I84I 1OzjxB6ZliAtOVy1Vw1Td0XimYBGwkEVK6TUykh7m0M/nqRhu4q7ZFk1B4GpB9x1bEnf qPPA== X-Received: by 10.194.92.65 with SMTP id ck1mr18235543wjb.54.1363881613987; Thu, 21 Mar 2013 09:00:13 -0700 (PDT) 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 h10sm6110847wic.8.2013.03.21.09.00.12 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:12 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Subject: [PATCH 08/46] ARM: ux500: Update displays in vaux1 consumer list Date: Thu, 21 Mar 2013 15:59:05 +0000 Message-Id: <1363881583-15234-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> References: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkc1yKeP3J6blcDCPFAPjhdomW4qiyPQlbR8X05MP4/AyjUyy0axmEZKpzD0tGHjHepuw1G X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_120018_242861_2432F640 X-CRM114-Status: GOOD ( 10.53 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 da96298..161edbc7 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 */