Merge "ARM:dts:msm: Fix DP and USB concurrent issue" (8f24df85) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sa8155-adp-alcor-overlay.dts

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,8 +13,7 @@
	/dts-v1/;		/dts-v1/;
	/plugin/;		/plugin/;

	#include "sa8155-adp-common.dtsi"		#include "sa8155-adp-alcor.dtsi"
	#include "sa8155-adp-alcor-display.dtsi"

	/ {		/ {
	model = "ADP-ALCOR";		model = "ADP-ALCOR";

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,8 +13,7 @@
	/dts-v1/;		/dts-v1/;

	#include "sa8155-v2.dtsi"		#include "sa8155-v2.dtsi"
	#include "sa8155-adp-common.dtsi"		#include "sa8155-adp-alcor.dtsi"
	#include "sa8155-adp-alcor-display.dtsi"

	/ {		/ {
	model = "Qualcomm Technologies, Inc. SA8155 ADP ALCOR";		model = "Qualcomm Technologies, Inc. SA8155 ADP ALCOR";

0 → 100644

+20 −0

Original line number	Original line	Diff line number	Diff line
			/* Copyright (c) 2019, 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
			* only version 2 as published by the Free Software Foundation.
			*
			* This program is distributed in the hope that it will be useful,
			* but WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
			* GNU General Public License for more details.
			*/

			#include "sa8155-adp-common.dtsi"
			#include "sa8155-adp-alcor-display.dtsi"

			&usb0 {
			dwc3@a600000 {
			maximum-speed = "high-speed";
			};
			};