From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755566AbbCXRA6 (ORCPT ); Tue, 24 Mar 2015 13:00:58 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33190 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755548AbbCXRAx (ORCPT ); Tue, 24 Mar 2015 13:00:53 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Chen , Shawn Guo Subject: [PATCH 3.14 67/79] ARM: imx6sl-evk: set swbst_reg as vbuss parent reg Date: Tue, 24 Mar 2015 16:46:18 +0100 Message-Id: <20150324154424.451207585@linuxfoundation.org> X-Mailer: git-send-email 2.3.3 In-Reply-To: <20150324154420.803073211@linuxfoundation.org> References: <20150324154420.803073211@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Chen commit 2de9dd0391a74e80922c1bc95a78cedf85bcdc9e upstream. USB vbus 5V is from PMIC SWBST, so set swbst_reg as vbus's parent reg, it fixed a bug that the voltage of vbus is incorrect due to swbst_reg is disabled after boots up. Signed-off-by: Peter Chen Signed-off-by: Shawn Guo Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/imx6sl-evk.dts | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -28,6 +28,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio4 0 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; reg_usb_otg2_vbus: usb_otg2_vbus { @@ -37,6 +38,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio4 2 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; }; };