From patchwork Thu Oct 18 11:14:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985800 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 42bRKj5Wxdz9sBk for ; Thu, 18 Oct 2018 22:15:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728083AbeJRTPK (ORCPT ); Thu, 18 Oct 2018 15:15:10 -0400 Received: from mout.perfora.net ([74.208.4.196]:37695 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeJRTPK (ORCPT ); Thu, 18 Oct 2018 15:15:10 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0MfpSM-1g0xC40CwO-00N85q; Thu, 18 Oct 2018 13:14:20 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0MfpSM-1g0xC40CwO-00N85q; Thu, 18 Oct 2018 13:14:20 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 1/7] ARM: tegra: fix simple-panel compatibles Date: Thu, 18 Oct 2018 13:14:05 +0200 Message-Id: <20181018111411.26623-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:2BimFpfs3a8BrMSYA5BKBU87t6vyU/8+sUjscHjCF0Vs9NCwQWR 0p/HE6RdSdda/HlU6FInNdswhSMsrC8cjNIVnY7z7BNOwoghK95WsBmsL2xeSordJEqmQMK MAgLsygEwoo83k10VMcEl8Xre46p2A1AvxSkAilCXzQwciot1M9ZOScSouzbg3mdjcDTxvI HXK37sQa6FcVKsFB5GbcQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:RcJj263geoo=:6qcM8NnropXy8C4hSFhe2W yTeJEu/XIjPK7n/OZL8NxrU2MBITK0JMkTqcJcFYrqo7DBXJFKjmrBzYrAIJpQchtGYA4S01N W1kMDqmQwJOADw2YYO3/mlVNEPzxqmAXt87apJOPaCmhWBNq/uk7DDvQEZPFxbt8nGbNNmT92 F4rJnnb8mX55NvEvOsT6vkkSZ+PAKF5ZMbPtMVBzqHP7iGvacM2CEPnn3GoMKUwM3+DrDCrqu PnElmLUU4Hxad4NbwRtzeMvZq4hyR1P3HoU1vArRUYa6RaMyuOCfvMbANlCPCTrd39Kw3twxq RpsFEi3S5oDOgPKAPaOC6pSPMNNB8HIcvn7bWCI9uY48TOUtD/OtzxVaTGnumaOpEW+HObVBO GmFI0oYkcrw50y2ZHqOHJptzAcNfT+sIduVs/bF+OOKpUS5s13ORRld8TYs2XwiZfPYydrZV2 LDYx0hq5CenQSWCAlsi4NPBk2YSR2mDj16WbYMKmfV3TtkvReLkV/1lCGNxOinbIr4ll36v9b fyYfGNYprQKtqivzbfdjJmSKzA7dG1kbntS+Ls0E0go12TP87rLmnvF85vBKhY64BgiKmduI3 9DT/d5Lcq0w168f9rfgX+D/EcCIxVw5iISXNpVHZ0drfXKcp7caSSta9zMFX9708aTKPXAuLQ sjn2FyCMorPQI39fhnIQAruYp90kv5TdUWzXdCZjY2vX6TbwAYbbB/t8j6eplyPLEmnI= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler As there is no such thing as a generic simple-panel compatible remove them. Signed-off-by: Marcel Ziswiler --- Changes in v3: None Changes in v2: None Changes in v1: - Remove simple-panel compatible as suggested by Rob. arch/arm/boot/dts/tegra114-dalmore.dts | 3 +-- arch/arm/boot/dts/tegra124-venice2.dts | 2 +- arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +- arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +- arch/arm/boot/dts/tegra20-harmony.dts | 2 +- arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +- arch/arm/boot/dts/tegra20-paz00.dts | 2 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- arch/arm/boot/dts/tegra20-ventana.dts | 2 +- arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 2 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 13 files changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 1788556b4977..2ea7236d9da6 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -46,8 +46,7 @@ avdd-dsi-csi-supply = <&avdd_1v2_reg>; panel@0 { - compatible = "panasonic,vvx10f004b00", - "simple-panel"; + compatible = "panasonic,vvx10f004b00"; reg = <0>; power-supply = <&avdd_lcd_reg>; diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index 82d139648ef1..f54f77902774 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -1079,7 +1079,7 @@ }; panel: panel { - compatible = "lg,lp129qe", "simple-panel"; + compatible = "lg,lp129qe"; backlight = <&backlight>; ddc-i2c-bus = <&dpaux>; diff --git a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts index 3c0f2681fcde..37ad508b61d9 100644 --- a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts @@ -223,7 +223,7 @@ * edt,et057090dhu: EDT 5.7" LCD TFT * edt,et070080dh6: EDT 7.0" LCD TFT */ - compatible = "edt,et057090dhu", "simple-panel"; + compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts index d8004d68efa0..af4740847769 100644 --- a/arch/arm/boot/dts/tegra20-colibri-iris.dts +++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts @@ -205,7 +205,7 @@ * edt,et057090dhu: EDT 5.7" LCD TFT * edt,et070080dh6: EDT 7.0" LCD TFT */ - compatible = "edt,et057090dhu", "simple-panel"; + compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index 1d96d92b72a7..02cd67ea2503 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -665,7 +665,7 @@ }; panel: panel { - compatible = "auo,b101aw03", "simple-panel"; + compatible = "auo,b101aw03"; power-supply = <&vdd_pnl_reg>; enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts index cda5448c2ace..c73510cd501c 100644 --- a/arch/arm/boot/dts/tegra20-medcom-wide.dts +++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts @@ -57,7 +57,7 @@ }; panel: panel { - compatible = "innolux,n156bge-l21", "simple-panel"; + compatible = "innolux,n156bge-l21"; power-supply = <&vdd_1v8_reg>, <&vdd_3v3_reg>; enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index 8861e0976e37..e75f86901dfd 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -543,7 +543,7 @@ }; panel: panel { - compatible = "samsung,ltn101nt05", "simple-panel"; + compatible = "samsung,ltn101nt05"; ddc-i2c-bus = <&lvds_ddc>; power-supply = <&vdd_pnl_reg>; diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index f91441683aad..376ecb6435f4 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts @@ -826,7 +826,7 @@ }; panel: panel { - compatible = "chunghwa,claa101wa01a", "simple-panel"; + compatible = "chunghwa,claa101wa01a"; power-supply = <&vdd_pnl_reg>; enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index f44551e2d9d0..022649119821 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts @@ -611,7 +611,7 @@ }; panel: panel { - compatible = "chunghwa,claa101wa01a", "simple-panel"; + compatible = "chunghwa,claa101wa01a"; power-supply = <&vdd_pnl_reg>; enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts index 749fc6d1ff70..b39c26806bf2 100644 --- a/arch/arm/boot/dts/tegra30-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts @@ -195,7 +195,7 @@ * edt,et057090dhu: EDT 5.7" LCD TFT * edt,et070080dh6: EDT 7.0" LCD TFT */ - compatible = "edt,et057090dhu", "simple-panel"; + compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; }; 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 0be50e881684..e29dca92ba0a 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts @@ -196,7 +196,7 @@ * edt,et057090dhu: EDT 5.7" LCD TFT * edt,et070080dh6: EDT 7.0" LCD TFT */ - compatible = "edt,et057090dhu", "simple-panel"; + compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi index fb9222b479d2..3894bf47ea8f 100644 --- a/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -432,7 +432,7 @@ }; panel: panel { - compatible = "chunghwa,claa101wb01", "simple-panel"; + compatible = "chunghwa,claa101wb01"; ddc-i2c-bus = <&panelddc>; power-supply = <&vdd_pnl1_reg>; diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts index 5965150ecdd2..8e106e784dce 100644 --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts @@ -159,7 +159,7 @@ * edt,et057090dhu: EDT 5.7" LCD TFT * edt,et070080dh6: EDT 7.0" LCD TFT */ - compatible = "edt,et057090dhu", "simple-panel"; + compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; }; From patchwork Thu Oct 18 11:14:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985802 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 42bRKq3dQnz9s9h for ; Thu, 18 Oct 2018 22:15:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726173AbeJRTPE (ORCPT ); Thu, 18 Oct 2018 15:15:04 -0400 Received: from mout.perfora.net ([74.208.4.196]:51043 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727828AbeJRTPE (ORCPT ); Thu, 18 Oct 2018 15:15:04 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LkQWL-1fceZh15Z5-00cQij; Thu, 18 Oct 2018 13:14:22 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LkQWL-1fceZh15Z5-00cQij; Thu, 18 Oct 2018 13:14:22 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 2/7] ARM: tegra: apalis-tk1/colibri_t20/t30: eval/iris: fix regulator gpio enable Date: Thu, 18 Oct 2018 13:14:06 +0200 Message-Id: <20181018111411.26623-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:YjnBn+cz86dAFXn4ltS/0BckGo48Q0yJ+6U/y+LTaQQKaL+udNM FezbJABOWLxJahwonOxqNCoDSe8uJ19KRjzw8wdumvqmjAFcmcNYBgheztG32tFpg0K74cJ XsIyYnb1gfFl+IeccUQFLeOenjFRKQwsNLnRUgHh5cmoO7yxjffLlvEGtMJCT0gDWHpzeEZ QzgHAC6dSyTe2vUWv9HmQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:rDCdKtLgv0E=:qmD8zVqLmhuBaUtH3N5IS/ 1zWxR77CbF8nmpyyGBD9MJ1Vmld2sKAic/2OyGB4GDeHW82zoC0dnkivex0+SeMZl+AoUi5+D 4TJYQCbVTCTxbttIttZt6p9/CP+Ge3NAW//TQhFUb+zZqM/BNI3ZI1P6sEY7oo6AtuNJfMNjY +v+lfEfcCGKKmE/DNKTv+FbhSJtP65gadPrM2B+KNUYidvNGBR5fE0QNxgM1sszaN5yMGNH4K 1mFP1KJ+9ze3qOg932X281GcT3wcX1YfE3j2LFh0vX3TRCme8+pbLwrns7PCt2NRuDM2bnMlA JWM2+q1KG93H908gJeojZkt7M49en+IESg0lgXF/PRHVYdKcK1pdWvjkl8vnPlr2ThHQRbAfj /szZ+B040Kn+0f09Jw7rSn8QZynrIKoh2vBrOAo03DMeMvvfJPqsWe9eaTQVPP3vd2LR98L6i UxgQ75jF/7NFbYNjQm7EQS+MUiPBaBRgYXSZZY+PsgVX6PrlPR/4Qkc1hH0c84oin522Y3s0i qnleVfrwQ9gSJx6Edzg8Y3T5nJnXq0CjSWjrekgBL7s0xLACFKIK66sRqqr9tpVtjAKc/42BY V36hdPFaI+uHhtxxIjAOJWr5uloe2thdbbJ7xdsBQ3Wt0+nKvVamsPWF1DEObE11kHC4DpFqS LsAWmn1YK0HQrn7P6EVGOKDfAThQEKvtE6MqlWcOH2QK89g1HouA9/kPUL0sYsJvW/Dc= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Anything other than the default active-low would require the separate property enable-active-high to be set. This gets rid of the following warning during boot: regulator-usbh-vbus GPIO handle specifies active low - ignored resp.: regulator-1v05-avdd-hdmi-pll GPIO handle specifies active low - ignored Signed-off-by: Marcel Ziswiler --- Changes in v3: None Changes in v2: None Changes in v1: None arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +- arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +- arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi index 367eb8c86098..73a8e117a9b9 100644 --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi @@ -1948,7 +1948,7 @@ regulator-name = "+V1.05_AVDD_HDMI_PLL"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; - gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>; + gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>; vin-supply = <®_1v05_vdd>; }; diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index 13c93cd507d8..3e3b347afe56 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -1978,7 +1978,7 @@ regulator-name = "+V1.05_AVDD_HDMI_PLL"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; - gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>; + gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>; vin-supply = <®_1v05_vdd>; }; diff --git a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts index 37ad508b61d9..f1a85d930e61 100644 --- a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts @@ -256,7 +256,7 @@ regulator-name = "VCC_USB[1-4]"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; vin-supply = <®_5v0>; }; }; diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts index af4740847769..e1e5ec5253fd 100644 --- a/arch/arm/boot/dts/tegra20-colibri-iris.dts +++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts @@ -238,7 +238,7 @@ regulator-name = "VCC_USB1"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; vin-supply = <®_5v0>; }; }; diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts index 8e106e784dce..7e6bf4cdf322 100644 --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts @@ -192,7 +192,7 @@ regulator-name = "VCC_USB[1-4]"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; vin-supply = <®_5v0>; }; }; From patchwork Thu Oct 18 11:14:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985799 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 42bRKd61W9z9sC2 for ; Thu, 18 Oct 2018 22:15:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728128AbeJRTPM (ORCPT ); Thu, 18 Oct 2018 15:15:12 -0400 Received: from mout.perfora.net ([74.208.4.197]:37223 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728124AbeJRTPL (ORCPT ); Thu, 18 Oct 2018 15:15:11 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LlGWu-1ffgz01jr4-00b4L2; Thu, 18 Oct 2018 13:14:24 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LlGWu-1ffgz01jr4-00b4L2; Thu, 18 Oct 2018 13:14:24 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 3/7] ARM: tegra: colibri_t20: reorder pmic properties Date: Thu, 18 Oct 2018 13:14:07 +0200 Message-Id: <20181018111411.26623-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:45jbjI0xri2Qj9ioYbOT/frDydSzIoadi8O3WWZKyVTyxGdbIdW UzIofpqJx/LKV6IFUpNE1EhELL/cpJwHLzEBQl2pSaWdHGRepBVVuIbXSN9VXrzzLpZxipg Y2iAjLHYfOIAy1ANe908DlpogzwIIsvHYtNEt7CBTGl/yqgJPFHO5P+LCivs8KYq5oZzR2n NbhRYeVZJEsFfPVQYycJw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:GCr+GZ+grHw=:DD5ZWLV4GA/bciIYDOwuHw L3cQD4Ar+LlYpvOthsmciINcEi4OqjSb8nR3EULly8Bo+O/BlCi+gFOCP3Hc9NKYSJ5Q5AU2b 3RH4GSvD7fmMduG9T2JY5E0pyggWmtD1JF8pkJZ9AGLHbkFf7Ez/TUE8JvjRnT9cm7yz65LYO PU+JF5ghwUY0g68mXAbyYlpOuAS9DOPaxWutK9VfkwfsOgT9EiI9WJDj4PAiCkhFQcoL74o1m Nilqnm0dyVLPF1R9ZLd7v7g5uYfKrovF5OUDVS2w7ibh/LQqukfKhnNAL5aaVlHj4yICGph2f lYq/f1PgSKkkjhJknXuIf2mHWWZNfNw3q5l0riKMGmuvc8WMDXlk8N1zPAlZEMJgfMC26V07j cyWtMyBChxJC0uoDKeKZfxx/hW6ql2JKDeohJemJ9aIodUrvSFkQ0KplWp0b4Wr+DjNYd+NQ1 B3EZEccjHZo03XYoHYDW/5wuG/6aJN6gQn191OxRyYi0FQz1Nu3VoURIdr4ZktX0xbhEyRq2r me0+x460cWMINxEVZaIOauNcd+ZXpF6LP+Gkn49fQMUMfIXaFQWdWNxRx2F+i2mcxRtSp6uu8 LgAGJom+fCo/ChWgA7FZ29YvR/eEt5zhd16GQZhLvO5VnnG0ynTzMHNfCopVHp3CsqUUa4Hut BAr2x7YRkArX8K4R5zQEu+j/YwGpjfofBONLfJVucMO0UaJNsvXZjEBRJKgy/YesFb8w= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Reorder PMIC properties to be more in-line with any of our other device trees. Signed-off-by: Marcel Ziswiler --- Changes in v3: None Changes in v2: None Changes in v1: None arch/arm/boot/dts/tegra20-colibri.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi index 6162d193e12c..d3aba6501510 100644 --- a/arch/arm/boot/dts/tegra20-colibri.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri.dtsi @@ -475,11 +475,11 @@ pmic@34 { compatible = "ti,tps6586x"; reg = <0x34>; - interrupts = ; - ti,system-power-controller; #gpio-cells = <2>; gpio-controller; + interrupts = ; sys-supply = <®_module_3v3>; + ti,system-power-controller; vin-sm0-supply = <®_3v3_vsys>; vin-sm1-supply = <®_3v3_vsys>; vin-sm2-supply = <®_3v3_vsys>; From patchwork Thu Oct 18 11:14:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985801 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 42bRKm1q56z9s9h for ; Thu, 18 Oct 2018 22:15:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727453AbeJRTPH (ORCPT ); Thu, 18 Oct 2018 15:15:07 -0400 Received: from mout.perfora.net ([74.208.4.196]:41937 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeJRTPH (ORCPT ); Thu, 18 Oct 2018 15:15:07 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LvTAD-1fVxZJ2b9n-010bRt; Thu, 18 Oct 2018 13:14:27 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LvTAD-1fVxZJ2b9n-010bRt; Thu, 18 Oct 2018 13:14:27 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 4/7] ARM: tegra: apalis-tk1: further regulator clean-up Date: Thu, 18 Oct 2018 13:14:08 +0200 Message-Id: <20181018111411.26623-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:kTzT6JAdsm3zHPKM6L3/1IJ5wfY7DjoX6qFTriSXjKRMFrhSOl0 f4QEXRuCbWQN3wIgkdmGkYwDgfNBNlLLQs9reL07I8NNNYjjRr6ZuGWfGXen3Yx9r/7rutV FVU3X6PKE0dcxOmuVGEeDawTlqqNB4dYKfVwYXf/k8G8prJ1trGiLg/P4hcV/QU8x0GeuG5 X3HLiTAx/C6XFCuuvFAUA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:Nd1EXAOAMis=:9vD6zT04Z7PoVNAf3qudmp N2HgWvZJkOOB2OWTAwb0RkHYopxePGkOpGWe4WoWWkwOSQxC/Frp1JjSWE/leUSob1QkWwdPG 9wgpwfmM182A8RTKH762PbEQ7lMSC7NMCsIrHQzhSfEt+I8tUphjmYzJaXXB7QDBBikzz7ZjO JVpCeGdFvG5gtFbxkpHcQXAxv938ue3BLEfUadU7V9ijP/USAjnliD3YUq0jhXU+2TykSw1WN OVlId1hNVGkm3TlbG+graOqBO7jIGbpb7iAtFNM3kIUY+9H0Y4ArE+a0QD1IeGrCNeqLO+qUH yCDtzx+69GbIX/BYW0o6f9GM5/1NO4Sw4gZ7oNPTOwmKOYm5HlGRUxCwP9L+6zCN7M1YrqcIz UzejEhcQfJblItorYlYYeHzxdbY2VnfpfoxB6+d0PSh4otx6iVIqKhGY9FGp+8UeTDjIe0cIw wFzg1L6kG0j1aGYkf4JSt+jLMMkv9/VZF12Jyn5OmK0Wf6s0Pe0CGq6+3EBckeUzIJ92/rC81 HywAoDxYydEOIKqjt+W0/LmI6ICy7NawVfQ7svRDzAlJk/9hi9+xOKjm9ZVJ51r2dzYutcTBw FG0lBkveoWWe3jRu7AL4h1h3hbEzqfuV7BIwzl/6QzgG03iBdutccFvliSY3NQtiI3ctthY8/ bM5ddPqRrvb4UUEwyv/pQXDyvTrwCKL77f7v/y6mvcGh5ELDqO1wKN7MiW/+Zf4I5KY4= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Add reg_ prefix to vddio_sdmmc1 and vddio_sdmmc3. Reorder PMIC properties. Signed-off-by: Marcel Ziswiler --- Changes in v3: None Changes in v2: None Changes in v1: None arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 ++-- arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 ++-- arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 10 +++++----- arch/arm/boot/dts/tegra124-apalis.dtsi | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index eaee10ef6512..e553eff50499 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -171,7 +171,7 @@ bus-width = <4>; /* MMC1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vddio_sdmmc1>; + vqmmc-supply = <®_vddio_sdmmc1>; }; /* Apalis SD1 */ @@ -180,7 +180,7 @@ bus-width = <4>; /* SD1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vddio_sdmmc3>; + vqmmc-supply = <®_vddio_sdmmc3>; }; /* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */ diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts index 7961eb4bd803..e2f94dc7ff91 100644 --- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts @@ -137,7 +137,7 @@ bus-width = <4>; /* MMC1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vddio_sdmmc1>; + vqmmc-supply = <®_vddio_sdmmc1>; }; /* Apalis SD1 */ @@ -146,7 +146,7 @@ bus-width = <4>; /* SD1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vddio_sdmmc3>; + vqmmc-supply = <®_vddio_sdmmc3>; }; /* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */ diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi index 73a8e117a9b9..e532b564e4c9 100644 --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi @@ -1570,12 +1570,12 @@ pmic: pmic@40 { compatible = "ams,as3722"; reg = <0x40>; - interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; ams,system-power-controller; + #gpio-cells = <2>; + gpio-controller; + interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; - gpio-controller; - #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&as3722_default>; @@ -1679,7 +1679,7 @@ ams,ext-control = <1>; }; - vddio_sdmmc1: ldo1 { + reg_vddio_sdmmc1: ldo1 { regulator-name = "VDDIO_SDMMC1"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -1711,7 +1711,7 @@ /* LDO5 not used */ - vddio_sdmmc3: ldo6 { + reg_vddio_sdmmc3: ldo6 { regulator-name = "VDDIO_SDMMC3"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index 3e3b347afe56..3cab9bda918f 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -1600,12 +1600,12 @@ pmic: pmic@40 { compatible = "ams,as3722"; reg = <0x40>; - interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; ams,system-power-controller; + #gpio-cells = <2>; + gpio-controller; + interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; - gpio-controller; - #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&as3722_default>; @@ -1709,7 +1709,7 @@ ams,ext-control = <1>; }; - vddio_sdmmc1: ldo1 { + reg_vddio_sdmmc1: ldo1 { regulator-name = "VDDIO_SDMMC1"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -1741,7 +1741,7 @@ /* LDO5 not used */ - vddio_sdmmc3: ldo6 { + reg_vddio_sdmmc3: ldo6 { regulator-name = "VDDIO_SDMMC3"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; From patchwork Thu Oct 18 11:14:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985796 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 42bRKL6RGHz9sCm for ; Thu, 18 Oct 2018 22:15:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727597AbeJRTPZ (ORCPT ); Thu, 18 Oct 2018 15:15:25 -0400 Received: from mout.perfora.net ([74.208.4.196]:43505 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728172AbeJRTPP (ORCPT ); Thu, 18 Oct 2018 15:15:15 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LfhYy-1fpYsw3EZW-00pPIK; Thu, 18 Oct 2018 13:14:29 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LfhYy-1fpYsw3EZW-00pPIK; Thu, 18 Oct 2018 13:14:29 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 5/7] ARM: tegra: apalis_t30/tk1: annotate power I2C being on-module Date: Thu, 18 Oct 2018 13:14:09 +0200 Message-Id: <20181018111411.26623-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:6ytx73dKNmKS4wTx5/ab2c+OWSE8abSKVDkRutB3nqgKttHMjut J27WQ93Q8ZwQyw4/vZnjEeVCFXgKgA9UeAgKCwektj4de8WPtgDd9uE1f3j3V21bF15Sppo NR5lf4IiyY/ILz0KXNHE1t0jBycru/ZcVxL0TLCHmct2YiQc6wmNb2l+lZ223K8SqiYlCju SmitiD17R0IOVS6Bd9fvg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:2FouDlTDRI0=:uX8ODmuzU7Wev47uEHHzi+ 3zKZkVuGk1VVVZmKXRXhdW2PFxPUa0X2Eh6s3NHCDrmq6K68TOBslZ8opX9Kw1eol9zEev6j1 p+/EQ05a/RLCDWfHjrPf0Q4eah2Y86hQVyMav6j8L9zFZDPh8htoIwBXzDwTng3vTJjSQOzh8 TsZzou/UKebK/mCSSa5fjHFxNfFCbTKVvNf0mjAQSotssdwGuGFbudRWuxF4xHMbU4szDVdJx BOb2+msLWGlx/+w76TgO2eeLZA7S7N6zWBpai4AvK1LFj1EMtI++k3BI/DbSOBjlnER4Nl+jB fGnbZJLMy4sbUYd4AJuIP9Vt//mnk7nBpj0JLRalrMEhfPgrpQHV+OAAFrNNOhT1w3Tin9yXA mxLvvbjXv1+XMv/3A4muej/ZPJLWMsKqr/IFKzpyEzXOwO9cmUqf7/VdENdIdPQDwNMrQUTSe LMvAdYWV5rk67b5JBuKnPchm03aMkAFdw3LZjA0Qw/d2ECqRz2e7lIFQcQxP+8/8xyFjynkvX WrnSaQRHbTDuHLGx7cLN01UXtyEepO8c4+1va5rASisKkwj40En7SKoVf1sOz9fwLDggiUy6V qEwnqCHkUM7vYCBspgAQKLOgali/ie27YbtQuNCUKcGSCQKZS7h3wNk5/Iwy9Eh5Nfw29ddHX ng81tnSQnRNn8cdyNQxq5dcS7SlQ8Ie2K38tSHryvV3I998lY0gAsUX0b1AY5S3p0rFg= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler The power I2C bus aka PWR_I2C which connects to the audio codec, PMIC, temperature sensor and touch screen controller is really on-module only. Signed-off-by: Marcel Ziswiler --- Changes in v3: None Changes in v2: None Changes in v1: None arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 5 ++++- arch/arm/boot/dts/tegra124-apalis.dtsi | 5 ++++- arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 2 +- arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi index e532b564e4c9..0d095729b46b 100644 --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi @@ -1552,7 +1552,10 @@ clock-frequency = <10000>; }; - /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */ + /* + * PWR_I2C: power I2C to audio codec, PMIC and temperature sensor + * (On-module) + */ i2c@7000d000 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index 3cab9bda918f..13127415d86b 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -1582,7 +1582,10 @@ clock-frequency = <10000>; }; - /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */ + /* + * PWR_I2C: power I2C to audio codec, PMIC and temperature sensor + * (On-module) + */ i2c@7000d000 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi index 02f8126481a2..bc714032d771 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi @@ -845,7 +845,7 @@ /* * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and - * touch screen controller + * touch screen controller (On-module) */ i2c@7000d000 { status = "okay"; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index 7f112f192fe9..4b6a8ecaac76 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -836,7 +836,7 @@ /* * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and - * touch screen controller + * touch screen controller (On-module) */ i2c@7000d000 { status = "okay"; From patchwork Thu Oct 18 11:14:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985798 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 42bRKZ3wYTz9sCf for ; Thu, 18 Oct 2018 22:15:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728124AbeJRTPM (ORCPT ); Thu, 18 Oct 2018 15:15:12 -0400 Received: from mout.perfora.net ([74.208.4.196]:57843 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeJRTPL (ORCPT ); Thu, 18 Oct 2018 15:15:11 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M3TuA-1fMNBG41aa-00qwX0; Thu, 18 Oct 2018 13:14:31 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M3TuA-1fMNBG41aa-00qwX0; Thu, 18 Oct 2018 13:14:31 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 6/7] ARM: tegra: colibri_t30: further regulator clean-up Date: Thu, 18 Oct 2018 13:14:10 +0200 Message-Id: <20181018111411.26623-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:HUt2/WPy40WPqBOIwuorF8NCF4hlulqpk+m7QaAEpF9pIP+4EKq gLAVuOBywyGZYRPqxsCs7TruBHRN417HNe4e2WmLD9eyda2Yj7WbwttqdqRXOjV2YltEcgQ Tavr9RlRN9ynHCRubsHeBQdZTajxRBLSbEptE1gNVyGZKZc/Gv4DEPcdZCxegiiSsbrq2y7 p5R6YuDX8QbRijiH9CF/A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:WkSvQmd3ZHQ=:Ru+Sa1/EpmYS1AoOqBQE+S e9e1qe2OnUiPH2ef3CQHAVWrjs/psxZW8ugtwA2HoThThdp19BhVpS2yqZ7nj4I5KLtJIBenX ciTuavqztsR6jq0gfsm7yyID63a4HgWTIfInfpavn4qZQ/3gKu6F5wYQrGlHi1ESgCgieZ32u +ki78k55HPy7QnNSW+XkxJUwQtKJEVyMrQQX0/kEbLEQIjOYkflkPN7bSuxyI9ZpEX20Cpuv2 2yxQ3zhhEoSFr/jpYYbb1fTPMENWdwSZKbf3ypxOCjTyxohaiXfQT3VkvU6zLUTzXIDSlh/VA 2U00TqGkZNBq3cdOYbepj+9bLJ1gBzuUq62G60Bx4ttfn+9IZ67bwv7ffxsNfIMJY0b2bckdH 1rl0mWLGJRur+igE2fsqZhZ5pZJqcEFbfKT2FxO/XTW0/Mkni+QPjEydAdoIM/rjD/8bZCG+B LZjjIaAm6u9IwIZmdriJ5FWYDUnP6OEJK4E6rE7g/9+FO8M4bnYZEqApYWRe+2ameyrt9428q 3kUvoTuvC/aT9SgaPmUhl/M6BuxFQ4yK3YTbcqm0ueygj3PHjDBenqfEQDrqAJfk9BsBzj6HK EmQwckjL/AI489/ryhJQFreO4a5LFEPjGTCTJhinWbcmznFcA6KxoEE46lxCwu+0ENmy5SE5n PSc8aSFVh73hWW2MIjlU1xmnYBDpNBzYLbySyRkarJIwUaE7tzcJwxpXtqgUgD8cFtBM= 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 v3: None Changes in v2: None 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 35af03ca9e90..f3c2dcd3879d 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>; }; }; From patchwork Thu Oct 18 11:14:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 985797 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 42bRKT6kBJz9sBn for ; Thu, 18 Oct 2018 22:15:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728174AbeJRTPO (ORCPT ); Thu, 18 Oct 2018 15:15:14 -0400 Received: from mout.perfora.net ([74.208.4.196]:43825 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeJRTPO (ORCPT ); Thu, 18 Oct 2018 15:15:14 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M3TuA-1fMNBJ0eTQ-00qwX0; Thu, 18 Oct 2018 13:14:33 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M3TuA-1fMNBJ0eTQ-00qwX0; Thu, 18 Oct 2018 13:14:33 +0200 From: Marcel Ziswiler To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Russell King - ARM Linux , Marcel Ziswiler , Thierry Reding , Jonathan Hunter , Rob Herring , Mark Rutland Subject: [PATCH v3 7/7] ARM: tegra: apalis_t30: further regulator clean-up Date: Thu, 18 Oct 2018 13:14:11 +0200 Message-Id: <20181018111411.26623-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181018111411.26623-1-marcel@ziswiler.com> References: <20181018111411.26623-1-marcel@ziswiler.com> X-Provags-ID: V03:K1:T9qJNj1+TfqoPuGakRrsPhp1kd0kteCzQEMf/+VAVA/W+X9PMz7 dXm2quLdzV1nbbsriDsUNEWQtCLSh7b6HR40rqjSs5eb2G4AH1U1I00OX12nDFqGY5odJfl XdUHCULf0vm2Bo+Wy0C338m9GXlvSyo1QApqg1bi+fs536rBvuwZjQl08NH8JVTRVrhTle2 K2/vk0OmVY9YzHkGxWwig== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:p+afqvHd+TM=:wcpEW61kFchruk3xf9UtWn bj2/5hxB7NCLNOTyOW+FSHba5PEVOW1zmYdhVUbUjzNCjmKO8lts4/joJ1oaKZqPuXZacsNa6 j0fS6XEW0UNh03uad0yAo6sYf/TxsDogyJ4H8xzI5k/wkKfhFcY1NM5H8s3rKEUFm+44+X229 LkGPc3yV25LequdZayUOAm5y5k8NPc9pHdjImsnXBTvMNyFy97nKaSk9dcKkvRwV/t1chAJMf c+g64hnoYk0tZFjTfCZecsuloqy1Is6t0taqPlGkrVFB38i3A1HIrFGpiVUOUGm/4SN/IOT1Y cmSD/eeN/iYNbrL7IcloZuhx5lUA4NL/nFJJhea905Fg1lDCH/59P88n3b8Fszw1ZqgqNEsXt Ug8bWIQ2fziCQzNXjC/NMg4d1H64lwUCVlHHebaX4BKCUrYObtmmZ05mTHc6VLO0q5XoIrNEU XyenzVArIhvadqs9PIDVRfVWH6yyM1+ZxwAH/Cl8cLOjy2HlpZ6yaUVbrEK2XrxjU9hBJjnvx 5mC533BWd3eTEKD6oXYr/u/pJxxroJYHIZrvQ2oC5R/tN7WWY6z0HNjXHmr2iOf6ypkE5WZ53 WNT1Bt2X5fTEV9zU8AEpZgGO/Op6EBzyPREHpFKqfXhmlplJNk/JnOCnRqBWwSAcSTrESYbpU lN4DB96NJhoDg9guHIFqI/JmHDrKT5ONounPNH5HvJwjCLbxyI9cUmMWg1gpHN4/S9J8= 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 v3: - Dropped ASoC patches in favour of sending them as a separate series. 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>; }; };