Unverified Commit 2bb5a9ac authored Mar 04, 2024 by Arnd Bergmann

Merge tag 'qcom-arm64-fixes-for-6.8' of...

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>

parents aa8bb984 cb0bbdc4

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1304,6 +1304,9 @@ &clk_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
		&config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>,
		<&system_noc MASTER_QUP_0 RPM_ALWAYS_TAG
		&bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>;
		interconnect-names = "qup-core",
		"qup-config",
		"qup-memory";
		#address-cells = <1>;
		#size-cells = <0>;
		status = "disabled";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -622,7 +622,7 @@ right_spkr: speaker@0,1 {

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

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -659,7 +659,7 @@ touchscreen@0 {

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

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