linux-kernel - linux-next: manual merge of the usb tree with the qcom tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250106151712.4cf70651@canb.auug.org.au>
Date: Mon, 6 Jan 2025 15:17:12 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Andy Gross <agross@...nel.org>
Cc: Abel Vesa <abel.vesa@...aro.org>, Bjorn Andersson
 <andersson@...nel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Stephan Gerhold
 <stephan.gerhold@...aro.org>
Subject: linux-next: manual merge of the usb tree with the qcom tree

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  arch/arm64/boot/dts/qcom/x1e80100-qcp.dts

between commit:

  ab8f487d2f89 ("arm64: dts: qcom: x1e80100-qcp: Enable SD card support")

from the qcom tree and commit:

  42943457e49d ("arm64: dts: qcom: x1e80100-qcp: Add FSUSB42 USB switches")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
index 9a7b45066be2,f45df1396eae..000000000000
--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
@@@ -943,13 -977,79 +1048,86 @@@
  		};
  	};
  
 +	sdc2_card_det_n: sdc2-card-det-state {
 +		pins = "gpio71";
 +		function = "gpio";
 +		drive-strength = <2>;
 +		bias-pull-up;
 +	};
 +
+ 	usb_1_ss0_sbu_default: usb-1-ss0-sbu-state {
+ 		mode-pins {
+ 			pins = "gpio166";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 			output-high;
+ 		};
+ 
+ 		oe-n-pins {
+ 			pins = "gpio168";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 
+ 		sel-pins {
+ 			pins = "gpio167";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 
+ 	};
+ 
+ 	usb_1_ss1_sbu_default: usb-1-ss1-sbu-state {
+ 		mode-pins {
+ 			pins = "gpio177";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 			output-high;
+ 		};
+ 
+ 		oe-n-pins {
+ 			pins = "gpio179";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 
+ 		sel-pins {
+ 			pins = "gpio178";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 	};
+ 
+ 	usb_1_ss2_sbu_default: usb-1-ss2-sbu-state {
+ 		mode-pins {
+ 			pins = "gpio169";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 			output-high;
+ 		};
+ 
+ 		oe-n-pins {
+ 			pins = "gpio171";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 
+ 		sel-pins {
+ 			pins = "gpio170";
+ 			function = "gpio";
+ 			bias-disable;
+ 			drive-strength = <2>;
+ 		};
+ 	};
+ 
  	wcd_default: wcd-reset-n-active-state {
  		pins = "gpio191";
  		function = "gpio";

Content of type "application/pgp-signature" skipped