From patchwork Thu Sep 7 09:05:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Borleis X-Patchwork-Id: 9941871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 817ED6035F for ; Thu, 7 Sep 2017 09:06:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 756F1285EE for ; Thu, 7 Sep 2017 09:06:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A3A4285F0; Thu, 7 Sep 2017 09:06:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0175285FD for ; Thu, 7 Sep 2017 09:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=i0fjGfKIB3F8IMYk+Yt3t1SlqV/sbDmYRzzEfNxlvdw=; b=FJnCMjoXCj0YFbQITh7chg5lgu Ogg/xhUo+sniXoSZymwZeIpeqMPa5AHudnFu69OkIgEmWc6QrL23j4cD9IolfoDoEO8tCVak+Hh/T t/O4slksgXb+s4GDzCJRwC9/vci3t7s94q1nw3nOd8OpRSr8UJ1M52bl6W8D7R8u/tifHX6vt03g7 CzZQUyqz0LUpdtRgzA+aj5WrKtK7kxUQ9m4nZrEAZuQ5sadvfVWP4vpmLlTTq3+z7SQ/d8GTYymeC o4a+UbNqtz5dma/c4rjjZK52S9+SBJnuKgjxR6LgbrjUNcleZ15nIVjUs4H43vX4L0TqsW5N9Wli0 +XLzKoTA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dpslH-00076S-7I; Thu, 07 Sep 2017 09:06:11 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dpslD-00071V-61 for linux-arm-kernel@lists.infradead.org; Thu, 07 Sep 2017 09:06:09 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dpskn-0002Wv-0P; Thu, 07 Sep 2017 11:05:41 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1dpskk-0001IB-KA; Thu, 07 Sep 2017 11:05:38 +0200 From: Juergen Borleis To: devicetree@vger.kernel.org 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170907_020607_426623_2B3C4C9E X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, robh+dt@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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";