Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755054AbdIGJFx (ORCPT ); Thu, 7 Sep 2017 05:05:53 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:43333 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754962AbdIGJFr (ORCPT ); Thu, 7 Sep 2017 05:05:47 -0400 From: Juergen Borleis To: devicetree@vger.kernel.org Cc: robh+dt@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux@armlinux.org.uk Subject: [PATCH 6/9] ARM: dts: TQma53: fix and move regulator to its correct location Date: Thu, 7 Sep 2017 11:05:27 +0200 Message-Id: <20170907090530.1241-7-jbe@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170907090530.1241-1-jbe@pengutronix.de> References: <20170907090530.1241-1-jbe@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: jbe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2256 Lines: 80 The referenced 3.3 V regulator is a 3.2 V regulator and part of the 'TQma53' CPU card instead of the development 'mba53' baseboard. So fix the voltage and move it to where it belongs to. Signed-off-by: Juergen Borleis --- arch/arm/boot/dts/imx53-mba53.dts | 10 +--------- arch/arm/boot/dts/imx53-tqma53.dtsi | 14 +++++++------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts index 69733c8473d2b..5b9e9af14aa6c 100644 --- a/arch/arm/boot/dts/imx53-mba53.dts +++ b/arch/arm/boot/dts/imx53-mba53.dts @@ -52,14 +52,6 @@ startup-delay-us = <5000>; }; - reg_3p2v: base3p2v { - compatible = "regulator-fixed"; - regulator-name = "3P2V"; - regulator-min-microvolt = <3200000>; - regulator-max-microvolt = <3200000>; - regulator-always-on; - }; - sound { compatible = "tq,imx53-mba53-sgtl5000", "fsl,imx-audio-sgtl5000"; @@ -193,7 +185,7 @@ }; &esdhc2 { - vmmc-supply = <®_3p3v>; + vmmc-supply = <®_3p2v>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi index fa5d712bd47b8..02eb3f4b605de 100644 --- a/arch/arm/boot/dts/imx53-tqma53.dtsi +++ b/arch/arm/boot/dts/imx53-tqma53.dtsi @@ -20,11 +20,11 @@ reg = <0x70000000 0x40000000>; /* Up to 1GiB */ }; - reg_3p3v: card3p3v { + reg_3p2v: card3p2v { compatible = "regulator-fixed"; - regulator-name = "3P3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + regulator-name = "3P2V"; + regulator-min-microvolt = <3200000>; + regulator-max-microvolt = <3200000>; regulator-always-on; }; }; @@ -33,7 +33,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>, <&pinctrl_esdhc2_cdwp>; - vqmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p2v>; wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "disabled"; @@ -56,8 +56,8 @@ &esdhc3 { /* EMMC */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc3>; - vmmc-supply = <®_3p3v>; - vqmmc-supply = <®_3p3v>; + vmmc-supply = <®_3p2v>; + vqmmc-supply = <®_3p2v>; non-removable; bus-width = <8>; status = "okay"; -- 2.11.0