From patchwork Tue Oct 9 15:25:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42V1K01yWZz9s9J for ; Wed, 10 Oct 2018 02:25:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726995AbeJIWnS (ORCPT ); Tue, 9 Oct 2018 18:43:18 -0400 Received: from mout.perfora.net ([74.208.4.197]:51525 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726607AbeJIWnR (ORCPT ); Tue, 9 Oct 2018 18:43:17 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lf9bC-1fLD3P1ymm-00orBT; Tue, 09 Oct 2018 17:25:43 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lf9bC-1fLD3P1ymm-00orBT; Tue, 09 Oct 2018 17:25:43 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v1 7/8] ARM: tegra: colibri_t30: further regulator clean-up Date: Tue, 9 Oct 2018 17:25:22 +0200 Message-Id: <20181009152523.3771-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181009152523.3771-1-marcel@ziswiler.com> References: <20181009152523.3771-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:6Y+hA4GjzESwUtrRRDUH27XhRFqGaWyzcbUBP0HR13qeUufhOkF 9KI8gr6TrOzqJzp4B+MeywlnKfXAK4ADuKoN+WVEzNircizfhVux/8dsIEeLBAY5i5iQpxt bXUlMEqKcU0NTAIaiICYiaB3OFS+NjjYnp72O0Jjs1uprqBGmHG7b7aMigbE17l5DqOumxB cd3KYmdCoZmZqoyVdr19w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:Jy+lAzeK7OY=:LPiFghoVzDBjvdLI2oSUdm THrNC3y7FOpwMcqEQ09oc5X5CsHWc9nPbzAubVyMenl64FJRRkfhg0m7w1+UDKapFXQlVJvav m7gSPqM0GIk6TstLxOAP+qOhvGED47ZAp7gTAx7haoUbBXImtgY25bKYR3sU2FP+ZTGnQVaeB 3aEWMD1VPpmyz2g3/Lo8u08FrDKu5BvVc153LjasIlRVNE6v5UgUdBkRCGvdfwLvHBrITL5oD HdBC7bq1P9wUtEv3yyKFUwEN6mh4gFrxiS4XGuB2wYr8QcjaJaqmYt3Vi+y1MjFt94/FQP3E9 yPpIh49r63kmaI6aGy4P8KI9T7KZ4z6F9VS9Og8jxF/RlIzp3XULrLfA1WdUNbvke23NWAeH3 Djgat0D4RWUSJKPNDmiN1ZP/PIcNoIAcfigsGffZM/4ZcCTmOuBACNYpt9L56z0f2y8Fgu40T dlxpaIEq1FvswR7yu7UtUqoPqLEVNRVRxXS1e3eAm2Uqk9OZyjT77y8HMJe4aFpDejc/wD16T vNcQCCHcwXRBoyvGMyp/vEj72FnS7XKwWGJs75tzMb32kniZkLhuLl3i+QtAFbT0QHvayDNIH xMXcilo7hqF++B955wrriWoxSlMoRdf7v8ADCRm4sMY5J5Pz61/b/6BqXxe3waMO83a7rZ11R XBDp4u2YYKOZ3t7BvANu6F4odFBPkJo/AtW5GnVnIjywGh/xBGZUGbsN4kmsB+Ddlgug= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Drop unused labels. Rename regulator tps62362-vout to +V1.2_VDD_CORE. Reorder TPS65911 properties. Rename +V1.05 to +V1.05_AVDD_PLLE. Add ti,en-ck32k-xtal. Specify TPS62362 vin-supply. Signed-off-by: Marcel Ziswiler --- Changes in v1: None arch/arm/boot/dts/tegra30-colibri.dtsi | 45 ++++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi index 963f26071415..d71038ea544f 100644 --- a/arch/arm/boot/dts/tegra30-colibri.dtsi +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi @@ -732,16 +732,13 @@ pmic: pmic@2d { compatible = "ti,tps65911"; reg = <0x2d>; - + #gpio-cells = <2>; + gpio-controller; interrupts = ; #interrupt-cells = <2>; interrupt-controller; - + ti,en-ck32k-xtal; ti,system-power-controller; - - #gpio-cells = <2>; - gpio-controller; - vcc1-supply = <®_module_3v3>; vcc2-supply = <®_module_3v3>; vcc3-supply = <®_1v8_vio>; @@ -752,29 +749,29 @@ vccio-supply = <®_module_3v3>; regulators { - vdd1_reg: vdd1 { + reg_1v8_vio: vio { + regulator-name = "+V1.8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vdd1 { regulator-name = "+V1.35_VDDIO_DDR"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; regulator-always-on; }; - /* SW2: unused */ + /* SW2 aka vdd2: unused */ - vddctrl_reg: vddctrl { + vddctrl { regulator-name = "+V1.0_VDD_CPU"; regulator-min-microvolt = <1150000>; regulator-max-microvolt = <1150000>; regulator-always-on; }; - reg_1v8_vio: vio { - regulator-name = "+V1.8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - /* LDO1: unused */ /* @@ -782,7 +779,7 @@ * +V3.3_AUDIO_AVDD_S, +V3.3 and +V1.8_VDD_LAN * see also +V3.3 fixed supply */ - ldo2_reg: ldo2 { + ldo2 { regulator-name = "EN_+V3.3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -791,7 +788,7 @@ /* LDO3: unused */ - ldo4_reg: ldo4 { + ldo4 { regulator-name = "+V1.2_VDD_RTC"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; @@ -802,7 +799,7 @@ * +V2.8_AVDD_VDAC: * only required for (unsupported) analog RGB */ - ldo5_reg: ldo5 { + ldo5 { regulator-name = "+V2.8_AVDD_VDAC"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; @@ -814,20 +811,20 @@ * but LDO6 can't set voltage in 50mV * granularity */ - ldo6_reg: ldo6 { + ldo6 { regulator-name = "+V1.05_AVDD_PLLE"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; }; - ldo7_reg: ldo7 { + ldo7 { regulator-name = "+V1.2_AVDD_PLL"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - ldo8_reg: ldo8 { + ldo8 { regulator-name = "+V1.0_VDD_DDR_HS"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; @@ -885,8 +882,7 @@ regulator@60 { compatible = "ti,tps62362"; reg = <0x60>; - - regulator-name = "tps62362-vout"; + regulator-name = "+V1.2_VDD_CORE"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <1400000>; regulator-boot-on; @@ -894,6 +890,7 @@ ti,vsel0-state-low; /* VSEL1: EN_CORE_DVFS_N low for DVFS */ ti,vsel1-state-low; + vin-supply =<®_module_3v3>; }; };