From patchwork Thu Mar 21 15:59:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2314841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 469A0400E6 for ; Thu, 21 Mar 2013 16:23:08 +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 1UIiDa-0002xs-FM; Thu, 21 Mar 2013 16:19:57 +0000 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIhvA-0001Hf-Lk for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 16:00:54 +0000 Received: by mail-wi0-f174.google.com with SMTP id hi8so6751778wib.1 for ; Thu, 21 Mar 2013 09:00:50 -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=+SgZMKpsXgQKQZKpHZbfWj0fRfKlLiPMUeCIgAwdcIc=; b=SFmVzSTR9j4Tt9J13Exmpa4Jf947QO8rcpFOgkZd2TLJWJJs2L3guBImO49MB+Aks0 Y0vcFP2DT+7ITyE7tnHhqd+5rPe42RHvtI91aYaQD3STuNL3AXGs8S+GP/c9Zxlz0Srg o+aRugfZXrEr3EgXCOVj+tunxpvTP1U8cQyWuQXcVDIIpdLmWpuhxv2SbApmUB7uxCn7 8/VM+cmZ2nPFw+uDpHvvOqnOuf467rGlKC9/29eB/TXNi971/h+mCcv2Nq457gL4CKxS WflnE+OX+YFwgDG36ZIaZDvEb11kqFraItCFDa79ixx4wMlCwvy9npMa2bIX9AmyTOi1 N5NQ== X-Received: by 10.194.120.195 with SMTP id le3mr3912123wjb.46.1363881650213; Thu, 21 Mar 2013 09:00:50 -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.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:49 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Subject: [PATCH 24/46] ARM: ux500: regulator: Add accelerometer and fix magnetometer supply device ID Date: Thu, 21 Mar 2013 15:59:21 +0000 Message-Id: <1363881583-15234-25-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: ALoCoQnWmt+t87Z1zCIULvdUM/ySqMZvKw2dxpRW1t6GhwbkVaATj7AmKrOaDzPhtRIbVCMpm0/l X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_120053_199551_A0B29915 X-CRM114-Status: GOOD ( 10.54 ) 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 This patch adds the LSM303DLHC Accelerometer to the list of VAUX1 consumers, as well as amending the already added LSM303DLHC Magnetometer's device ID. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 4f880df..8161519 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -67,8 +67,10 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { REGULATOR_SUPPLY("vcc", "2-0029"), /* lsm303dlh accelerometer */ REGULATOR_SUPPLY("vdd", "3-0018"), + /* lsm303dlhc accelerometer */ + REGULATOR_SUPPLY("vdd", "2-0019"), /* lsm303dlh magnetometer */ - REGULATOR_SUPPLY("vdd", "3-001e"), + REGULATOR_SUPPLY("vdd", "2-001e"), /* Rohm BU21013 Touchscreen devices */ REGULATOR_SUPPLY("avdd", "3-005c"), REGULATOR_SUPPLY("avdd", "3-005d"),