From patchwork Wed May 30 04:47:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9033 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 F32A723E58 for ; Wed, 30 May 2012 04:48:45 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id C2D04A185A3 for ; Wed, 30 May 2012 04:48:45 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so3248783yen.11 for ; Tue, 29 May 2012 21:48:45 -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=zaFmHRWPjSSRNH+VojlzMyK4EEcvf/ullzjL+4F7Mjo=; b=oSdwegFSf41/aUs6zPC0WbGeW737TDEClxrlD4QSdAz7aiT60zqSPD8sVX0aGeEJ5X JlNukYnF2w3ksrx0TBYYVnBCTBwtaTNnnlIPLfZ7q0C+f+911hJ51y4GUmyFjOSYlNoh dQ4RQGtQ1/IBezB3HzSXN9RbEPw3shluX7xMeGcnL0ZY9j0r2CqY2kEknWuGD3SQl4Cy RTdw+sAcojOR9QGsIqWNcOkVHj9WtQbANGsa78gWP9p5UpC7j7Liq0DxOH24GQ1JAgtw Dzn9DnUmc75iZGExcyyS82BKhEJ9J2gfHDZoksw7PdA4mhsQMG0db8NvpiXoQN2Nsi/q 1Ftg== Received: by 10.42.56.80 with SMTP id y16mr6145767icg.48.1338353325239; Tue, 29 May 2012 21:48:45 -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 v20csp170269ibb; Tue, 29 May 2012 21:48:44 -0700 (PDT) Received: by 10.68.232.103 with SMTP id tn7mr45289326pbc.86.1338353324364; Tue, 29 May 2012 21:48:44 -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.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:44 -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:44 -0700 (PDT) Received: by 10.68.221.72 with SMTP id qc8mr45546867pbc.63.1338353324043; Tue, 29 May 2012 21:48:44 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:42 -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 15/22] ARM: ux500: Add support for ab8500 regulators into the Device Tree Date: Wed, 30 May 2012 12:47:33 +0800 Message-Id: <1338353260-10097-16-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: ALoCoQmBCLi79j663ADRlcyupYo4qur0lYrCVUAY2Bp4qgRuxunMrF9oYYCfWwrWubaUokm/xIwi Here we supply the information required to setup regulators successfully on Snowball and other db8500 variants which use the ab8500 regulators. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 68 ++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/snowball.dts | 2 ++ 2 files changed, 70 insertions(+) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 646c80b..1fa5546 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -308,6 +308,74 @@ compatible = "stericsson,ab8500"; reg = <5>; /* mailbox 5 is i2c */ interrupts = <0 40 0x4>; + + ab8500-regulators { + compatible = "stericsson,ab8500-regulator"; + + // supplies to the display/camera + ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { + regulator-name = "V-DISPLAY"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2900000>; + regulator-boot-on; + /* BUG: If turned off MMC will be affected. */ + regulator-always-on; + }; + + // supplies to the on-board eMMC + ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { + regulator-name = "V-eMMC1"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <3300000>; + }; + + // supply for VAUX3; SDcard slots + ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { + regulator-name = "V-MMC-SD"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <3300000>; + }; + + // supply for v-intcore12; VINTCORE12 LDO + ab8500_ldo_initcore_reg: ab8500_ldo_initcore { + regulator-name = "V-INTCORE"; + }; + + // supply for tvout; gpadc; TVOUT LDO + ab8500_ldo_tvout_reg: ab8500_ldo_tvout { + regulator-name = "V-TVOUT"; + }; + + // supply for ab8500-usb; USB LDO + ab8500_ldo_usb_reg: ab8500_ldo_usb { + regulator-name = "dummy"; + }; + + // supply for ab8500-vaudio; VAUDIO LDO + ab8500_ldo_audio_reg: ab8500_ldo_audio { + regulator-name = "V-AUD"; + }; + + // supply for v-anamic1 VAMic1-LDO + ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { + regulator-name = "V-AMIC1"; + }; + + // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 + ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { + regulator-name = "V-AMIC2"; + }; + + // supply for v-dmic; VDMIC LDO + ab8500_ldo_dmic_reg: ab8500_ldo_dmic { + regulator-name = "V-DMIC"; + }; + + // supply for U8500 CSI/DSI; VANA LDO + ab8500_ldo_ana_reg: ab8500_ldo_ana { + regulator-name = "V-CSI/DSI"; + }; + }; }; }; diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index d6c05ea..ec3c339 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -103,11 +103,13 @@ sdi@80126000 { status = "enabled"; + vmmc-supply = <&ab8500_ldo_aux3_reg>; cd-gpios = <&gpio6 26 0x4>; // 218 }; sdi@80114000 { status = "enabled"; + vmmc-supply = <&ab8500_ldo_aux2_reg>; }; uart@80120000 {