mbox series

[GIT,PULL] Qualcomm Arm64 DeviceTree updates for v6.12

Message ID 20240904215752.24465-1-andersson@kernel.org (mailing list archive)
State Not Applicable
Headers show
Series [GIT,PULL] Qualcomm Arm64 DeviceTree updates for v6.12 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git tags/qcom-arm64-for-6.12

Message

Bjorn Andersson Sept. 4, 2024, 9:57 p.m. UTC
The following changes since commit 8400291e289ee6b2bf9779ff1c83a291501f017b:

  Linux 6.11-rc1 (2024-07-28 14:19:55 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git tags/qcom-arm64-for-6.12

for you to fetch changes up to ba728bda663b0e812cb20450d18af5d0edd803a2:

  arm64: dts: qcom: x1e80100: Fix PHY for DP2 (2024-08-30 21:40:28 -0500)

----------------------------------------------------------------
Qualcomm Arm64 DeviceTree updates for v6.12

This introduces support for the following devices:
- Lenovo Thinkpad T14s Gen 6
- Microsoft Surface Laptop 7 laptop
- Lenovo A6000
- Lenovo A6010
- Samsung Galaxy J3,
- Lenovo Vibe K5 (multiple variants)
- LG G4

IPQ5332 global clock controller is marked as an interconnect-provider,
and the USB interrupt triggers are corrected.

Touchscreen description is added to the Samsung Galaxy Core Prime and
Max, and touch keys are added to the Samsung Galaxy Grand Prime and
Galaxy Tab A.

Camera flash is added to BQ Aquaris M5 and X5.

The SD-card slot is described for the QCM6490 IDP.

For SA8775P CPU and LLCC bwmon is added, audio, compute and general
purpose DSP remoteprocs are added, with FastRPC on audio and compute
DSP. CPUidle states, capacity and DPC properties are added.

On SC8180X definitions for the multiport USB controller is introduced,
and enabled on the Lenovo Flex 5G to bring the camera to life. Power key
definitions are added as well.

The RGB camera sensor on the Lenovo ThinkPad X13s is described. PCIe
pinconf properties are cleaned up on this and the CRD. The four USB
Type-A ports found on the SA8295P ADP are enabled.

The modem subsystem remoteproc is introduced on the SDX75 and enabled on
the IDP device.

Camera, display and GPU clock controllers are added for the SM4450
platform.

On the F(x)tec Pro1X device, display, GPU, WiFi, RGB LED, SD-card,
remoteprocs, USB3 SuperSpeed, touchscreen, IO-expander, hall switch,
caps lock LED and camera button are introduced.

The camera clock controller is added to SM8150, and the GPU-only
"amd,imageon" compatible is dropped from the MTP device.

Refgen regulator for the DSI nodes of SM8350 is described, and the
display subsystem interconnect paths are corrected.

The camera control interface controllers are described on both SM8550
and SM8650. The bluetooth node on on SM8550 QRD, SM8650 QRD and SM8650
HDK are transitioned to the power sequence description. WiFi is added to
the SM8550 hardware development kit (HDK).

On the X1 Elite platform, one more UART, a DisplayPort PHY, the USB
multiport controller, a PCIe controller and PHY are added. Orientation
switching is wired up for the USB+DP PHYs. RPMh statistics node is
added. For the X1 Elite CRD the LID switch and the SDX65 modems are
introduced.

----------------------------------------------------------------
Abel Vesa (2):
      arm64: dts: qcom: x1e80100: Add orientation-switch to all USB+DP QMP PHYs
      arm64: dts: qcom: x1e80100: Fix PHY for DP2

Adam Słaboń (1):
      arm64: dts: qcom: msm8939-wingtech-wt82918: Add Lenovo Vibe K5 devices

Ajit Pandey (4):
      dt-bindings: clock: qcom: add DISPCC clocks on SM4450
      dt-bindings: clock: qcom: add CAMCC clocks on SM4450
      dt-bindings: clock: qcom: add GPUCC clocks on SM4450
      arm64: dts: qcom: sm4450: add camera, display and gpu clock controller

Alexander Reimelt (2):
      dt-bindings: arm: qcom: Add LG G4 (h815)
      arm64: dts: qcom: msm8992-lg-h815: Initial support for LG G4 (H815)

Amit Pundir (1):
      arm64: dts: qcom: sm8550-hdk: add the Wifi node

André Apitzsch (4):
      arm64: dts: qcom: msm8916-longcheer-l8910: Add rear flash
      arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash
      arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash
      Revert "arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash"

AngeloGioacchino Del Regno (2):
      dt-bindings: clock: gcc-msm8998: Add Q6 and LPASS clocks definitions
      arm64: dts: qcom: msm8998: Add disabled support for LPASS iommu for Q6

Ankit Sharma (1):
      arm64: dts: qcom: sa8775p: Add capacity and DPC properties

Anton Bambura (1):
      arm64: dts: qcom: msm8916-wingtech-wt865x8: Add Lenovo A6000/A6010

Barnabás Czémán (2):
      arm64: dts: qcom: pm8950: Add resin node
      arm64: dts: qcom: msm8976: Add restart node

Bartosz Golaszewski (4):
      arm64: dts: qcom: sm8650-qrd: use the PMU to power up bluetooth
      arm64: dts: qcom: sa8775p-ride: enable remoteprocs
      arm64: dts: qcom: sa8775p: add CPU idle states
      arm64: dts: qcom: sa8775p: fix the fastrpc label

Bjorn Andersson (14):
      Merge branch 'arm64-fixes-for-6.11' into HEAD
      dt-bindings: clock: qcom: Add missing USB MP resets
      Merge branch '20240730-sc8180x-usb-mp-v2-1-a7dc4265b553@quicinc.com' into arm64-for-6.12
      arm64: dts: qcom: sc8180x-pmics: Add second PMC8180 GPIO
      arm64: dts: qcom: sc8180x: Align USB nodes with binding
      arm64: dts: qcom: sc8180x: Add USB MP controller and phys
      arm64: dts: qcom: sc8180x-primus: Enable the two MP USB ports
      arm64: dts: qcom: sc8180x-lenovo-flex-5g: Enable USB multiport controller
      Merge branch '20240731062916.2680823-7-quic_skakitap@quicinc.com' into arm64-for-6.12
      Merge branch '20240717-dispcc-sm8550-fixes-v2-7-5c4a3128c40b@linaro.org' into arm64-for-6.12
      arm64: dts: qcom: sc8180x: Enable the power key
      Merge branch '20240611133752.2192401-1-quic_ajipan@quicinc.com' into arm64-for-6.12
      Merge branch '20240814-lpass-v1-1-a5bb8f9dfa8b@freebox.fr' into arm64-for-6.12
      Merge branch '20240730054817.1915652-2-quic_varada@quicinc.com' into arm64-for-6.12

Bryan O'Donoghue (1):
      arm64: dts: qcom: sc8280xp-x13s: Enable RGB sensor

Dang Huynh (11):
      arm64: dts: qcom: sm6115-pro1x: Add Hall Switch and Camera Button
      arm64: dts: qcom: sm6115-pro1x: Add PCA9534 IO Expander
      arm64: dts: qcom: sm6115-pro1x: Add Goodix Touchscreen
      arm64: dts: qcom: sm6115-pro1x: Add Caps Lock LED
      arm64: dts: qcom: sm6115-pro1x: Enable SD card slot
      arm64: dts: qcom: sm6115-pro1x: Enable MDSS and GPU
      arm64: dts: qcom: sm6115-pro1x: Hook up USB3 SS
      arm64: dts: qcom: sm6115-pro1x: Add PMI632 Type-C property
      arm64: dts: qcom: sm6115-pro1x: Enable RGB LED
      arm64: dts: qcom: sm6115-pro1x: Enable remoteprocs
      arm64: dts: qcom: sm6115-pro1x: Enable ATH10K WLAN

Danila Tikhonov (1):
      arm64: dts: qcom: sm7125-xiaomi-common: Add reset-gpios for ufs_mem_hc

Dmitry Baryshkov (4):
      dt-bindings: clock: qcom,sm8650-dispcc: replace with symlink
      arm64: dts: qcom: add generic compat string to RPM glink channels
      arm64: dts: qcom: sm8350: add MDSS registers interconnect
      arm64: dts: qcom: sm8350: add refgen regulator

Johan Hovold (24):
      arm64: dts: qcom: sc8280xp-crd: disable PCIe perst pull downs
      arm64: dts: qcom: sc8280xp-crd: clean up PCIe2a pinctrl node
      arm64: dts: qcom: sc8280xp-x13s: disable PCIe perst pull downs
      arm64: dts: qcom: sc8280xp-x13s: clean up PCIe2a pinctrl node
      arm64: dts: qcom: x1e80100-crd: fix PCIe4 PHY supply
      arm64: dts: qcom: x1e80100: fix PCIe domain numbers
      arm64: dts: qcom: x1e80100: add missing PCIe minimum OPP
      arm64: dts: qcom: x1e80100-crd: fix up PCIe6a pinctrl node
      arm64: dts: qcom: x1e80100-crd: disable PCIe6a perst pull down
      arm64: dts: qcom: x1e80100-crd: fix missing PCIe4 gpios
      arm64: dts: qcom: x1e80100-qcp: fix PCIe4 PHY supply
      arm64: dts: qcom: x1e80100-qcp: fix up PCIe6a pinctrl node
      arm64: dts: qcom: x1e80100-qcp: disable PCIe6a perst pull down
      arm64: dts: qcom: x1e80100-qcp: fix missing PCIe4 gpios
      arm64: dts: qcom: x1e80100-vivobook-s15: fix PCIe4 PHY supply
      arm64: dts: qcom: x1e80100-vivobook-s15: fix up PCIe6a pinctrl node
      arm64: dts: qcom: x1e80100-vivobook-s15: disable PCIe6a perst pull down
      arm64: dts: qcom: x1e80100-vivobook-s15: fix missing PCIe4 gpios
      arm64: dts: qcom: x1e80100-yoga-slim7x: fix PCIe4 PHY supply
      arm64: dts: qcom: x1e80100-yoga-slim7x: fix up PCIe6a pinctrl node
      arm64: dts: qcom: x1e80100-yoga-slim7x: disable PCIe6a perst pull down
      arm64: dts: qcom: x1e80100-yoga-slim7x: fix missing PCIe4 gpios
      arm64: dts: qcom: x1e80100: add PCIe5 nodes
      arm64: dts: qcom: x1e80100-crd: enable SDX65 modem

Konrad Dybcio (9):
      arm64: dts: qcom: x1e80100: Fix up hex style
      arm64: dts: qcom: x1e80100: Disable SMB2360_2 by default
      arm64: dts: qcom: x1e80100: Add USB Multiport controller
      dt-bindings: arm: qcom: Add Surface Laptop 7 devices
      arm64: dts: qcom: x1e80100-pmics: Add PMC8380C PWM
      arm64: dts: qcom: x1e80100: Add UART2
      arm64: dts: qcom: Add support for X1-based Surface Laptop 7 devices
      dt-bindings: arm: qcom: Add Lenovo ThinkPad T14s Gen 6
      arm64: dts: qcom: Add X1E78100 ThinkPad T14s Gen 6

Krishna Kurapati (1):
      arm64: dts: qcom: sa8295p-adp: Enable the four USB Type-A ports

Krzysztof Kozlowski (1):
      arm64: dts: qcom: sm8150-mtp: drop incorrect amd,imageon

Lin, Meng-Bo (3):
      arm64: dts: qcom: msm8916-samsung-grandmax: Add touchscreen
      dt-bindings: qcom: Document samsung,j3ltetw
      arm64: dts: qcom: msm8916-samsung-j3ltetw: Add initial device tree

Ling Xu (1):
      arm64: qcom: sa8775p: Add ADSP and CDSP0 fastrpc nodes

Naina Mehta (3):
      arm64: dts: qcom: sdx75: update reserved memory regions for mpss
      arm64: dts: qcom: sdx75: Add remoteproc node
      arm64: dts: qcom: sdx75-idp: enable MPSS remoteproc node

Neil Armstrong (2):
      arm64: dts: qcom: sm8650-hdk: use the PMU to power up bluetooth
      arm64: dts: qcom: sm8550-qrd: use the PMU to power up bluetooth

Nikita Travkin (2):
      dt-bindings: arm: qcom: Add msm8916/39 based Lenovo devices
      arm64: dts: qcom: msm8916-samsung-gt58: Enable the touchkeys

Patrick Wildt (1):
      arm64: dts: qcom: x1e80100-yoga: add wifi calibration variant

Qingqing Zhou (1):
      arm64: dts: qcom: sa8775p: Mark APPS and PCIe SMMUs as DMA coherent

Rajendra Nayak (1):
      arm64: dts: qcom: x1e80100: add rpmh-stats node

Raymond Hackley (2):
      arm64: dts: qcom: msm8916-samsung-rossa: Add touchscreen
      arm64: dts: qcom: msm8916-samsung-fortuna: Add touch keys

Rayyan Ansari (3):
      arm64: dts: qcom: pmi8994: Add label to wled node
      arm64: dts: qcom: pmi8950: Remove address from lpg node
      arm64: dts: qcom: msm8939-samsung-a7: rename pwm node to conform to dtschema

Rob Clark (1):
      arm64: dts: qcom: x1e80100-yoga: Update panel bindings

Sachin Gupta (1):
      arm64: dts: qcom: qcm6490-idp: Add SD Card node

Sagar Cheluvegowda (1):
      arm64: dts: qcom: sa8775p: Add interconnects for ethernet

Satya Priya Kakitapalli (2):
      dt-bindings: clock: qcom: Add SM8150 camera clock controller
      arm64: dts: qcom: Add camera clock controller for sm8150

Srinivas Kandagatla (4):
      arm64: dts: qcom: x1e80100: add soundwire controller resets
      arm64: dts: x1e80100-crd: fix wsa soundwire port mapping
      arm64: dts: x1e80100-qcp: fix wsa soundwire port mapping
      arm64: dts: qcom: sm8250: move lpass codec macros to use clks directly

Stephan Gerhold (1):
      arm64: dts: qcom: x1e80100-crd: Add LID switch

Tengfei Fan (3):
      arm64: dts: qcom: sa8775p: Add CPU and LLCC BWMON
      dt-bindings: mailbox: qcom-ipcc: Add GPDSP0 and GPDSP1 clients
      arm64: dts: qcom: sa8775p: add ADSP, CDSP and GPDSP nodes

Varadarajan Narayanan (3):
      arm64: dts: qcom: ipq5332: Fix interrupt trigger type for usb
      dt-bindings: interconnect: Add Qualcomm IPQ5332 support
      arm64: dts: qcom: ipq5332: Add icc provider ability to gcc

Vladimir Zapolskiy (2):
      arm64: dts: qcom: sm8550: add description of CCI controllers
      arm64: dts: qcom: sm8650: add description of CCI controllers

 Documentation/devicetree/bindings/arm/qcom.yaml    |   19 +
 .../bindings/clock/qcom,ipq5332-gcc.yaml           |    2 +
 .../bindings/clock/qcom,sm4450-camcc.yaml          |   63 ++
 .../bindings/clock/qcom,sm4450-dispcc.yaml         |   71 ++
 .../bindings/clock/qcom,sm8150-camcc.yaml          |   77 ++
 .../bindings/clock/qcom,sm8450-gpucc.yaml          |    2 +
 arch/arm64/boot/dts/qcom/Makefile                  |   10 +
 arch/arm64/boot/dts/qcom/ipq5332.dtsi              |   11 +-
 arch/arm64/boot/dts/qcom/ipq6018.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/ipq9574.dtsi              |    2 +-
 .../boot/dts/qcom/msm8916-longcheer-l8910.dts      |   27 +
 .../dts/qcom/msm8916-samsung-fortuna-common.dtsi   |    2 +
 .../boot/dts/qcom/msm8916-samsung-grandmax.dts     |   24 +-
 arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts  |    1 +
 .../boot/dts/qcom/msm8916-samsung-j3-common.dtsi   |   62 ++
 .../boot/dts/qcom/msm8916-samsung-j3ltetw.dts      |   31 +
 arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts |   20 +
 .../boot/dts/qcom/msm8916-wingtech-wt86518.dts     |   87 ++
 .../boot/dts/qcom/msm8916-wingtech-wt86528.dts     |  158 +++
 .../boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi    |  215 +++++
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi       |  162 ++++
 .../boot/dts/qcom/msm8929-wingtech-wt82918hd.dts   |   17 +
 arch/arm64/boot/dts/qcom/msm8929.dtsi              |    7 +
 .../boot/dts/qcom/msm8939-longcheer-l9100.dts      |   27 +
 arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts    |    2 +-
 .../boot/dts/qcom/msm8939-wingtech-wt82918.dts     |   17 +
 .../boot/dts/qcom/msm8939-wingtech-wt82918.dtsi    |  252 +++++
 .../boot/dts/qcom/msm8939-wingtech-wt82918hd.dts   |   17 +
 arch/arm64/boot/dts/qcom/msm8939.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/msm8953.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/msm8976.dtsi              |    7 +-
 arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts       |  231 +++++
 arch/arm64/boot/dts/qcom/msm8994.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/msm8996.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi              |   29 +-
 arch/arm64/boot/dts/qcom/pm8950.dtsi               |   10 +-
 arch/arm64/boot/dts/qcom/pmi8950.dtsi              |    3 +-
 arch/arm64/boot/dts/qcom/pmi8994.dtsi              |    3 +
 arch/arm64/boot/dts/qcom/qcm2290.dtsi              |    2 +-
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts           |   33 +
 arch/arm64/boot/dts/qcom/qcs404.dtsi               |    2 +-
 arch/arm64/boot/dts/qcom/sa8155p.dtsi              |    4 +
 arch/arm64/boot/dts/qcom/sa8295p-adp.dts           |   83 ++
 arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi         |   25 +
 arch/arm64/boot/dts/qcom/sa8775p.dtsi              | 1006 ++++++++++++++++++++
 .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts |   38 +
 arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi        |   18 +-
 arch/arm64/boot/dts/qcom/sc8180x-primus.dts        |   64 ++
 arch/arm64/boot/dts/qcom/sc8180x.dtsi              |  181 +++-
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts          |   16 +-
 .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts     |   83 +-
 arch/arm64/boot/dts/qcom/sdm630.dtsi               |    2 +-
 arch/arm64/boot/dts/qcom/sdx75-idp.dts             |    6 +
 arch/arm64/boot/dts/qcom/sdx75.dtsi                |   65 +-
 arch/arm64/boot/dts/qcom/sm4450.dtsi               |   38 +
 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts    |  343 ++++++-
 arch/arm64/boot/dts/qcom/sm6115.dtsi               |    2 +-
 arch/arm64/boot/dts/qcom/sm6125.dtsi               |    2 +-
 arch/arm64/boot/dts/qcom/sm6375.dtsi               |    2 +-
 arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi |    2 +
 arch/arm64/boot/dts/qcom/sm8150-mtp.dts            |    5 -
 arch/arm64/boot/dts/qcom/sm8150.dtsi               |   13 +
 arch/arm64/boot/dts/qcom/sm8250.dtsi               |   31 +-
 arch/arm64/boot/dts/qcom/sm8350.dtsi               |   16 +-
 arch/arm64/boot/dts/qcom/sm8550-hdk.dts            |  113 ++-
 arch/arm64/boot/dts/qcom/sm8550-qrd.dts            |   26 +-
 arch/arm64/boot/dts/qcom/sm8550.dtsi               |  252 +++++
 arch/arm64/boot/dts/qcom/sm8650-hdk.dts            |   26 +-
 arch/arm64/boot/dts/qcom/sm8650-qrd.dts            |   28 +-
 arch/arm64/boot/dts/qcom/sm8650.dtsi               |  291 ++++++
 .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts     |  807 ++++++++++++++++
 .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts   |   46 +-
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts          |  141 ++-
 .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |   75 +-
 .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi  |  835 ++++++++++++++++
 .../boot/dts/qcom/x1e80100-microsoft-romulus13.dts |   13 +
 .../boot/dts/qcom/x1e80100-microsoft-romulus15.dts |   13 +
 arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi       |   10 +
 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts          |   59 +-
 arch/arm64/boot/dts/qcom/x1e80100.dtsi             |  500 +++++++++-
 include/dt-bindings/clock/qcom,gcc-msm8998.h       |    5 +
 include/dt-bindings/clock/qcom,gcc-sc8180x.h       |    4 +
 include/dt-bindings/clock/qcom,sm4450-camcc.h      |  106 +++
 include/dt-bindings/clock/qcom,sm4450-dispcc.h     |   51 +
 include/dt-bindings/clock/qcom,sm4450-gpucc.h      |   62 ++
 include/dt-bindings/clock/qcom,sm8150-camcc.h      |  135 +++
 include/dt-bindings/clock/qcom,sm8650-dispcc.h     |  103 +-
 include/dt-bindings/interconnect/qcom,ipq5332.h    |   46 +
 include/dt-bindings/mailbox/qcom-ipcc.h            |    2 +
 90 files changed, 7153 insertions(+), 358 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm4450-camcc.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm4450-dispcc.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8150-camcc.yaml
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j3-common.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j3ltetw.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86518.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86528.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8929-wingtech-wt82918hd.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8929.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918hd.dts
 create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts
 create mode 100644 arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts
 create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus13.dts
 create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus15.dts
 create mode 100644 include/dt-bindings/clock/qcom,sm4450-camcc.h
 create mode 100644 include/dt-bindings/clock/qcom,sm4450-dispcc.h
 create mode 100644 include/dt-bindings/clock/qcom,sm4450-gpucc.h
 create mode 100644 include/dt-bindings/clock/qcom,sm8150-camcc.h
 mode change 100644 => 120000 include/dt-bindings/clock/qcom,sm8650-dispcc.h
 create mode 100644 include/dt-bindings/interconnect/qcom,ipq5332.h

Comments

Arnd Bergmann Sept. 5, 2024, 10:31 a.m. UTC | #1
On Wed, Sep 4, 2024, at 21:57, Bjorn Andersson wrote:
> The following changes since commit 8400291e289ee6b2bf9779ff1c83a291501f017b:
>
>   Linux 6.11-rc1 (2024-07-28 14:19:55 -0700)
>
> are available in the Git repository at:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git 
> tags/qcom-arm64-for-6.12
>
> for you to fetch changes up to ba728bda663b0e812cb20450d18af5d0edd803a2:
>
>   arm64: dts: qcom: x1e80100: Fix PHY for DP2 (2024-08-30 21:40:28 -0500)

FYI, this had the same issue as the drivers branch, with contents
of the previously merged upstream branch showing up again:

> Johan Hovold (24):
>       arm64: dts: qcom: sc8280xp-crd: disable PCIe perst pull downs
>       arm64: dts: qcom: sc8280xp-crd: clean up PCIe2a pinctrl node
>       arm64: dts: qcom: sc8280xp-x13s: disable PCIe perst pull downs
>       arm64: dts: qcom: sc8280xp-x13s: clean up PCIe2a pinctrl node
>       arm64: dts: qcom: x1e80100-crd: fix PCIe4 PHY supply
>       arm64: dts: qcom: x1e80100: fix PCIe domain numbers
> ...

I assume you also included these to avoid merge conflicts, but if there
are  only a few trivial conflicts, I would normally prefer to resolve
them myself and get a cleaner merge history.

I verified that the commits above are the ones I already merged, rather
than another copy with different commit IDs and merged the branch now.

     Arnd