From patchwork Wed May 30 04:47:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9032 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 22BE023E58 for ; Wed, 30 May 2012 04:48:42 +0000 (UTC) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id DB301A185A7 for ; Wed, 30 May 2012 04:48:41 +0000 (UTC) Received: by mail-ob0-f180.google.com with SMTP id un3so10000826obb.11 for ; Tue, 29 May 2012 21:48:41 -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=jRkaGE0AQnjxtkV3av9j9hgWUFaZoOWYMPfP8EKya+c=; b=ewfWdc0+LLKdp2mUu6QLIRuAnWAvQj/fdsFxzMQWvhmWA65RDy8jOdmKQSbLDL57rs 4rSF7Zpobi461FHJpD1xqeTtybzmwoYdtJTQCFsNauAgBU07fRCuf+JdmHraQNeP4hL+ 26Z6YQfIUYYvSjxkH1AfV/jQGqc0iYm8xf/kqd5mOWj6DNoZQ2bzPYiV2D8NRpE2V+o0 esBv3fqprZwKAtTf6UZuVWJCZ7s1CeJqmDRr6x00DKF0F3m10P5MaqU8GnhRPryTmnlC c9hibozXuwuysUUaQRUWdOZAFUWJZQ3lhy/jatX31idTamhG2RwVuRxTmLwNsUPr6Naz FwmA== Received: by 10.50.163.99 with SMTP id yh3mr9277133igb.53.1338353321627; Tue, 29 May 2012 21:48:41 -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.24.148 with SMTP id v20csp170267ibb; Tue, 29 May 2012 21:48:41 -0700 (PDT) Received: by 10.68.230.68 with SMTP id sw4mr2443685pbc.142.1338353320920; Tue, 29 May 2012 21:48:40 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id kg6si23391939pbc.215.2012.05.29.21.48.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:40 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 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-pb0-f50.google.com with SMTP id rr4so7848714pbb.37 for ; Tue, 29 May 2012 21:48:40 -0700 (PDT) Received: by 10.68.194.105 with SMTP id hv9mr45237474pbc.126.1338353320694; Tue, 29 May 2012 21:48:40 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:40 -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 14/22] ARM: ux500: Provide regulator support for SMSC911x via Device Tree Date: Wed, 30 May 2012 12:47:32 +0800 Message-Id: <1338353260-10097-15-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> References: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQn7YyUqgch+R5TP2bIRLyOizOvEzgKO/eRj5/cCVX4n8ZaMks6EW1khvBwmg6pOiwLGXfbL 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 81ff557..d6c05ea 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>; @@ -79,6 +89,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 7e84f45..2d4f661 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 5be3248..74595e1 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2734,6 +2734,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[] = {