From patchwork Tue Oct 16 10:47:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 984672 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 42ZBqQ0JsZz9s8F for ; Tue, 16 Oct 2018 21:48:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbeJPSiB (ORCPT ); Tue, 16 Oct 2018 14:38:01 -0400 Received: from mout.perfora.net ([74.208.4.196]:36563 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726581AbeJPSh7 (ORCPT ); Tue, 16 Oct 2018 14:37:59 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0MbhvX-1ftKRI00Hd-00J2Sr; Tue, 16 Oct 2018 12:48:01 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0MbhvX-1ftKRI00Hd-00J2Sr; Tue, 16 Oct 2018 12:48:01 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Mark Brown , Kuninori Morimoto , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v2 7/9] ARM: tegra: apalis_t30: further regulator clean-up Date: Tue, 16 Oct 2018 12:47:28 +0200 Message-Id: <20181016104730.4598-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181016104730.4598-1-marcel@ziswiler.com> References: <20181016104730.4598-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:/wMfk1bEemgBgzmavQihhgp28ZppoOJWElLItjLcnqwoiGgAli9 NjMETyHPtL78LCsY0Aw15BMrTa4LRLevBLDEY4b2wFgX0+HSH7Oztd7r94rYfOlohyCtAqC kKAIjHQOm32DYVkLcXCBfiYeHqXpmpJ/w7CWT1dduyYYHek64fgJ2GJsPtyTTIJMKUQJXfK pH//jXE2L8ollR8F4AQxw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:QmGn3Gebn6k=:DDB6e6d3o9H3SFsBzXNock T6kYpRzxiGo4nNPgEgvJzEYoJsnMb6gOGmpGz1gXT0ltlAygJfiB1XWxuQRMiIT6UF2r9anc6 GEmvrJN3barX6UDW81/8DqLkwsZHdibugZ0Kr6oSvmw6DzcD60yJeYwn7xilZBIUn2B1UJf2/ 8KCgANF0FDyyLYWLqfer6Ig5AQcPRJw7F5YLvNhS2d02Nhaf0zrmF307vRhWLbKvy9i2wmKp2 aPnTS/1qo8ri2gP1vu6h8YNlU68v8DOpxHWa9MUDNc9AIf8yiijh7M8HHuuWvP0yoBBm9bMkr ZHds75W9zPgwBLTP/PvUhdBdyuOGbQtBZeUo3uAMueZYpB4PjHex4xPVCDrpkIB0IRBiEByku 50mgSj7r7Eg9JRIfcwkgsuLInPKv2jmq7evLAUitEFb6cDrk5TtJqMs7Xrb+u4N9roO99ntKD MLc+FHkrxNE5thIAAZKnp9tSl82iuzrebiUHySW7/gOJGbQmWwCEmKc+mOcpd9cMoS3exAB5N gJXJfBRj35hITzbAb0+RWjim/u9Mvb/f/N7eUSdKo7Uvtj1ggtheKby0rYUJ+1fM7beGVe8z+ qYmDInw3wqid+9LHcaYKd8NfK3XrPGFILze/nnnlVPnL0nhj9k4MkBLjnSoqWV1l8r2mqtV95 B3cxFXnraaQ7hvHoS9UxC6bKCduojSeK0ms14DtyZ1hAhvwRxvi9cKgeBqXaLVCqBCKo= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Rename label vdd2_reg to reg_1v05. Rename label ldo6_reg to reg_1v05_avdd_plle. 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. Drop spurious newline in TPS62362 properties. Rename vddio_sdmmc_1v8_reg to reg_1v8_vddio_sdmmc3. Rename +V1.05 to +V1.05_AVDD_PLLE. Signed-off-by: Marcel Ziswiler --- Changes in v2: - Dropped "[PATCH v1 3/8] ARM: tegra: apalis/colibri_t30: fix hdmi regulator" as suggested by Russell et. al. - Added 2 new patches improving/fixing audio on Apalis TK1. Changes in v1: None arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 2 +- arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 70 +++++++++++--------------- arch/arm/boot/dts/tegra30-apalis.dtsi | 68 +++++++++++-------------- 3 files changed, 58 insertions(+), 82 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts b/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts index e29dca92ba0a..34c9fcd9198f 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts @@ -251,7 +251,7 @@ states = <1800000 0x0 3300000 0x1>; startup-delay-us = <100000>; - vin-supply = <&vddio_sdmmc_1v8_reg>; + vin-supply = <®_1v8_vddio_sdmmc3>; }; }; diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi index bc714032d771..fcfd3fddfda9 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi @@ -13,14 +13,14 @@ pcie@3000 { status = "okay"; - avdd-pexa-supply = <&vdd2_reg>; - avdd-pexb-supply = <&vdd2_reg>; - avdd-pex-pll-supply = <&vdd2_reg>; - avdd-plle-supply = <&ldo6_reg>; + avdd-pexa-supply = <®_1v05>; + avdd-pexb-supply = <®_1v05>; + avdd-pex-pll-supply = <®_1v05>; + avdd-plle-supply = <®_1v05>; hvdd-pex-supply = <®_module_3v3>; vddio-pex-ctl-supply = <®_module_3v3>; - vdd-pexa-supply = <&vdd2_reg>; - vdd-pexb-supply = <&vdd2_reg>; + vdd-pexa-supply = <®_1v05>; + vdd-pexb-supply = <®_1v05>; /* Apalis type specific */ pci@1,0 { @@ -864,16 +864,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>; @@ -884,38 +881,38 @@ 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; }; - vdd2_reg: vdd2 { + reg_1v05: vdd2 { regulator-name = "+V1.05"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; }; - 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; - }; - /* * 1.8 volt +VDDIO_SDMMC3 in case EN_+3.3_SDMMC3 * is off */ - vddio_sdmmc_1v8_reg: ldo1 { + reg_1v8_vddio_sdmmc3: ldo1 { regulator-name = "+VDDIO_SDMMC3_1V8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -927,20 +924,20 @@ * +V3.3_AUDIO_AVDD_S, +V3.3 * see also +V3.3 fixed supply */ - ldo2_reg: ldo2 { + ldo2 { regulator-name = "EN_+V3.3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo3_reg: ldo3 { + ldo3 { regulator-name = "+V1.2_CSI"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo4_reg: ldo4 { + ldo4 { regulator-name = "+V1.2_VDD_RTC"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; @@ -951,32 +948,23 @@ * +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>; regulator-always-on; }; - /* - * +V1.05_AVDD_PLLE: avdd_plle should be 1.05V - * but LDO6 can't set voltage in 50mV - * granularity - */ - ldo6_reg: ldo6 { - regulator-name = "+V1.05_AVDD_PLLE"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - }; + /* LDO6: unused */ - 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>; @@ -1034,8 +1022,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; @@ -1043,6 +1030,7 @@ ti,vsel0-state-low; /* VSEL1: EN_CORE_DVFS_N low for DVFS */ ti,vsel1-state-low; + vin-supply =<®_module_3v3>; }; }; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index 4b6a8ecaac76..d2b688d90223 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -12,14 +12,14 @@ pcie@3000 { status = "okay"; - avdd-pexa-supply = <&vdd2_reg>; - avdd-pexb-supply = <&vdd2_reg>; - avdd-pex-pll-supply = <&vdd2_reg>; - avdd-plle-supply = <&ldo6_reg>; + avdd-pexa-supply = <®_1v05>; + avdd-pexb-supply = <®_1v05>; + avdd-pex-pll-supply = <®_1v05>; + avdd-plle-supply = <®_1v05>; hvdd-pex-supply = <®_module_3v3>; vddio-pex-ctl-supply = <®_module_3v3>; - vdd-pexa-supply = <&vdd2_reg>; - vdd-pexb-supply = <&vdd2_reg>; + vdd-pexa-supply = <®_1v05>; + vdd-pexb-supply = <®_1v05>; /* Apalis type specific */ pci@1,0 { @@ -855,16 +855,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>; @@ -875,33 +872,33 @@ 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; }; - vdd2_reg: vdd2 { + reg_1v05: vdd2 { regulator-name = "+V1.05"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; }; - 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 */ /* @@ -909,20 +906,20 @@ * +V3.3_AUDIO_AVDD_S, +V3.3 * see also +V3.3 fixed supply */ - ldo2_reg: ldo2 { + ldo2 { regulator-name = "EN_+V3.3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo3_reg: ldo3 { + ldo3 { regulator-name = "+V1.2_CSI"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo4_reg: ldo4 { + ldo4 { regulator-name = "+V1.2_VDD_RTC"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; @@ -933,32 +930,23 @@ * +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>; regulator-always-on; }; - /* - * +V1.05_AVDD_PLLE: avdd_plle should be 1.05V - * but LDO6 can't set voltage in 50mV - * granularity - */ - ldo6_reg: ldo6 { - regulator-name = "+V1.05_AVDD_PLLE"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - }; + /* LDO6: unused */ - 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>; @@ -1016,8 +1004,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; @@ -1025,6 +1012,7 @@ ti,vsel0-state-low; /* VSEL1: EN_CORE_DVFS_N low for DVFS */ ti,vsel1-state-low; + vin-supply =<®_module_3v3>; }; };