Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d52f1917 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: usb3 switches to virtual reset on msm8996 vplatfrom"

parents 02b5dd0b 75e93feb

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 


		qcom,core-clk-rate = <120000000>;



		resets = <&clock_gcc USB_30_BCR>;

		resets = <&clock_virt USB_30_BCR>;

		reset-names = "core_reset";



		dwc3@6a00000 {
@@ -241,7 +241,7 @@ 
			 <&clock_gcc clk_ln_bb_clk>;

		clock-names = "cfg_ahb_clk", "ref_clk_src";



		resets = <&clock_gcc QUSB2PHY_PRIM_BCR>;

		resets = <&clock_virt QUSB2PHY_PRIM_BCR>;

		reset-names = "phy_reset";

	};
@@ -365,8 +365,8 @@ 
		clock-names = "aux_clk", "pipe_clk", "cfg_ahb_clk",

				"ref_clk_src", "ref_clk";



		resets = <&clock_gcc USB3_PHY_BCR>,

			 <&clock_gcc USB3PHY_PHY_BCR>;

		resets = <&clock_virt USB3_PHY_BCR>,

			 <&clock_virt USB3PHY_PHY_BCR>;

		reset-names = "phy_reset", "phy_phy_reset";

		qcom,disable-autonomous-mode;

	};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -692,6 +692,7 @@ 
	clock_virt: qcom,virtclk-frontend@0 {

		compatible = "qcom,virtclk-frontend-8996";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_gcc: qcom,gcc@300000 {