Commit 6cd19012 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'qcom-arm64-fixes-for-5.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM64 DT fixes for v5.9

This fixes the OPP table for SDM845 QUP devices to bring back
Bluetooth support, disables SMMU on SDM630 to make the devices boot
again, disables the eMMC controller on Kitakami to prevent permanent
damage and fixes a typo in the pm660.

* tag 'qcom-arm64-fixes-for-5.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: pm660: Fix missing pound sign in interrupt-cells
  arm64: dts: qcom: kitakami: Temporarily disable SDHCI1
  arm64: dts: sdm630: Temporarily disable SMMUs by default
  arm64: dts: sdm845: Fixup OPP table for all qup devices

Link: https://lore.kernel.org/r/20200922000521.39621-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 32fe0116 22f5adc7

arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -221,7 +221,12 @@ 
};



&sdhc1 {

	status = "okay";

	/* There is an issue with the eMMC causing permanent

	 * damage to the card if a quirk isn't addressed.

	 * Until it's fixed, disable the MMC so as not to brick

	 * devices.

	 */

	status = "disabled";



	/* Downstream pushes 2.95V to the sdhci device,

	 * but upstream driver REALLY wants to make vmmc 1.8v

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
			gpio-ranges = <&pm660_gpios 0 0 13>;

			#gpio-cells = <2>;

			interrupt-controller;

			interrupt-cells =<2>;

			#interrupt-cells = <2>;

		};

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ 
				<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>;



			status = "disabled";

		};



		tcsr_mutex_regs: syscon@1f40000 {
@@ -749,6 +751,8 @@ 
				<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>;



			status = "disabled";

		};



		lpass_smmu: iommu@5100000 {
@@ -778,6 +782,8 @@ 
				<GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;



			status = "disabled";

		};



		spmi_bus: spmi@800f000 {
@@ -1074,6 +1080,8 @@ 
				<GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>;



			status = "disabled";

		};



		apcs_glb: mailbox@17911000 {

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

+7 −2
Original line number Diff line number Diff line
@@ -1093,8 +1093,8 @@ 
		qup_opp_table: qup-opp-table {

			compatible = "operating-points-v2";



			opp-19200000 {

				opp-hz = /bits/ 64 <19200000>;

			opp-50000000 {

				opp-hz = /bits/ 64 <50000000>;

				required-opps = <&rpmhpd_opp_min_svs>;

			};
@@ -1107,6 +1107,11 @@ 
				opp-hz = /bits/ 64 <100000000>;

				required-opps = <&rpmhpd_opp_svs>;

			};



			opp-128000000 {

				opp-hz = /bits/ 64 <128000000>;

				required-opps = <&rpmhpd_opp_nom>;

			};

		};



		qupv3_id_0: geniqup@8c0000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE