From patchwork Fri May 18 08:39:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8794 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 20FED23E23 for ; Fri, 18 May 2012 08:39:40 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id E3DD4A1819F for ; Fri, 18 May 2012 08:39:39 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so3204914ggn.11 for ; Fri, 18 May 2012 01:39:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=o7jTM8BM5GsbL8Z438Q34Llk7rQwBWjO9raHVeXgJ+Q=; b=YI0xtU1LknRFCC0RLGcg+LXk/3u8VONgjstEMOcE3y8phgVFMYSdPWOMwUBGL9dBcS GIQH0SvjI3H7+NeANEAfQ5dYL7nrP58qO//66TAU3wWJNmrvX6oS8t/jP6PvIq+4g5OX +Ti5FnbJ+EwDXhZf2nVgxQudWaQ63uln+teWr6P8XPv2JJKTxHVcN7vCcixWxgi6QK2l D96oa41ap8vv6ASbj9EU3o+l104XT3a9x2z/xia+Jm0GbWLW8xvC+hUtjNyYRe08LI+U vrM9Ti79YwBeJMoSlmtZC7NbyhHfisySK9JVohAks1vnB5uDLjCAiPOFiUuzTONXvGPW +zXA== Received: by 10.50.195.234 with SMTP id ih10mr7959830igc.0.1337330379491; Fri, 18 May 2012 01:39:39 -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.231.35.72 with SMTP id o8csp86449ibd; Fri, 18 May 2012 01:39:38 -0700 (PDT) Received: by 10.180.103.202 with SMTP id fy10mr13275404wib.17.1337330378342; Fri, 18 May 2012 01:39:38 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id n12si10545928wee.106.2012.05.18.01.39.37 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 May 2012 01:39:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 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-f178.google.com with SMTP id hn6so2212726wib.13 for ; Fri, 18 May 2012 01:39:37 -0700 (PDT) Received: by 10.180.87.35 with SMTP id u3mr25986682wiz.11.1337330377739; Fri, 18 May 2012 01:39:37 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id bn9sm63091322wib.5.2012.05.18.01.39.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 May 2012 01:39:36 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com Cc: Lee Jones Subject: [PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree Date: Fri, 18 May 2012 09:39:08 +0100 Message-Id: <1337330355-17747-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337330355-17747-1-git-send-email-lee.jones@linaro.org> References: <1337330355-17747-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlMBhjyKc222TsCbWXETouBpD5ztMPyVtgYbQJufHxiA1KprDBM9Cu4snB0DcSLKjI0kVAo This patch adds a fixed regulator for use by the SMSC911x Ethernet chip driver into the db8500 Device Tree. It also references other regulators required by the same device. Signed-off-by: Lee Jones --- arch/arm/boot/dts/snowball.dts | 13 +++++++++++++ arch/arm/configs/u8500_defconfig | 1 + drivers/mfd/db8500-prcmu.c | 1 + 3 files changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 15ee419..ae3c367 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -20,6 +20,16 @@ reg = <0x00000000 0x20000000>; }; + en_3v3_reg: en_3v3 { + compatible = "regulator-fixed"; + regulator-name = "en-3v3-fixed-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpios = <&gpio0 26 0x4>; // 26 + startup-delay-us = <5000>; + enable-active-high; + }; + gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; @@ -81,6 +91,9 @@ reg = <0 0x10000>; interrupts = <12 0x1>; interrupt-parent = <&gpio4>; + vdd33a-supply = <&en_3v3_reg>; + vddvario-supply = <&db8500_vape_reg>; + reg-shift = <1>; reg-io-width = <2>; diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index c6973c5..440152a 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -75,6 +75,7 @@ CONFIG_AB5500_CORE=y CONFIG_AB8500_CORE=y CONFIG_REGULATOR=y CONFIG_REGULATOR_AB8500=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_HID_SUPPORT is not set CONFIG_USB_GADGET=y CONFIG_AB8500_USB=y diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index d534449..40204e1 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = { REGULATOR_SUPPLY("vcore", "uart2"), REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"), REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"), + REGULATOR_SUPPLY("vddvario", "smsc911x.0"), }; static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {