mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-19 08:11:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'arm64-fixes-for-6.18' into HEAD

Browse Source 
Merge the v6.18-fixes branch before we rename talos.dtsi, to avoid merge
issues throughout the rest of the cycle.
This commit is contained in:
Bjorn Andersson
2025-10-30 13:59:52 -05:00
parent 2377626fd2 67445dc8a8
commit 041c12988a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/qcom/ipq5424.dtsi
View File

@@ -218,7 +218,7 @@ smem@8a800000 {
};
tfa@8a832000 {
reg = <0x0 0x8a832000 0x0 0x7d000>;
reg = <0x0 0x8a832000 0x0 0x80000>;
no-map;
status = "disabled";
};

10
arch/arm64/boot/dts/qcom/qcm2290.dtsi
View File

@@ -1773,25 +1773,25 @@ cci_i2c1: i2c-bus@1 {
};
};
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";