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>;