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: 15482 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 4AA0D23E14 for ; Thu, 21 Mar 2013 16:00:16 +0000 (UTC) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by fiordland.canonical.com (Postfix) with ESMTP id 0C81DA197E7 for ; Thu, 21 Mar 2013 16:00:15 +0000 (UTC) Received: by mail-vc0-f176.google.com with SMTP id ib11so2390817vcb.21 for ; Thu, 21 Mar 2013 09:00:15 -0700 (PDT) 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=jY3jYniBP07IGIfwMqXImIFbkX7fYi1pVaY/BWrbLYQ=; b=TF5rUHHDz4Gvw3u//naEf1U60nlsjP9MxG4ltfTMo2RgU5BeJIOAkJxbg8t5wQxmjY FU61wB/HesFjWshuZ0SSMQPXynm1phiB7gvXlsUSduA8/Lliy/oKuXD3YUoEiAdcEiqB HMiswqXaVIkMkTt5wvPzGl78Oo19BtYapdoAm3QbfputEu2UNwUEidm/MZ/PZm6+5wJp L99qvp6j3kDYe9ohydyQHInsU+PvGr2f3uJWstxLGASQgyFo5f7jI1tZFeSEZ672TmBM 7+mlMHlj0Z4uByXkL8EDmcSfGHqUqUFBZ5osLynCDWgBwHHZlz8Ak4ZS/EX7RdjF81PX zouQ== X-Received: by 10.220.106.14 with SMTP id v14mr14106018vco.2.1363881615581; Thu, 21 Mar 2013 09:00:15 -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.58.233.198 with SMTP id ty6csp66757vec; Thu, 21 Mar 2013 09:00:14 -0700 (PDT) X-Received: by 10.194.63.109 with SMTP id f13mr18363839wjs.11.1363881614387; Thu, 21 Mar 2013 09:00:14 -0700 (PDT) Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]) by mx.google.com with ESMTPS id cp10si2614307wjb.153.2013.03.21.09.00.14 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:14 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::236 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::236; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::236 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-f182.google.com with SMTP id t57so2517991wey.13 for ; Thu, 21 Mar 2013 09:00:14 -0700 (PDT) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones 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: ALoCoQmu0J6Sv12jCdWD0ZsgzDcoeb9ZDBqlVqdIzEC6mVwdEtvMW3YBkQEylaZu+GvTlrVPHRNm 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 */