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

[Greg KH <greg@kroah.com>]

On Mon, Jan 06, 2025 at 03:17:12PM +1100, Stephen Rothwell wrote:
> 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";



Resolution looks good, thanks!

greg k-h