From patchwork Tue Oct 9 15:25:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981368 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 42V1Jm45T7z9s8F for ; Wed, 10 Oct 2018 02:25:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbeJIWnK (ORCPT ); Tue, 9 Oct 2018 18:43:10 -0400 Received: from mout.perfora.net ([74.208.4.194]:51983 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbeJIWnK (ORCPT ); Tue, 9 Oct 2018 18:43: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 0MUmqY-1gAyjG2XGe-00Y9mR; Tue, 09 Oct 2018 17:25: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 0MUmqY-1gAyjG2XGe-00Y9mR; Tue, 09 Oct 2018 17:25:31 +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 1/8] ARM: tegra: fix simple-panel compatibles Date: Tue, 9 Oct 2018 17:25:16 +0200 Message-Id: <20181009152523.3771-2-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:DdWnYnhdeDeVCEnPW+iX49pwUWTPL9zRyj2SyDLWLucNb2AFecd GTn6qJIysnKbdV5E3EvMfjDDMBLq6iX8f9avGxUEm8BGNFQ9mjaV/0iMUuoDkbSWw/7o0ue RSkRUfrWX5RDQRWfieBuUttsxsjPJKpfN7AD0hTuXGZP2aEAsMb/cY/hQrKFhEbhwBZ4oxa K6a2MiZxhD1FRH7kgWi8Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:Lw0XQisUmqA=:x5Htl5BrfUKOy7O+Ewc2g1 c7G3ieoWbTEkabHZBiYx/vIUD5SLLTn6+rAfR5oEi/6K+mKbN+bF+KTwMWqHGhY7EOrOo221K gYWkxTE7l5jWq3tfRdTR80vvBpyi+nziYIsF3x3KKqHnjmTMnPkysCrEFMa7x3t1AN5NS5fdM ko3YAi2UQ02PVpl/8prOj7ulyp189sOvbYC/o+B/nFxHlPkNSf2U9zZ3LgF54rjZGNNs1z9rW lwtXh0xTDBcUGUUbmcxZ1GQr6mgyMhkOOnbozvpFA6sheC7wgNvnFCIA/RRTb52/Wi4JkGSNp Rmm14M8XArPNo3d4pH0uMXnu5jURZC1lD4nRw20U3vWyFPtc3FnWxSbim5dC9VTOCCig4WVr/ 5YSg3hdrnFy9u6JCBcMo3qYWiSSOBGMB4fV0PO/Vl+ESCOuN1WQAgaPQD9V+zV+kKKSoh7E8t KMX2N8OPGQtiFKmbtdZcQudpIS3kATbE5IdAksX0ahKFviFOb63iAYmQIYsFPZK6mfAx0b3eu T0xZVU9nQpDXwVsDYBhTr8o1swlWeKLkJM5mrlkPvclH3pl1r96KBO/cahXrK8RL5UH+2SN3b +Ip8IxczdsTq689nnnCLIYjFO/ETW76XSnCZYJzvP7uO+Ug6t2Q060l0bDlpweLV/SG8A7P08 I5NTIJMoDq32PjTI+Sh40E+WXOmfZpHJAHL4UcVWTw4hqYqJshd1wkUrZVNVrzcEsuLI= 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 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 Tue Oct 9 15:25:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981376 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 42V1Kb1yz6z9s8F for ; Wed, 10 Oct 2018 02:26:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726747AbeJIWnL (ORCPT ); Tue, 9 Oct 2018 18:43:11 -0400 Received: from mout.perfora.net ([74.208.4.197]:57581 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbeJIWnK (ORCPT ); Tue, 9 Oct 2018 18:43: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 0MVbnF-1gBo4h2TTL-00Yyj6; Tue, 09 Oct 2018 17:25: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 0MVbnF-1gBo4h2TTL-00Yyj6; Tue, 09 Oct 2018 17:25:33 +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 2/8] ARM: tegra: apalis-tk1/colibri_t20/t30: eval/iris: fix regulator gpio enable Date: Tue, 9 Oct 2018 17:25:17 +0200 Message-Id: <20181009152523.3771-3-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:csVlod9DLphVaeaTIyMylXuAX6z/AIAbCOZ4VMbm5Th56MpGDj4 OfOBmFsQHL5kmwCuqOfzSaAsj6ERj34Ulx+qcXyUSNt4HMFq9tbPu1fptxhsnuRmN8MVn5W 75OIHqDkiJpAIVEUvtRpRQYXrUn8mFpPLXFE5jMy2dZ8Rb8oBtsmHu1i14Ds/BLH+yAD7iY DEDv5GFDKDE9t1gjN3cZw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:dGZ4Na06ak0=:fDN1vz9W2DG4vv506PKn3J kf1Nl8bMcgxR2OlEN/IACNCvtkkaGZx1GQehMiZ5uK+vrGzx9ih3uWOjvk8OBEa/QH+QKxP90 iywxftb1F3vh8xZAjWaujoGd2WScoq8vWnWZMqcTI66TX7LDNcWAS7iyhCzG/HZmtY4NNL9et hIia5llVt0CA/mKFgbVQbp55K5R5XNVutqniHex3RUuQaa91U5jk3uo+e9sp8ONhy70OkDxpq Y2E+jSR8wkislDJxjnemoCa4kZkYvHdPnY4dw7HWuFIVbIIQthXg2YXanQlqbffw3NrnwinHb 6ZqND3epYHcA0Mk8tRdLTU4F2sMyD05LfOJx7awiPbTtTxbD72auA9STcc9Opr6loZEgzwWNi 7L53xYmSJDBveauEIAZo2kRaGDbpUVWLTCzd79ZTvgodeQ8D3uQqukh9uaZh9qTTVn1eBuYS9 0pFZUw4TpFjPvvTSa3DksFILWx/nIgrkFeqsNGD/jQs2pEOeTo09qhCUDEmtNj5p//pFjqAJH H50ZbMo+alYQezU9ETSEW+b+FnCjUGDl+1BEG/1lO3m48BPdoUj3iVXoz/Oy3bM0Q8oMUKL1J zdIYhQ45iDYnZcDvKLNMzYJiEwHuEux8R4KvmwEISWG/WXPhGPlfRXe/GEj714Ed+aO3FjGvp olHlg2EzOwvblhvHpqVOPNuhch4M81QA7BTftGxR7AWE/4wHJ0ThAvwOzzpYBBDd4rdU= 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 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 Tue Oct 9 15:25:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981375 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 42V1KV5Tb7z9s8r for ; Wed, 10 Oct 2018 02:26:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726579AbeJIWnL (ORCPT ); Tue, 9 Oct 2018 18:43:11 -0400 Received: from mout.perfora.net ([74.208.4.196]:38311 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726393AbeJIWnK (ORCPT ); Tue, 9 Oct 2018 18:43: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 0Lalt0-1fPali2TY8-00kRL9; Tue, 09 Oct 2018 17:25:35 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lalt0-1fPali2TY8-00kRL9; Tue, 09 Oct 2018 17:25:35 +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 3/8] ARM: tegra: apalis/colibri_t30: fix hdmi regulator Date: Tue, 9 Oct 2018 17:25:18 +0200 Message-Id: <20181009152523.3771-4-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:TxlHnchDp7zNsrdszeUJvfdigjN5JzPkzgZHCOia+qtABLTsRkE qBJO+seO6vWA3AnHZ1ciIJZU5ePXAD4mNGRCP7/m2IOrNOzK/Uef+Sy3lxXQfPexcM4Uu1t ciF8Lat8X8ggjoqytSeTIGItCNK191eC9W4eYqKEICB5E5gGk8eZoMj85pHCxaGOMvvOskp 6+U/8nqzOrnDwUoXCjapQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:apWq/wa1Hww=:ybOmJAzmlP98HLLZT5VmYV JEb1gXzx09/eLvDKNV1iJHMiUnRR0X5DylWJ6xg3MPDn+e8uWc5JjibCtxIF4yV4wxfnVElOM shSJTKIiWfFx702LQ0uXPqNXhZk+TAtH9Ip+mPnoYCupmpZNiI8iuuFI7vqbraw2ptquO8D+i z+Ja0hL/i/VvPYVqnpCVi0y5xm50NKwDtfFf62RRb6krVLcWv5vTM/dpeFpU30i95uk5yB+/W 7o+/bnCSSth4B8G91iOJHPX4ov9W8JAcXT8vKYm7wa7Pm73Fm3bqfLmshi5CAKHAVnsZHYFMy 3PelVmiD1ybJ0ESERS5qh6oUUifx802uHJhkilvV0uuVgrSZf6wMuOb/aLioGn0kHDaZSRwvo IdxUrE6QB/iql1Nt13knRkBaj73uQJJRp7iIW7rz3EPhGZnJpBfpLz3Bqo8Rmh04E67gjrkwy icvAxYds/TtY4DQwB61BAb7sph9LgqA3rH04ehzzJdDwpS6vVNiVvabWaXY4Q2fOybc2R2OhB 2+owFvzSKkp9sU8rHFyFrKqC+votv64SqSeNYb16Rm4LsF+0C4RuJCysA32/n5S+At/+MSs9e RL6W4qh5tp8E5xZGp4OvrZ61XH8YtA+VABvU1sPsNTkiOYxzmo290zPr4WuYBLgV/Nq9O+Fjo yv1DQ6uJ/qmhYmmaT1c14i1v8zfjYPD4AxPIiuhNCSURAvYs++8EmsuCufcbjU45lNSo= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Fix HDMI requiring two regulators being enabled by a single GPIO. Model this using an intermediate reg_en_vdd_hdmi regulator being the vin-supply of them other two. This fixes the display subsystem and gets rid of the following error during boot: reg-fixed-voltage: probe of regulator-3v3-avdd-hdmi failed with error -16 tegra-hdmi 54280000.hdmi: failed to get VDD regulator Signed-off-by: Marcel Ziswiler --- Changes in v1: None arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 16 ++++++++++++---- arch/arm/boot/dts/tegra30-apalis.dtsi | 16 ++++++++++++---- arch/arm/boot/dts/tegra30-colibri.dtsi | 16 ++++++++++++---- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi index 02f8126481a2..065a24ac1052 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi @@ -1133,8 +1133,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_1v8_vio>; + vin-supply = <®_en_vdd_hdmi>; }; reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi { @@ -1143,8 +1142,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_module_3v3>; + vin-supply = <®_en_vdd_hdmi>; }; reg_5v0_charge_pump: regulator-5v0-charge-pump { @@ -1171,6 +1169,16 @@ regulator-always-on; }; + reg_en_vdd_hdmi: regulator-en-vdd-hdmi { + compatible = "regulator-fixed"; + regulator-name = "EN_VDD_HDMI"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; + vin-supply = <®_module_3v3>; + }; + sound { compatible = "toradex,tegra-audio-sgtl5000-apalis_t30", "nvidia,tegra-audio-sgtl5000"; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index 7f112f192fe9..6727c5868425 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -1115,8 +1115,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_1v8_vio>; + vin-supply = <®_en_vdd_hdmi>; }; reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi { @@ -1125,8 +1124,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_module_3v3>; + vin-supply = <®_en_vdd_hdmi>; }; reg_5v0_charge_pump: regulator-5v0-charge-pump { @@ -1153,6 +1151,16 @@ regulator-always-on; }; + reg_en_vdd_hdmi: regulator-en-vdd-hdmi { + compatible = "regulator-fixed"; + regulator-name = "EN_VDD_HDMI"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; + vin-supply = <®_module_3v3>; + }; + sound { compatible = "toradex,tegra-audio-sgtl5000-apalis_t30", "nvidia,tegra-audio-sgtl5000"; diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi index 35af03ca9e90..963f26071415 100644 --- a/arch/arm/boot/dts/tegra30-colibri.dtsi +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi @@ -965,8 +965,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_1v8_vio>; + vin-supply = <®_en_vdd_hdmi>; }; reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi { @@ -975,8 +974,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; - gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; - vin-supply = <®_module_3v3>; + vin-supply = <®_en_vdd_hdmi>; }; reg_5v0_charge_pump: regulator-5v0-charge-pump { @@ -1012,6 +1010,16 @@ regulator-always-on; }; + reg_en_vdd_hdmi: regulator-en-vdd-hdmi { + compatible = "regulator-fixed"; + regulator-name = "EN_VDD_HDMI"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; + vin-supply = <®_module_3v3>; + }; + sound { compatible = "toradex,tegra-audio-sgtl5000-colibri_t30", "nvidia,tegra-audio-sgtl5000"; From patchwork Tue Oct 9 15:25:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981374 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 42V1KP5MXxz9s8F for ; Wed, 10 Oct 2018 02:26:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726871AbeJIWnL (ORCPT ); Tue, 9 Oct 2018 18:43:11 -0400 Received: from mout.perfora.net ([74.208.4.196]:39591 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726607AbeJIWnK (ORCPT ); Tue, 9 Oct 2018 18:43: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 0LzIud-1ffDwP3usL-014TBq; Tue, 09 Oct 2018 17:25:37 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LzIud-1ffDwP3usL-014TBq; Tue, 09 Oct 2018 17:25:37 +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 4/8] ARM: tegra: colibri_t20: reorder pmic properties Date: Tue, 9 Oct 2018 17:25:19 +0200 Message-Id: <20181009152523.3771-5-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:zohQsLqrd3QNzsjgamLGeFJG9VLjVFYCbGyTGdKWh+RSrgpUaPy wqo3Ka3pE+7seZN6q1cigQwifSGi+5b2ikhOOqwFHpvTYXws2OgtbdMs7oS/XN0cTrRbYXI BLXAFWk9aGDQ5K2xf/ra+0uxjhpRBFnIHpreOEwSNnZtUp8g0epTmR1Wp+ocGh1K31IhNoI b0vhyuL9AlKaxrlN6v8wQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:DK2QkN0AtJo=:nhgh0XDIlikeefGjYvWqwX HU7aZco7L+8vz+ss56zHE0dB2yyk7kraC1ukcPD+qMMuFv7XVWY6RaSF537oiRJMGzKMvUxQI 0JMZObppY9X3kJ9OgiajkXSjtv/RFINA2Le5LHyTQ0t11f4B2CNbO94Nd0K+fRkmuKslpWAVr fp1ctr9JqrwU2n13ZDHZS+XQcKO9PRmmhvx7Crvuuv8xMyMAZcBRz4Onr4iAWfBfTlbRSSKyb cpM4l0DIg/KRaUXP0OBqNOrb9Preslv7mjWGevm+oXKsnBb54YJsoUZKA9v941ZETnWYNwWG0 uy32IhbC5C6iJcBO0v4iB9wQKeh8KonuJG4GmTPnUgNKxoNVegczCq8p1pyKN9+WVI9LQnGUt kNMeH/EyRjnMDDJH8Ea5xGpaP78559F44RiEwPxKvtQFlBubFwnjsdSJYU1zqYazGC+ou9Hjr r6xSTuUXTlMmLcjCfrSlQkDAqefzEF7+4l9yvgRbiYjEDZ1QwndbxCYlTc4Ta7uJKX6d8kiwd NaODvH3T65cwaGq5MhEFCz2AGFFoqJuIqYytM9FmDuip86qKkIDPShSzmLf8F+eh1/6lmDkmB q3VshzbDApdHxaTIga2YPb6Toc91TS8RyJV3zFOeuVcG/0+F2LJZIWwqDL3S8CIbXZdWUtmkk SHtEumRv686sE9JwDQK2RCE5ZfRKanOQRiPvh6/L/xC68PkIRCxE0Ilk1+ABKLzyHU6o= 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 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 Tue Oct 9 15:25:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981373 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 42V1KL4jVvz9s8F for ; Wed, 10 Oct 2018 02:26:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726935AbeJIWnP (ORCPT ); Tue, 9 Oct 2018 18:43:15 -0400 Received: from mout.perfora.net ([74.208.4.197]:43933 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726607AbeJIWnP (ORCPT ); Tue, 9 Oct 2018 18:43: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 0LZwwF-1fOlxf3zzB-00lomk; Tue, 09 Oct 2018 17:25:39 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0LZwwF-1fOlxf3zzB-00lomk; Tue, 09 Oct 2018 17:25:39 +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 5/8] ARM: tegra: apalis-tk1: further regulator clean-up Date: Tue, 9 Oct 2018 17:25:20 +0200 Message-Id: <20181009152523.3771-6-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:jZUsxQOc12bYTtYzN2bvLMh1pvVqSpo/qLfcB3ABck2ktu3JPpo x33glYIBp4pTgfHuc/WyuiImVXiABeuvCcXmwwNm2E+OK+Nm6xHnppbidMCH1Exv9qumeuJ b/8IThGZlzXccb/l7N98zZYD+xV+q6G7gsYhgiG8l8eVlhsFgkwZDfWRMTouKIfdiDjWt2v Ta3oF+oc5f7hXKiwEWA8w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:08r0L4282cU=:EKqfy9LQFTQz+COFwUDoPI j7U3IuSShtujB0YfbkyqvQzLcMr2mEDhOo/5755j31ds0rI13p4XPqnssW7fSf+G6T4WGwVsy lP+rBbcfz6sdjuo4GQXVNwfnoswRS/vQ/BnijDRw3dsKf43IYKmniT7f12xBlVKmXLog4MxBW aNSL25sh3CL9eQSf7YhrAgaZcLMS5fWxaxZYG3ul0bh0DHSqjIWtXwDBwytMm9bkn8mFbqPeo twUedZVuzv7mFnSVXeZnwgD0onexo+gTVY/G/SdKdkikKrN/8XfrIL8h8WCtR7GuZJfj/jfHv k/nHyBdoCc37M2IUfti2ZE+rXFDWH6Eo7ZlbXIeCgs3C0T/H4EuVXVmAknfkYsAIRG7i25919 3O608ec8BahF+UuEnMRcpAUKYD10LjbpAyuiXTb+22dgHqElsPBoDUPpoQnJLAjwQztz4x+7f S8rohbAKUqk/SpTzuM4ZN4G0EMR8cDzwMfYeWJyFAiqe5w9zpT8wLvMF/xKAyf3UPRYQSH4BK JW3sY9QM0AObGFv1LgqDaHco2XjZfworGnstRpExB+WGeRDpQt3/731QSrWN1ue3vyzhA4dMs U/MHdknSiRI40fQZEj28dftBMr+a+xYJPJBJZiKI4ZukfvOB3MnZfIfMvClkRUU24WP2aBw/E u7o0ivpTJ0B2ktuorqrb4lsaOvgfyv2cvFQD9qdFWvAGYRNqbdfP1OjmEV1wOXJAY36g= 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 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 Tue Oct 9 15:25:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981372 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 42V1KJ65qjz9s8F for ; Wed, 10 Oct 2018 02:26:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726969AbeJIWnb (ORCPT ); Tue, 9 Oct 2018 18:43:31 -0400 Received: from mout.perfora.net ([74.208.4.197]:36945 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726722AbeJIWnS (ORCPT ); Tue, 9 Oct 2018 18:43:18 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M4pkR-1fkgX20Lld-00yvpG; Tue, 09 Oct 2018 17:25:41 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0M4pkR-1fkgX20Lld-00yvpG; Tue, 09 Oct 2018 17:25:41 +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 6/8] ARM: tegra: apalis_t30/tk1: annotate power I2C being on-module Date: Tue, 9 Oct 2018 17:25:21 +0200 Message-Id: <20181009152523.3771-7-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:bVpVhmcYoxxIRYXYybXIx0ljwVnPhyjwK5LcnMy2TmYLcuaHIdR kIvlYOPgFN54gahb9j5BLGOM6NBj7C18uR3RhjH0LzX5qSA0wKP19ahrmv2wIPYhpFoAEMx 8qbshpNBZ8tWlXBK2SmRc5miGjdSk7tbCzVQYL7KFMnWBP77s5sTXhWXCaRiy8Lh8BpqptN NKKYMYmDek1PHuSAq2LJA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:0fPFcPXQE7c=:D5S41a/8aqULACxTmwHHUr c3ePDTKnXa/WNCzcyJaPtKIQT5ECihnVZ1hLgb0WclxIZ5ANsMCEtZB2L/uSPmupq+iVmglDI iz4u7N2u8Xmbtu7RqwFv8szRNI3WKLhe1kev07uIHXPUlcHvavi4JOHvpvrOLr5YIyPPNSeJB 0QPsIL3nk04489Ai30+geaoTjcqmco26Hq7coy68iGatPTYeYXiakowAwSpaAD4CKlXich2f+ bop4V2pbGCkmMzl8nPfxb6rbY8fT6Heoa3fxoCt0btaVs2ETLQ6qegYQz7YZQ9K6/VnHfRUup Hbx7CuNfcvyy+ZxxiB0J9GMxc8u81F1b5zUP9po4NEsXJT7QfS+NV4IQBPQ+sns/gHmnuCp+K ooeCszElA8hpyqo9NaJM2E7BXlqxnjCj2Au92LEPfp2D0pyu4cVMLkOi6DO2FRZ1Ck27iJO7c 0Efl5e22otbwso4YFzOcn59zxgtuUJ8a97rGnFWJF/TqG7A4WDNcx+lgCeKb4tlLYypNapzf3 HhRqzvQ135JEx5oguhi9T0sbBKzpbu8DoUqYx/IBogE3mn6w2E0+VYXlVhASyYJsnKJLT5Ysy baopRCVKxnzFm4ehTjeGg5vYWwHPginBwNndOvbeAtNJhEs9L8cU6AMjC/NZIQqZ8A8jbHgjH b9Owm2q+xivVel8lInn3GEoVAgzdU7oSIQcH9v3wRXuGFX2RJrfEzbVj2ehmvCe0boy0= 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 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 065a24ac1052..05e412a7ea17 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 6727c5868425..0f0d0ae93075 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 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>; }; }; From patchwork Tue Oct 9 15:25:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 981371 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 42V1K16N7dz9s9N for ; Wed, 10 Oct 2018 02:25:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727029AbeJIWnV (ORCPT ); Tue, 9 Oct 2018 18:43:21 -0400 Received: from mout.perfora.net ([74.208.4.196]:53441 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727007AbeJIWnU (ORCPT ); Tue, 9 Oct 2018 18:43:20 -0400 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lx5zT-1fd1163hE1-016f3C; Tue, 09 Oct 2018 17:25:46 +0200 Received: from localhost.localdomain.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lx5zT-1fd1163hE1-016f3C; Tue, 09 Oct 2018 17:25:46 +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 8/8] ARM: tegra: apalis_t30: further regulator clean-up Date: Tue, 9 Oct 2018 17:25:23 +0200 Message-Id: <20181009152523.3771-9-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:MQHTjvo8+c2GScTnqI8sAZhpZyyM5ZKewko7K69Vm9vZXjw9dQq di9XGnLjR/VN1umbbx5QRqU2JcxjClK7/vszmolhO8KBj4p2GOM3Acn3aWBsaL6TUiWkC0s hq+9H8JjMkB2NlIYlyNtdSTR+lddJjZl48192vJDZqVeBqSvXUG/ugTWAfG96Xe9KbHB+I4 6JWP9leqwFe9oqn7TfPTg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:j/JfLY4iEsQ=:4DFtgAaNlxCisZwTrSuLp5 POp2CdrKOFVX7bInQZrw1XDYVg8Zobory843QKHJeGyW6z7BWZ+zF48fKBNPcDwzxCt2yRQUx cQDgMqVg1IWBjcV2VtS8Q/2hmVZ1f77VO2yjPbAvjb3C5C6wQB2QgnT/Jmq7x6evKpAX25ehM q5lcsWjix0CYWMeT9ZCucYYARv5GIoYUC0iSsWMO/jDSXmqhNP6u/v5/lJyAftw6LTuMk+FY7 vWOb2lmxK4vcNqX32R5T6y19lklNohz6UWZ6XO6edaWVvybOwwshGhkHM7hkOVC9rvnxp57oW Jtum3DiQt1CB/8sG32IrPg3WvjDfZwwLYW8trafk770zeyfpzD585c/rkK9urptO4hnBfCwoj DTBmBi0wyFn7BKd6wJk4lBu06kBRQdT/l0Q/zMHWq8ypKH8p2ab+nNrrHL0yGzYzglgKFzA1m VISWy6lWP19i3nUrdQm7bu7/9XJStNubEouwdXcMKV8nMOkJD1Qpkijo9WDjPVKHBhMgGbDiU TaHNBGFVpvxdd339ViGXFGAtKJ7U/59XforM9NNRP2hZGZhFowHIjeG4Eg97R8TflqAMPsCAh 9yc8egry51TJGY+cOjbBSeIVj1WgY9yAaT8gx9rZpkFcgDQG3zSN+gVTIN4ZfR/LhkA7zhVAQ agjG66clvE9xG5z+Fv/V0aQPDk4NWQVbtFK0SIDLvoEEvGYv3mHHoWa3Y4vPPRKYWobk= 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 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 05e412a7ea17..600680b5ae6c 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 0f0d0ae93075..85f4b70ed73d 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>; }; };