mbox series

[00/13] dt-bindings/arm64: dts: qcom: minor cleanups with DT schema

Message ID 20220504131923.214367-1-krzysztof.kozlowski@linaro.org (mailing list archive)
Headers show
Series dt-bindings/arm64: dts: qcom: minor cleanups with DT schema | expand

Message

Krzysztof Kozlowski May 4, 2022, 1:19 p.m. UTC
Hi,

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

 .../bindings/soc/qcom/qcom,aoss-qmp.yaml      |   1 +
 .../bindings/soc/qcom/qcom,smd-rpm.yaml       |   3 +
 .../devicetree/bindings/usb/qcom,dwc3.yaml    | 226 ++++++++++++++++--
 arch/arm/boot/dts/qcom-ipq4019.dtsi           |   2 +-
 arch/arm/boot/dts/qcom-sdx55.dtsi             |  11 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts   |  18 +-
 arch/arm64/boot/dts/qcom/ipq6018.dtsi         |  12 +-
 arch/arm64/boot/dts/qcom/ipq8074.dtsi         |  16 +-
 arch/arm64/boot/dts/qcom/msm8953.dtsi         |  11 +-
 arch/arm64/boot/dts/qcom/msm8994.dtsi         |   7 +-
 .../boot/dts/qcom/msm8996-xiaomi-common.dtsi  |  20 +-
 arch/arm64/boot/dts/qcom/msm8996.dtsi         |  23 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi         |  13 +-
 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi      |   7 +-
 arch/arm64/boot/dts/qcom/qcs404.dtsi          |   8 +-
 arch/arm64/boot/dts/qcom/sc7180.dtsi          |  15 +-
 arch/arm64/boot/dts/qcom/sc7280.dtsi          |  34 ++-
 arch/arm64/boot/dts/qcom/sdm630.dtsi          |  12 +-
 arch/arm64/boot/dts/qcom/sdm845.dtsi          |  26 +-
 arch/arm64/boot/dts/qcom/sm6125.dtsi          |  16 +-
 arch/arm64/boot/dts/qcom/sm6350.dtsi          |  11 +-
 arch/arm64/boot/dts/qcom/sm8150.dtsi          |  24 +-
 arch/arm64/boot/dts/qcom/sm8250.dtsi          |  22 +-
 arch/arm64/boot/dts/qcom/sm8350.dtsi          |  23 +-
 arch/arm64/boot/dts/qcom/sm8450.dtsi          |  20 +-
 25 files changed, 424 insertions(+), 157 deletions(-)

Comments

Geert Uytterhoeven May 17, 2022, 9:19 a.m. UTC | #1
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
Krzysztof Kozlowski May 17, 2022, 9:27 a.m. UTC | #2
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
Krzysztof Kozlowski May 17, 2022, 5:08 p.m. UTC | #3
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
Bjorn Andersson July 3, 2022, 3:56 a.m. UTC | #4
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,