From patchwork Thu Nov 19 07:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JC Kuo X-Patchwork-Id: 1402767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nvidia.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.a=rsa-sha256 header.s=n1 header.b=TlF0TkF4; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CcB4r5PJYz9s1l for ; Thu, 19 Nov 2020 18:24:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726205AbgKSHXu (ORCPT ); Thu, 19 Nov 2020 02:23:50 -0500 Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:14906 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726107AbgKSHXu (ORCPT ); Thu, 19 Nov 2020 02:23:50 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 18 Nov 2020 23:23:54 -0800 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 19 Nov 2020 07:23:49 +0000 Received: from jckuo-lt.nvidia.com (10.124.1.5) by mail.nvidia.com (172.20.187.12) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Thu, 19 Nov 2020 07:23:48 +0000 From: JC Kuo To: , , , CC: , , , , JC Kuo Subject: [PATCH v3] arm64: tegra: jetson-tx1: Fix USB_VBUS_EN0 regulator Date: Thu, 19 Nov 2020 15:23:45 +0800 Message-ID: <20201119072345.447793-1-jckuo@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-NVConfidentiality: public DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1605770634; bh=3XWTs7ZkN8QqsGVpILVS7Gg9g0hCVWZ+/eRA2kxPJ08=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:MIME-Version: X-NVConfidentiality:Content-Transfer-Encoding:Content-Type; b=TlF0TkF4fGfMm0r8dsgcvLGGL55t09EbSmmbop1Uc/weqNFO4UWU6d1/o4EddUxzG yvpt6AJn7Egn+YwKk/3B5xq3jabBpm/FWiyhJ2aeze3STjcdTS8pRZ9oA/JUIcLhgm IjOdhXLKSEBh6pcMrq1J3HU5XCITZsBrB6ORgSWuMmCJXJlLuf+ZoC84sZCL/Zxf7G i8XfzzJKy5WKYSBZCIt2ELKy6Poc3HolO9ewQ0CxWnlJUvM/FuHwTMOWgt+B8HaZue bVKkU+cNfjppFMRo4srA8tID935UVfTFG9bUIZDpOTwW8VpjVQlp/s1Y1bgE3/r0zK 2XUs3CAsvN6Ng== Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org USB Host mode is broken at OTG port of Jetson-TX1 platform because USB_VBUS_EN0 regulator (regulator@11) is being overwritten by vdd-cam-1v2 regulator. This commit rearrange USB_VBUS_EN0 to be regulator@14. Fixes: 257c8047be44 ("arm64: tegra: jetson-tx1: Add camera supplies") Cc: stable@vger.kernel.org Signed-off-by: JC Kuo Reviewed-by: Jon Hunter --- v3: add 'Cc: stable@vger.kernel.org' tag v2: add 'Fixes:' tag add Reviewed-by: Jon Hunter .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index e18e1a9a3011..a9caaf7c0d67 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@ -1663,16 +1663,6 @@ vdd_usb_vbus: regulator@9 { vin-supply = <&vdd_5v0_sys>; }; - vdd_usb_vbus_otg: regulator@11 { - compatible = "regulator-fixed"; - regulator-name = "USB_VBUS_EN0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>; - enable-active-high; - vin-supply = <&vdd_5v0_sys>; - }; - vdd_hdmi: regulator@10 { compatible = "regulator-fixed"; regulator-name = "VDD_HDMI_5V0"; @@ -1712,4 +1702,14 @@ vdd_cam_1v8: regulator@13 { enable-active-high; vin-supply = <&vdd_3v3_sys>; }; + + vdd_usb_vbus_otg: regulator@14 { + compatible = "regulator-fixed"; + regulator-name = "USB_VBUS_EN0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <&vdd_5v0_sys>; + }; };