Unverified Commit 566064e5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-6.12-2' of... 

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

More Qualcomm Arm64 DeviceTree fixes for v6.12

Bring a range of PCIe fixes across the X Elite platform, as well as
marking the NVMe power supply boot-on to avoid glitching the power
supply during boot.

The X Elite CRD audio configuration sees a spelling mistake corrected.

On SM8450 the PCIe 1 PIPE clock definition is corrected, to fix a
regression where this isn't able to acquire it's clocks.

* tag 'qcom-arm64-fixes-for-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: x1e80100: fix PCIe5 interconnect
  arm64: dts: qcom: x1e80100: fix PCIe4 interconnect
  arm64: dts: qcom: x1e80100: Fix up BAR spaces
  arm64: dts: qcom: x1e80100-qcp: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-microsoft-romulus: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-yoga-slim7x: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-vivobook-s15: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-crd: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e78100-t14s: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-crd Rename "Twitter" to "Tweeter"
  arm64: dts: qcom: x1e80100: Fix PCIe 6a lanes description
  arm64: dts: qcom: sm8450 fix PIPE clock specification for pcie1
  arm64: dts: qcom: x1e80100: Add Broadcast_AND region in LLCC block
  arm64: dts: qcom: x1e80100: fix PCIe5 PHY clocks
  arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks

Link: https://lore.kernel.org/r/20241101143206.738617-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 51c4bae0 54376fe1

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

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, 


			clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,

				 <&gcc GCC_PCIE_1_PIPE_CLK_SRC>,

				 <&pcie1_phy>,

				 <&pcie1_phy QMP_PCIE_PIPE_CLK>,

				 <&rpmhcc RPMH_CXO_CLK>,

				 <&gcc GCC_PCIE_1_AUX_CLK>,

				 <&gcc GCC_PCIE_1_CFG_AHB_CLK>,

arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ vreg_nvme: regulator-nvme { 


		pinctrl-0 = <&nvme_reg_en>;

		pinctrl-names = "default";



		regulator-boot-on;

	};



	vph_pwr: regulator-vph-pwr {

arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ vreg_nvme: regulator-nvme { 


		pinctrl-0 = <&nvme_reg_en>;

		pinctrl-names = "default";



		regulator-boot-on;

	};

};

arch/arm64/boot/dts/qcom/x1e80100-crd.dts

+6 −4
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ sound { 
		compatible = "qcom,x1e80100-sndcard";

		model = "X1E80100-CRD";

		audio-routing = "WooferLeft IN", "WSA WSA_SPK1 OUT",

				"TwitterLeft IN", "WSA WSA_SPK2 OUT",

				"TweeterLeft IN", "WSA WSA_SPK2 OUT",

				"WooferRight IN", "WSA2 WSA_SPK2 OUT",

				"TwitterRight IN", "WSA2 WSA_SPK2 OUT",

				"TweeterRight IN", "WSA2 WSA_SPK2 OUT",

				"IN1_HPHL", "HPHL_OUT",

				"IN2_HPHR", "HPHR_OUT",

				"AMIC2", "MIC BIAS2",
@@ -300,6 +300,8 @@ vreg_nvme: regulator-nvme { 


		pinctrl-names = "default";

		pinctrl-0 = <&nvme_reg_en>;



		regulator-boot-on;

	};



	vreg_wwan: regulator-wwan {
@@ -933,7 +935,7 @@ left_tweeter: speaker@0,1 { 
		reg = <0 1>;

		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;

		#sound-dai-cells = <0>;

		sound-name-prefix = "TwitterLeft";

		sound-name-prefix = "TweeterLeft";

		vdd-1p8-supply = <&vreg_l15b_1p8>;

		vdd-io-supply = <&vreg_l12b_1p2>;

		qcom,port-mapping = <4 5 6 7 11 13>;
@@ -986,7 +988,7 @@ right_tweeter: speaker@0,1 { 
		reg = <0 1>;

		reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;

		#sound-dai-cells = <0>;

		sound-name-prefix = "TwitterRight";

		sound-name-prefix = "TweeterRight";

		vdd-1p8-supply = <&vreg_l15b_1p8>;

		vdd-io-supply = <&vreg_l12b_1p2>;

		qcom,port-mapping = <4 5 6 7 11 13>;

arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ vreg_nvme: regulator-nvme { 


		pinctrl-0 = <&nvme_reg_en>;

		pinctrl-names = "default";



		regulator-boot-on;

	};

};