Unverified Commit e1d7eed1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM64 DeviceTree fixes for 5.17

This starts off by fixing an issue introduced in a bug fix in the
global clock controller, where the symbol clocks for UFS would
end up picking the wrong parent clock which breaks UFS.

It then makes sure that the reference clock for the USB blocks are
enabled, even with booting without clk_ignore_unused.

It corrects the apps SMMU interrupts defintion by adding a missing
interrupt in the list.

Lastly it disables the Qualcomm crypto hardware (for now) on the Lenovo
Yoga C630, to prevent the cryptomanager tests during boot from crashing
the device.

* tag 'qcom-arm64-fixes-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: c630: disable crypto due to serror
  arm64: dts: qcom: sm8450: fix apps_smmu interrupts
  arm64: dts: qcom: sm8450: enable GCC_USB3_0_CLKREF_EN for usb
  arm64: dts: qcom: sm8350: Correct UFS symbol clocks

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9411ac25 382e3e0e

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+5 −0
Original line number Original line Diff line number Diff line
@@ -807,3 +807,8 @@ 




	qcom,snoc-host-cap-8bit-quirk;

	qcom,snoc-host-cap-8bit-quirk;

};

};



&crypto {

	/* FIXME: qce_start triggers an SError */

	status= "disable";

};

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

+23 −5
Original line number Original line Diff line number Diff line
@@ -35,6 +35,24 @@ 
			clock-frequency = <32000>;

			clock-frequency = <32000>;

			#clock-cells = <0>;

			#clock-cells = <0>;

		};

		};



		ufs_phy_rx_symbol_0_clk: ufs-phy-rx-symbol-0 {

			compatible = "fixed-clock";

			clock-frequency = <1000>;

			#clock-cells = <0>;

		};



		ufs_phy_rx_symbol_1_clk: ufs-phy-rx-symbol-1 {

			compatible = "fixed-clock";

			clock-frequency = <1000>;

			#clock-cells = <0>;

		};



		ufs_phy_tx_symbol_0_clk: ufs-phy-tx-symbol-0 {

			compatible = "fixed-clock";

			clock-frequency = <1000>;

			#clock-cells = <0>;

		};

	};

	};





	cpus {

	cpus {
@@ -603,9 +621,9 @@ 
				 <0>,

				 <0>,

				 <0>,

				 <0>,

				 <0>,

				 <0>,

				 <0>,

				 <&ufs_phy_rx_symbol_0_clk>,

				 <0>,

				 <&ufs_phy_rx_symbol_1_clk>,

				 <0>,

				 <&ufs_phy_tx_symbol_0_clk>,

				 <0>,

				 <0>,

				 <0>;

				 <0>;

		};

		};
@@ -1923,8 +1941,8 @@ 
				<75000000 300000000>,

				<75000000 300000000>,

				<0 0>,

				<0 0>,

				<0 0>,

				<0 0>,

				<75000000 300000000>,

				<0 0>,

				<75000000 300000000>;

				<0 0>;

			status = "disabled";

			status = "disabled";

		};

		};

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -726,7 +726,7 @@ 
			compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";

			compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";

			reg = <0 0x15000000 0 0x100000>;

			reg = <0 0x15000000 0 0x100000>;

			#iommu-cells = <2>;

			#iommu-cells = <2>;

			#global-interrupts = <2>;

			#global-interrupts = <1>;

			interrupts =    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,

			interrupts =    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
@@ -813,6 +813,7 @@ 
					<GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 707 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 707 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,

					<GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,
@@ -1072,9 +1073,10 @@ 
				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,

				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,

				 <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,

				 <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,

				 <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,

				 <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,

				 <&gcc GCC_USB30_PRIM_SLEEP_CLK>;

				 <&gcc GCC_USB30_PRIM_SLEEP_CLK>,

				 <&gcc GCC_USB3_0_CLKREF_EN>;

			clock-names = "cfg_noc", "core", "iface", "mock_utmi",

			clock-names = "cfg_noc", "core", "iface", "mock_utmi",

				      "sleep";

				      "sleep", "xo";





			assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,

			assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,

					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;

					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;