| Message ID | 20220504131923.214367-1-krzysztof.kozlowski@linaro.org |
|---|---|
| Headers | show |
| Series | dt-bindings/arm64: dts: qcom: minor cleanups with DT schema | expand |
On Wed, May 4, 2022 at 5:13 PM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > The patches are independent, so they can be picked up as is (or everything > through Qualcomm SoC tree). > > Best regards, > Krzysztof > > Krzysztof Kozlowski (13): > dt-bindings: soc: qcom: aoss: document qcom,sm8450-aoss-qmp > dt-bindings: soc: qcom: qcom,smd-rpm: add power-controller > dt-bindings: usb: qcom,dwc3: add IPQ8074, MSM8994, QCS404 and SM6125 > dt-bindings: usb: qcom,dwc3: fix clock matching > arm64: dts: qcom: add missing AOSS QMP compatible fallback > arm64: dts: qcom: correct DWC3 node names and unit addresses > arm64: dts: qcom: ipq8074: add dedicated qcom,ipq8074-dwc3 compatible > arm64: dts: qcom: msm8994: add dedicated qcom,msm8994-dwc3 compatible > arm64: dts: qcom: sm6125: add dedicated qcom,sm6125-dwc3 compatible > arm64: dts: qcom: qcs404: add dedicated qcom,qcs404-dwc3 compatible > arm64: dts: qcom: msm8996: add clock-names to DWC3 USB node > arm64: dts: qcom: align DWC3 USB clocks with DT schema > arm64: dts: qcom: align DWC3 USB interrupts with DT schema Looks like all but the first two were applied to usb-next by Greg, causing conflicts with the soc/for-next tree. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 17/05/2022 11:19, Geert Uytterhoeven wrote: > On Wed, May 4, 2022 at 5:13 PM Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> The patches are independent, so they can be picked up as is (or everything >> through Qualcomm SoC tree). >> >> Best regards, >> Krzysztof >> >> Krzysztof Kozlowski (13): >> dt-bindings: soc: qcom: aoss: document qcom,sm8450-aoss-qmp >> dt-bindings: soc: qcom: qcom,smd-rpm: add power-controller >> dt-bindings: usb: qcom,dwc3: add IPQ8074, MSM8994, QCS404 and SM6125 >> dt-bindings: usb: qcom,dwc3: fix clock matching >> arm64: dts: qcom: add missing AOSS QMP compatible fallback >> arm64: dts: qcom: correct DWC3 node names and unit addresses >> arm64: dts: qcom: ipq8074: add dedicated qcom,ipq8074-dwc3 compatible >> arm64: dts: qcom: msm8994: add dedicated qcom,msm8994-dwc3 compatible >> arm64: dts: qcom: sm6125: add dedicated qcom,sm6125-dwc3 compatible >> arm64: dts: qcom: qcs404: add dedicated qcom,qcs404-dwc3 compatible >> arm64: dts: qcom: msm8996: add clock-names to DWC3 USB node >> arm64: dts: qcom: align DWC3 USB clocks with DT schema >> arm64: dts: qcom: align DWC3 USB interrupts with DT schema > > Looks like all but the first two were applied to usb-next by Greg, > causing conflicts with the soc/for-next tree. Also this one was not applied: arm64: dts: qcom: add missing AOSS QMP compatible fallback However I did not get any conflict message... The DTS patches should not go via Greg's tree. They are sent together so there will be no warnings from Rob's bot. This is a common practice for dt-binding fixes. Bjorn, Any preference from you? Shall I send missing three patches to you? What about conflicts with Greg's tree? Best regards, Krzysztof
On 17/05/2022 11:57, Greg Kroah-Hartman wrote: > On Tue, May 17, 2022 at 11:27:39AM +0200, Krzysztof Kozlowski wrote: >> On 17/05/2022 11:19, Geert Uytterhoeven wrote: >>> On Wed, May 4, 2022 at 5:13 PM Krzysztof Kozlowski >>> <krzysztof.kozlowski@linaro.org> wrote: >>>> The patches are independent, so they can be picked up as is (or everything >>>> through Qualcomm SoC tree). >>>> >>>> Best regards, >>>> Krzysztof >>>> >>>> Krzysztof Kozlowski (13): >>>> dt-bindings: soc: qcom: aoss: document qcom,sm8450-aoss-qmp >>>> dt-bindings: soc: qcom: qcom,smd-rpm: add power-controller >>>> dt-bindings: usb: qcom,dwc3: add IPQ8074, MSM8994, QCS404 and SM6125 >>>> dt-bindings: usb: qcom,dwc3: fix clock matching >>>> arm64: dts: qcom: add missing AOSS QMP compatible fallback >>>> arm64: dts: qcom: correct DWC3 node names and unit addresses >>>> arm64: dts: qcom: ipq8074: add dedicated qcom,ipq8074-dwc3 compatible >>>> arm64: dts: qcom: msm8994: add dedicated qcom,msm8994-dwc3 compatible >>>> arm64: dts: qcom: sm6125: add dedicated qcom,sm6125-dwc3 compatible >>>> arm64: dts: qcom: qcs404: add dedicated qcom,qcs404-dwc3 compatible >>>> arm64: dts: qcom: msm8996: add clock-names to DWC3 USB node >>>> arm64: dts: qcom: align DWC3 USB clocks with DT schema >>>> arm64: dts: qcom: align DWC3 USB interrupts with DT schema >>> >>> Looks like all but the first two were applied to usb-next by Greg, >>> causing conflicts with the soc/for-next tree. >> >> Also this one was not applied: >> arm64: dts: qcom: add missing AOSS QMP compatible fallback >> >> However I did not get any conflict message... >> >> The DTS patches should not go via Greg's tree. They are sent together so >> there will be no warnings from Rob's bot. This is a common practice for >> dt-binding fixes. >> >> Bjorn, >> Any preference from you? Shall I send missing three patches to you? >> >> What about conflicts with Greg's tree? > > If I need to revert anything from my tree, please let me know. Trying > to figure out who should, and should not, take patches like this is > driving me crazy... Sorry for the confusion Greg. I marked preferred merging strategy in the cover letter. I am trying to sort it out with Bjorn. The conflict will hit later Linus and it is auto-solvable with decent mergetool, but for a human's eye it is a confusing diff. Some more background: Patches marked with "dts" prefix should always go via respective arm-soc maintainer, not only to reduce conflicts, but also to keep hardware description (Devicetree sources, DTS) separate from implementation. Otherwise some folks like to combine ABI-breaking changes in drivers together with DTS patches, so from the kernel perspective it looks like there is no ABI breakage. But there is, just not directly visible. Therefore arm-soc folks always insist on having DTS changes in separate branches, so this split driver-DTS is clear. Best regards, Krzysztof
On Wed, 4 May 2022 15:19:15 +0200, Krzysztof Kozlowski wrote: > The AOSS QMP bindings expect all compatibles to be followed by fallback > "qcom,aoss-qmp" because all of these are actually compatible with each > other. This fixes dtbs_check warnings like: > > sm8250-hdk.dtb: power-controller@c300000: compatible: ['qcom,sm8250-aoss-qmp'] is too short > > > [...] Applied, thanks! [05/13] arm64: dts: qcom: add missing AOSS QMP compatible fallback https://git.kernel.org/krzk/linux/c/9a2f272b5f665ac945bc06f7b2e7cdf1cd974cce Best regards,
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?) Regards, Bjorn
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@mail.gmail.com/ [2] https://lore.kernel.org/linux-usb/CALAqxLXrs0_Xs0JV5H-wS1q2CJ7XhW5Dj90eu=uazkRXXEMUxQ@mail.gmail.com/ [3] https://lore.kernel.org/all/20201020115959.2658-1-Sergey.Semin@baikalelectronics.ru/ Best regards, Krzysztof
On Wed, 4 May 2022 15:19:10 +0200, Krzysztof Kozlowski wrote: > The patches are independent, so they can be picked up as is (or everything > through Qualcomm SoC tree). > > Best regards, > Krzysztof > > Krzysztof Kozlowski (13): > dt-bindings: soc: qcom: aoss: document qcom,sm8450-aoss-qmp > dt-bindings: soc: qcom: qcom,smd-rpm: add power-controller > dt-bindings: usb: qcom,dwc3: add IPQ8074, MSM8994, QCS404 and SM6125 > dt-bindings: usb: qcom,dwc3: fix clock matching > arm64: dts: qcom: add missing AOSS QMP compatible fallback > arm64: dts: qcom: correct DWC3 node names and unit addresses > arm64: dts: qcom: ipq8074: add dedicated qcom,ipq8074-dwc3 compatible > arm64: dts: qcom: msm8994: add dedicated qcom,msm8994-dwc3 compatible > arm64: dts: qcom: sm6125: add dedicated qcom,sm6125-dwc3 compatible > arm64: dts: qcom: qcs404: add dedicated qcom,qcs404-dwc3 compatible > arm64: dts: qcom: msm8996: add clock-names to DWC3 USB node > arm64: dts: qcom: align DWC3 USB clocks with DT schema > arm64: dts: qcom: align DWC3 USB interrupts with DT schema > > [...] Applied, thanks! [05/13] arm64: dts: qcom: add missing AOSS QMP compatible fallback commit: 6ba93ba9f63fbc44c3a6af7fe6f2536d009cfd5a [07/13] arm64: dts: qcom: ipq8074: add dedicated qcom,ipq8074-dwc3 compatible (no commit info) [08/13] arm64: dts: qcom: msm8994: add dedicated qcom,msm8994-dwc3 compatible (no commit info) [09/13] arm64: dts: qcom: sm6125: add dedicated qcom,sm6125-dwc3 compatible (no commit info) [10/13] arm64: dts: qcom: qcs404: add dedicated qcom,qcs404-dwc3 compatible (no commit info) [11/13] arm64: dts: qcom: msm8996: add clock-names to DWC3 USB node (no commit info) [12/13] arm64: dts: qcom: align DWC3 USB clocks with DT schema (no commit info) [13/13] arm64: dts: qcom: align DWC3 USB interrupts with DT schema (no commit info) Best regards,