From patchwork Mon Jun 11 15:05:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 164205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 216A210082E for ; Tue, 12 Jun 2012 01:06:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755585Ab2FKPFu (ORCPT ); Mon, 11 Jun 2012 11:05:50 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:52833 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755588Ab2FKPFk (ORCPT ); Mon, 11 Jun 2012 11:05:40 -0400 Received: from benhur.adnet.avionic-design.de (p548E0634.dip0.t-ipconnect.de [84.142.6.52]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lz2g4-1Rrxaz2ThY-014FAI; Mon, 11 Jun 2012 17:05:32 +0200 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id C66892C4124; Mon, 11 Jun 2012 17:05:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 088672A28173; Mon, 11 Jun 2012 17:05:28 +0200 (CEST) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X8eUc5zQrSf4; Mon, 11 Jun 2012 17:05:26 +0200 (CEST) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 01BA02A281BB; Mon, 11 Jun 2012 17:05:23 +0200 (CEST) From: Thierry Reding To: linux-tegra@vger.kernel.org Cc: Jesse Barnes , linux-pci@vger.kernel.org, Grant Likely , Rob Herring , devicetree-discuss@lists.ozlabs.org, Russell King , linux-arm-kernel@lists.infradead.org, Colin Cross , Olof Johansson , Stephen Warren Subject: [PATCH v2 08/10] ARM: tegra: harmony: Initialize regulators from DT Date: Mon, 11 Jun 2012 17:05:16 +0200 Message-Id: <1339427118-32263-9-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> References: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:APq1h9YFe1yCf3f2bmxroADiWkLte7pkAFy/bUCmcKg hEOsdZ7Y8lN/YWfZR43ZXK2ODuiyPfhVd2rWhJSklQrgmwKQGb Bm7f1Ic9SzVzSC6kbGAgZ+Bv0oPvr7H81H++hI033Lm7h5EwVi SwXo7DPJzTb787nDXoOUzktjDkb8kjvIQSktrin+otojxK8klO qglWG3TeIjG5BiC5PXy6p7nqg54dceHPTSD/HbmxsJyWd3IAZU NhNaufGDRoDjmB/p6cdIe/klWACFb02RNtrrG1voMLr0Gyab2a De46n6CZAkjzN2vaCqvtX/40ZIX6yr/+VwciWsHp6NC2sIBv2+ LQyx8iLHXJNCaze2J6sXurh/5Bp/69Fxx6icBarexqgqLgLvab WjC97XncnKsl4o0ZA9X+HHjlTSxqAZw8c6IwAmmih6E3YmxElY YAE/M Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Device tree support for the TPS6586x PMU used on Harmony has recently been added. This commit adds the required device tree nodes to probe the PMU from the device tree. Signed-off-by: Thierry Reding --- Changes in v2: - new patch --- arch/arm/boot/dts/tegra-harmony.dts | 83 ++++++++++++++++++++++++++++++++ arch/arm/mach-tegra/board-dt-tegra20.c | 6 --- 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index f146dbf..c98aa2a 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@ -275,6 +275,89 @@ i2c@7000d000 { status = "okay"; clock-frequency = <400000>; + + tps6586x@34 { + compatible = "ti,tps6586x"; + reg = <0x34>; + interrupts = <0 88 0x4>; + + #gpio-cells = <2>; + gpio-controller; + + regulators { + sm0 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + regulator-boot-on; + regulator-always-on; + }; + + sm1 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + regulator-boot-on; + regulator-always-on; + }; + + sm2 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <4550000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo0 { + regulator-name = "PCIE CLK"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + ldo1 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + }; + + ldo2 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + }; + + ldo3 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo4 { + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <2475000>; + }; + + ldo5 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo6 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo7 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo8 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo9 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + }; + }; }; pmc { diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 0f29c05..a9a54e6 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -136,12 +136,6 @@ static void __init harmony_init(void) { int ret; - ret = harmony_regulator_init(); - if (ret) { - pr_err("harmony_regulator_init() failed: %d\n", ret); - return; - } - ret = harmony_pcie_init(); if (ret) pr_err("harmony_pcie_init() failed: %d\n", ret);