From patchwork Sat Apr 8 14:36:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 9671085 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 83C606028A for ; Sat, 8 Apr 2017 14:55:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6952928553 for ; Sat, 8 Apr 2017 14:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C91328581; Sat, 8 Apr 2017 14:55:29 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 D64442856E for ; Sat, 8 Apr 2017 14:55:28 +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=zQlkaJidD8da/ZOLCz3in4Dyyz9RKpZlU1J9GoRX790=; b=pvfFdyinAINfXQCGCpM0v8FakO oCAQFdXVkuBxYqnKT9CAWPeJFA7s6MXhwMQMcmELS+Ym5hup9LCmwKbzmi7H1315pqm/pzQezAMbU wXs25d5zPnzzXmuO0cUq952y0y8d1JL/bC+dDUdYKt3akLM48ASTZlD0VwJow77iTlkfRWPcEyW9h Dwritn/LoRCJkyiE3/tdtKcaiyWE/jw8ITw3bkrzGT0NhoDv7hCxXimwt+aK5itxq++Jp0Mx/oX+N W+wKy50Xy1zeJdcsIk6DoxJsuH90wkUZSSAny09U+160uxnfCAcKRh8KTxdWJYRkQ2FBsUYG9SxSo jq2dqT+A==; 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 1cwrlv-000419-6X; Sat, 08 Apr 2017 14:55:27 +0000 Received: from ns.lynxeye.de ([87.118.118.114] helo=lynxeye.de) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cwrlr-0002lo-1E for linux-arm-kernel@lists.infradead.org; Sat, 08 Apr 2017 14:55:24 +0000 Received: by lynxeye.de (Postfix, from userid 501) id 87B23E743D6; Sat, 8 Apr 2017 16:36:16 +0200 (CEST) Received: from tellur.intern.lynxeye.de.fritz.box (a89-183-3-227.net-htp.de [89.183.3.227]) by lynxeye.de (Postfix) with ESMTPA id D0B1BE743D2; Sat, 8 Apr 2017 16:36:13 +0200 (CEST) From: Lucas Stach To: Russell King Subject: [RFC PATCH 7/7] ARM: dts: imx6*-hummingboard2: rework regulators Date: Sat, 8 Apr 2017 16:36:07 +0200 Message-Id: <20170408143607.15928-8-dev@lynxeye.de> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170408143607.15928-1-dev@lynxeye.de> References: <20170408143607.15928-1-dev@lynxeye.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170408_075523_411212_338527B1 X-CRM114-Status: GOOD ( 10.42 ) 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: linux-arm-kernel@lists.infradead.org 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 Name the regulators according to the voltage rails they are feeding in the schematic. The USB 2-4 regulators are fixed regulators and are always on, as they are not a VBUS supply for a single USB host port on the i.MX6, but supply VBUS to ports behind a USB hub and there is currently no way to model this in mainline. Signed-off-by: Lucas Stach --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index 892259f..19fe9d1 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -58,7 +58,7 @@ reg_3p3v: regulator-3p3v { compatible = "regulator-fixed"; - regulator-name = "3P3V"; + regulator-name = "VCC_3V2"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; @@ -66,21 +66,22 @@ reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; - regulator-name = "1P8V"; + regulator-name = "VCC_1V8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - reg_usbh1_vbus: regulator-usb-h1-vbus { + reg_usbh2_vbus: regulator-usb-h1-vbus { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; - regulator-name = "usb_h1_vbus"; + regulator-name = "V_USB2"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + regulator-always-on; }; reg_usbotg_vbus: regulator-usb-otg-vbus { @@ -89,33 +90,33 @@ gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; - regulator-name = "usb_otg_vbus"; + regulator-name = "V_USB1"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; - reg_usbh2_vbus: regulator-usb-h2-vbus { - compatible = "regulator-gpio"; + reg_usbh3_vbus: regulator-usb-h2-vbus { + compatible = "regulator-fixed"; enable-active-high; enable-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; - regulator-name = "usb_h2_vbus"; + regulator-name = "V_USB3"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - regulator-boot-on; + regulator-always-on; }; - reg_usbh3_vbus: regulator-usb-h3-vbus { - compatible = "regulator-gpio"; + reg_usbh4_vbus: regulator-usb-h3-vbus { + compatible = "regulator-fixed"; enable-active-high; enable-gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; - regulator-name = "usb_h3_vbus"; + regulator-name = "V_USB4"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - regulator-boot-on; + regulator-always-on; }; reg_usdhc2_vmmc: reg-usdhc2-vmmc { @@ -126,7 +127,7 @@ regulator-boot-on; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>; - regulator-name = "usdhc2_vmmc"; + regulator-name = "V_SD"; startup-delay-us = <1000>; }; @@ -488,7 +489,6 @@ &usbh1 { disable-over-current; - vbus-supply = <®_usbh1_vbus>; status = "okay"; };