Unverified Commit 0638dc29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm Arm64 DeviceTree fixes for v6.19

Add missing power-domains to the SC8280XP RPM power-domain and ensure
these are voted for from the remoteproc instances while powering them
up.

Clear a couple of DeviceTree validation warnings in SM8550 and SM8650
USB controller nodes.

Specify the correct display panel on the OnePlus 6.

Correct the UFS clock mapping on Talos, to ensure UFS is properly
clocked.

Add Abel's old emails address to .mailmap.

* tag 'qcom-arm64-fixes-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux

:
  arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node
  arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node
  arm64: dts: qcom: sc8280xp: Add missing VDD_MXC links
  pmdomain: qcom: rpmhpd: Add MXC to SC8280XP
  dt-bindings: power: qcom,rpmpd: Add SC8280XP_MXC_AO
  arm64: dts qcom: sdm845-oneplus-enchilada: Specify panel name within the compatible
  mailmap: Update email address for Abel Vesa
  arm64: dts: qcom: talos: Correct UFS clocks ordering

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0240c897 1f6ca557

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#

Aaron Durbin <adurbin@google.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>

Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>

Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

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

+12 −4
Original line number Diff line number Diff line
@@ -5788,8 +5788,12 @@ remoteproc_nsp0: remoteproc@1b300000 { 
			clocks = <&rpmhcc RPMH_CXO_CLK>;

			clock-names = "xo";



			power-domains = <&rpmhpd SC8280XP_NSP>;

			power-domain-names = "nsp";

			power-domains = <&rpmhpd SC8280XP_NSP>,

					<&rpmhpd SC8280XP_CX>,

					<&rpmhpd SC8280XP_MXC>;

			power-domain-names = "nsp",

					     "cx",

					     "mxc";



			memory-region = <&pil_nsp0_mem>;
@@ -5919,8 +5923,12 @@ remoteproc_nsp1: remoteproc@21300000 { 
			clocks = <&rpmhcc RPMH_CXO_CLK>;

			clock-names = "xo";



			power-domains = <&rpmhpd SC8280XP_NSP>;

			power-domain-names = "nsp";

			power-domains = <&rpmhpd SC8280XP_NSP>,

					<&rpmhpd SC8280XP_CX>,

					<&rpmhpd SC8280XP_MXC>;

			power-domain-names = "nsp",

					     "cx",

					     "mxc";



			memory-region = <&pil_nsp1_mem>;

arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ battery: battery { 
};



&display_panel {

	status = "okay";

	compatible = "samsung,sofef00-ams628nw01", "samsung,sofef00";



	compatible = "samsung,sofef00";

	status = "okay";

};



&bq27441_fg {

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

+0 −2
Original line number Diff line number Diff line
@@ -4133,8 +4133,6 @@ usb_dp_qmpphy_dp_in: endpoint { 
		usb_1: usb@a600000 {

			compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";

			reg = <0x0 0x0a600000 0x0 0xfc100>;

			#address-cells = <1>;

			#size-cells = <0>;



			clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,

				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,

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

+0 −3
Original line number Diff line number Diff line
@@ -5150,9 +5150,6 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, 


			dma-coherent;



			#address-cells = <1>;

			#size-cells = <0>;



			status = "disabled";



			ports {