From patchwork Fri May 4 18:23:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8412 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 E0DC423E20 for ; Fri, 4 May 2012 18:24:28 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id B057DA18068 for ; Fri, 4 May 2012 18:24:28 +0000 (UTC) Received: by mail-gy0-f180.google.com with SMTP id z12so974947ghb.11 for ; Fri, 04 May 2012 11:24:28 -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=mE26mPmUEF6gyR5fxzW4gJ3BcKZzE5fyfGKsj6fzyBI=; b=LXg7EFl2srT3lbyx5KITzE3E0Odv1PrU2yqKVEwYCssEJOcvP0ay9UZDrQ0d6ul882 6zmQXQCTrz42bYTnYqjwjOWIdzEccg+t8N0uAQMKEIU5wQixPEAE3rVV5afO+PXb0u5Q ZRaVQf7t8XuNoOFh22eH/C2YwFxtwsomMFCflhVUmV/xnfuPhB6yeDQMut9h64PJHQbK R+TxM9FB/wcRD8S+GXYi8UM67u9xdyKQqxmUEuYfP5OUAZ5jj05rkaCCZlpsCLf59w5l q+pcQETm5Ilnvh0k1BjP2RnKS9/MssTcqwaMeX/mRHnfsnpYt5NYwxIz45RTHk5shybq Lz6A== Received: by 10.42.139.9 with SMTP id e9mr690630icu.43.1336155868301; Fri, 04 May 2012 11:24:28 -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.137.198 with SMTP id x6csp106295ibt; Fri, 4 May 2012 11:24:27 -0700 (PDT) Received: by 10.180.82.132 with SMTP id i4mr15255520wiy.12.1336155866981; Fri, 04 May 2012 11:24:26 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id x65si10940785weq.85.2012.05.04.11.24.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:24:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 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-f172.google.com with SMTP id hj6so1338560wib.13 for ; Fri, 04 May 2012 11:24:26 -0700 (PDT) Received: by 10.180.104.65 with SMTP id gc1mr15245191wib.13.1336155866525; Fri, 04 May 2012 11:24:26 -0700 (PDT) Received: from localhost.localdomain ([89.192.128.60]) by mx.google.com with ESMTPS id fn2sm17590123wib.0.2012.05.04.11.24.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:24:25 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, ben-linux@fluff.org, linux-i2c@vger.kernel.org, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com, Lee Jones Subject: [PATCH 13/15] ARM: ux500: Add support for ab8500 regulators into the Device Tree Date: Fri, 4 May 2012 19:23:23 +0100 Message-Id: <1336155805-18554-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1336155805-18554-1-git-send-email-lee.jones@linaro.org> References: <1336155805-18554-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnsXNHzgd4xTnapPgZSeT+OMLiOxNlDiZkG9dZWYkBAYROtUpPdOF9CZBNAE4Qo5xHIbOvC Here we supply the information required to setup regulators successfully on Snowball and other db8500 variants which use the ab8500 regulators. This information includes values used for regulator related register initialisation and platform specific regulator setup information. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 98 ++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/snowball.dts | 2 + 2 files changed, 100 insertions(+) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 1188925..2609f53 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -202,6 +202,104 @@ reg = <5>; /* mailbox 5 is i2c */ interrupts = <0 40 0x4>; stericsson,irq-base = <520>; + + ab8500-regulators { + compatible = "stericsson,ab8500-regulator"; + stericsson,regurequestctrl2 = <0x00>; + stericsson,regurequestctrl3 = <0x00>; + stericsson,regurequestctrl4 = <0x00>; + stericsson,regusysclkreq1hpvalid1 = <0x00>; + stericsson,regusysclkreq1hpvalid2 = <0x40>; + stericsson,reguhwhpreq1valid1 = <0x00>; + stericsson,reguhwhpreq1valid2 = <0x00>; + stericsson,reguhwhpreq2valid1 = <0x00>; + stericsson,reguhwhpreq2valid2 = <0x04>; + stericsson,reguswhpreqvalid1 = <0x00>; + stericsson,reguswhpreqvalid2 = <0x00>; + stericsson,regusysclkreqvalid1 = <0x2a>; + stericsson,regusysclkreqvalid2 = <0x20>; + stericsson,regumisc1 = <0x10>; + stericsson,vaudiosupply = <0x00>; + stericsson,reguctrl1vamic = <0x00>; + stericsson,vpllvanaregu = <0x02>; + stericsson,vrefddr = <0x00>; + stericsson,extsupplyregu = <0x2a>; + stericsson,vaux12regu = <0x01>; + stericsson,vrf1vaux3regu = <0x00>; + stericsson,vsmps1sel1 = <0x24>; + stericsson,vaux1sel = <0x08>; + stericsson,vaux2sel = <0x0d>; + stericsson,vrf1vaux3sel = <0x07>; + stericsson,reguctrl2spare = <0x00>; + stericsson,reguctrldisch = <0x00>; + stericsson,reguctrldisch2 = <0x00>; + + /* It's imperative that these remain in order. */ + + // 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 579c304..6b00350 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -94,6 +94,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; bus-width = <8>; + vmmc-supply = <&ab8500_ldo_aux3_reg>; mmc-cap-mmc-highspeed; cd-gpios = <&gpio6 26 0x4>; // 218 @@ -107,6 +108,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; bus-width = <8>; + vmmc-supply = <&ab8500_ldo_aux2_reg>; mmc-cap-mmc-highspeed; status = "okay";