From patchwork Mon Feb 4 11:53:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14487 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 DBADD23F96 for ; Mon, 4 Feb 2013 11:57:01 +0000 (UTC) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by fiordland.canonical.com (Postfix) with ESMTP id 9EE56A19236 for ; Mon, 4 Feb 2013 11:57:01 +0000 (UTC) Received: by mail-vc0-f174.google.com with SMTP id n11so3774844vch.19 for ; Mon, 04 Feb 2013 03:57:01 -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=g6b8IMPRDMcBH4WvocTpQlW2VrD24zQXB1pTNZXs4q8=; b=bD1BDdkTbet4fS9mKepEuvCE6rXLa476tuJqh8fQ8eOrT9QdDoy4j8pUzyPhcndq/+ 6BmRtNgeL23a+/LyvCIXGL1T4mX9vq5Q9cmMJlaDqK7cOsu30G8M4yDL/8lMIqbbrYUj 1h/+rWmSMp74EaNk3gZkJTSEF9GunjrU5+FChU77HGuJ0jAMFzUs4+oRsGUvmAJTGSbD lV9wFhbKt+48eNKsSR30AMFpykZaV2HQuG/df/WQpfEv+oUE94t1XrWTLIlBw5+7Zo2y Dujhj3PXuxa4TSbtIw8qmlsrhLDvZIVImzLInzgMgwMaw690W1uXLLAc3K+h7fihMeUA VbSg== X-Received: by 10.52.66.168 with SMTP id g8mr19459686vdt.27.1359979021181; Mon, 04 Feb 2013 03:57:01 -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 zo8csp83082vec; Mon, 4 Feb 2013 03:57:00 -0800 (PST) X-Received: by 10.180.82.65 with SMTP id g1mr9965025wiy.22.1359979020235; Mon, 04 Feb 2013 03:57:00 -0800 (PST) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mx.google.com with ESMTPS id dm10si3462500wib.123.2013.02.04.03.56.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.181 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.181; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.181 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-f181.google.com with SMTP id hm6so1501921wib.14 for ; Mon, 04 Feb 2013 03:56:59 -0800 (PST) X-Received: by 10.180.102.7 with SMTP id fk7mr9825293wib.27.1359979019854; Mon, 04 Feb 2013 03:56:59 -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.58 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:58 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Lee Jones Subject: [PATCH 38/73] ARM: ux500: regulator: Use device IDs instead of device names Date: Mon, 4 Feb 2013 11:53:53 +0000 Message-Id: <1359978868-28736-39-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: ALoCoQlpWrHFRGvLNQx2G2iKHwq4ZW4HPWaEGi0nlqsJC2idYoZO4p3SSSpPKATfqsbHPKQ/e7gO Remove device name from sensor platform data and change regulator names according to device name. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 6b9c810..8e0679e 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -66,17 +66,17 @@ 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"), /* Synaptics RMI4 Touchscreen device */ REGULATOR_SUPPLY("vdd", "3-004b"), /* L3G4200D Gyroscope device */ - REGULATOR_SUPPLY("vdd", "l3g4200d"), - /* Proximity and Hal sensor device */ - REGULATOR_SUPPLY("vdd", "sensor1p.0"), + REGULATOR_SUPPLY("vdd", "2-0068"), /* Ambient light sensor device */ REGULATOR_SUPPLY("vdd", "3-0029"), /* Pressure sensor device */