diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2025-10-30 13:59:52 -0500 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2025-10-30 13:59:52 -0500 |
| commit | 041c12988ad93e60370feabbc4aa6333c61687db (patch) | |
| tree | 69afb2daf14eae8e9a2756cb9034e02721fbcdda | |
| parent | 2377626fd216ebdf17294ac0cabc27614fff07d1 (diff) | |
| parent | 67445dc8a8060309eeb7aebbc41fa0e58302fc09 (diff) | |
Merge branch 'arm64-fixes-for-6.18' into HEAD
Merge the v6.18-fixes branch before we rename talos.dtsi, to avoid merge
issues throughout the rest of the cycle.
| -rw-r--r-- | arch/arm64/boot/dts/qcom/ipq5424.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/qcm2290.dtsi | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/qcom/ipq5424.dtsi b/arch/arm64/boot/dts/qcom/ipq5424.dtsi index 58e6852bebbc..eb393f3fd728 100644 --- a/arch/arm64/boot/dts/qcom/ipq5424.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq5424.dtsi @@ -218,7 +218,7 @@ }; tfa@8a832000 { - reg = <0x0 0x8a832000 0x0 0x7d000>; + reg = <0x0 0x8a832000 0x0 0x80000>; no-map; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi index b909306b3f12..8bf5c5583fc2 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1773,25 +1773,25 @@ }; }; - camss: camss@5c6e000 { + camss: camss@5c11000 { compatible = "qcom,qcm2290-camss"; - reg = <0x0 0x5c6e000 0x0 0x1000>, + reg = <0x0 0x5c11000 0x0 0x1000>, + <0x0 0x5c6e000 0x0 0x1000>, <0x0 0x5c75000 0x0 0x1000>, <0x0 0x5c52000 0x0 0x1000>, <0x0 0x5c53000 0x0 0x1000>, <0x0 0x5c66000 0x0 0x400>, <0x0 0x5c68000 0x0 0x400>, - <0x0 0x5c11000 0x0 0x1000>, <0x0 0x5c6f000 0x0 0x4000>, <0x0 0x5c76000 0x0 0x4000>; - reg-names = "csid0", + reg-names = "top", + "csid0", "csid1", "csiphy0", "csiphy1", "csitpg0", "csitpg1", - "top", "vfe0", "vfe1"; |