Skip to content

Commit f2ebacd

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm DeviceTree fixes for v6.16 The RTC DeviceTree binding was changed in v6.16, to require an explicit flag indicating that we store RTC offset in in an UEFI variable. The result sent X Elite and Lenovo Thinkpad X13s users back to 1970, add the flag to explicitly select the correct configuration for these devices. * tag 'qcom-arm64-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: x1e80100: describe uefi rtc offset arm64: dts: qcom: sc8280xp-x13s: describe uefi rtc offset Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 07d45e8 + e8d3dc4 commit f2ebacd

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,8 @@
10901090
};
10911091

10921092
&pmk8280_rtc {
1093+
qcom,uefi-rtc-info;
1094+
10931095
status = "okay";
10941096
};
10951097

arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@
224224
reg-names = "rtc", "alarm";
225225
interrupts = <0x0 0x62 0x1 IRQ_TYPE_EDGE_RISING>;
226226
qcom,no-alarm; /* alarm owned by ADSP */
227+
qcom,uefi-rtc-info;
227228
};
228229

229230
pmk8550_sdam_2: nvram@7100 {

0 commit comments

Comments
 (0)