Skip to content

Commit 2bb5a9a

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 DeviceTree fixes for 6.8 This marks an additional GPIO as protected on SM8650 devices, to avoid a system reset caused by a security violation with some firmware versions. It also adds the missing interconnect-names, which resolves a regression where one of the I2C busses on SM6115 devices would no longer probe in Linux. * tag 'qcom-arm64-fixes-for-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sm6115: Fix missing interconnect-names arm64: dts: qcom: sm8650-mtp: add gpio74 as reserved gpio arm64: dts: qcom: sm8650-qrd: add gpio74 as reserved gpio Link: https://lore.kernel.org/r/20240225025205.479589-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents aa8bb98 + cb0bbdc commit 2bb5a9a

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

arch/arm64/boot/dts/qcom/sm6115.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,9 @@
13041304
&config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>,
13051305
<&system_noc MASTER_QUP_0 RPM_ALWAYS_TAG
13061306
&bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>;
1307+
interconnect-names = "qup-core",
1308+
"qup-config",
1309+
"qup-memory";
13071310
#address-cells = <1>;
13081311
#size-cells = <0>;
13091312
status = "disabled";

arch/arm64/boot/dts/qcom/sm8650-mtp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@
622622

623623
&tlmm {
624624
/* Reserved I/Os for NFC */
625-
gpio-reserved-ranges = <32 8>;
625+
gpio-reserved-ranges = <32 8>, <74 1>;
626626

627627
disp0_reset_n_active: disp0-reset-n-active-state {
628628
pins = "gpio133";

arch/arm64/boot/dts/qcom/sm8650-qrd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@
659659

660660
&tlmm {
661661
/* Reserved I/Os for NFC */
662-
gpio-reserved-ranges = <32 8>;
662+
gpio-reserved-ranges = <32 8>, <74 1>;
663663

664664
bt_default: bt-default-state {
665665
bt-en-pins {

0 commit comments

Comments
 (0)