On 30/06/2022 05:30, Bjorn Andersson wrote: > On Wed 04 May 08:19 CDT 2022, Krzysztof Kozlowski wrote: > [..] >> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> index 692cf4be4eef..6af80a627c3a 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> @@ -3868,7 +3868,7 @@ usb_1: usb@a6f8800 { >> <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>; >> interconnect-names = "usb-ddr", "apps-usb"; >> >> - usb_1_dwc3: dwc3@a600000 { >> + usb_1_dwc3: usb@a600000 { > > Linux uses the dev_name() when identifying each of these controllers in > /sys/class/UDC, as such changing the name here will break existing USB > ConfigFS Gadget users. > > We had this fixed for a while, but where forced to revert it. > > > So I think, in order for us to merge this without breaking AOSP, we'd > need to come up with a way to retain the old UDC name (perhaps a label > property?) Ugh, I thought this was long time solved [1][2] and allowed to merge most of [3] to get merged. [1] https://lore.kernel.org/all/CALAqxLWGujgR7p8Vb5S_RimRVYxwm5XF-c4NkKgMH-43wEBaWg@xxxxxxxxxxxxxx/ [2] https://lore.kernel.org/linux-usb/CALAqxLXrs0_Xs0JV5H-wS1q2CJ7XhW5Dj90eu=uazkRXXEMUxQ@xxxxxxxxxxxxxx/ [3] https://lore.kernel.org/all/20201020115959.2658-1-Sergey.Semin@xxxxxxxxxxxxxxxxxxxx/ Best regards, Krzysztof