Commit 5908704d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-4.20' of... 

Merge tag 'qcom-arm64-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm ARM64 Updates for v4.20

* Update Coresight for MSM8916
* Switch to use mailbox for smp2p and smd on MSM8996
* Add dispcc, dsp, USB, regulator, and other nodes for SDM845
* Drop model/compatible from MSM8916 and MSM8996
* Add compat for db820c
* Add MSM8998 SoC and board support along with associated nodes
* Add RESIN/PON for Qualcomm PM8916 and PM8994

* tag 'qcom-arm64-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

: (31 commits)
  Revert "dt-bindings: thermal: qcom-spmi-temp-alarm: Fix documentation of 'reg'"
  Revert "dt-bindings: iio: vadc: Fix documentation of 'reg'"
  arm64: dts: msm8916: Update coresight bindings for hardware ports
  arm64: dts: msm8996: Transition smp2p and smd to mailbox
  arm64: dts: qcom: pm8998: Add pm8998 thermal zone
  arm64: dts: qcom: pm8998: Add spmi-temp-alarm node
  dt-bindings: thermal: qcom-spmi-temp-alarm: Fix documentation of 'reg'
  arm64: dts: sdm845: Add dispcc node
  arm64: dts: qcom: sdm845: Add adsp, cdsp and slpi smp2p
  arm64: dts: qcom: sdm845-mtp: Add nodes for USB
  arm64: dts: qcom: sdm845-mtp: Add RPMh VRM/XOB regulators
  arm64: dts: qcom: sdm845: Add USB-related nodes
  arm64: dts: qcom: Add AOSS reset driver node for SDM845
  arm64: dts: msm8996: Drop model
  arm64: dts: msm8916: Drop model and compatible
  arm64: dts: db820c: Add qcom,apq8096 to compatible string
  arm64: dts: qcom: Populate pm8998 with additional nodes
  arm64: dts: qcom: msm8998: Add smp2p nodes
  arm64: dts: qcom: msm8998: Add the qfprom node
  arm64: dts: qcom: msm8998: Add firmware node
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6a11b180 6db0483c

arch/arm64/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -545,6 +545,20 @@ 
	};

};



&spmi_bus {

	pm8916_0: pm8916@0 {

		pon@800 {

			resin {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;

				bias-pull-up;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};

	};

};



&wcd_codec {

        status = "okay";

        clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 


/ {

	model = "Qualcomm Technologies, Inc. DB820c";

	compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc";

	compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc", "qcom,apq8096";

};

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -623,3 +623,17 @@ 
		};

	};

};



&spmi_bus {

	pmic@0 {

		pon@800 {

			resin {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;

				bias-pull-up;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};

	};

};

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

+51 −47
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include <dt-bindings/thermal/thermal.h>



/ {

	model = "Qualcomm Technologies, Inc. MSM8916";

	compatible = "qcom,msm8916";



	interrupt-parent = <&intc>;



	#address-cells = <2>;
@@ -1099,13 +1096,14 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			in-ports {

				port {

					tpiu_in: endpoint {

					slave-mode;

						remote-endpoint = <&replicator_out1>;

					};

				};

			};

		};



		funnel@821000 {

			compatible = "arm,coresight-funnel", "arm,primecell";
@@ -1114,7 +1112,7 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			ports {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1132,12 +1130,13 @@ 
				port@4 {

					reg = <4>;

					funnel0_in4: endpoint {

						slave-mode;

						remote-endpoint = <&funnel1_out>;

					};

				};

				port@8 {

					reg = <0>;

			};



			out-ports {

				port {

					funnel0_out: endpoint {

						remote-endpoint = <&etf_in>;

					};
@@ -1152,7 +1151,7 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			ports {

			out-ports {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1168,10 +1167,11 @@ 
						remote-endpoint = <&tpiu_in>;

					};

				};

				port@2 {

					reg = <0>;

			};



			in-ports {

				port {

					replicator_in: endpoint {

						slave-mode;

						remote-endpoint = <&etf_out>;

					};

				};
@@ -1185,19 +1185,16 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			in-ports {

				port {

					etf_in: endpoint {

						slave-mode;

						remote-endpoint = <&funnel0_out>;

					};

				};

				port@1 {

					reg = <0>;

			};



			out-ports {

				port {

					etf_out: endpoint {

						remote-endpoint = <&replicator_in>;

					};
@@ -1212,13 +1209,14 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			in-ports {

				port {

					etr_in: endpoint {

					slave-mode;

						remote-endpoint = <&replicator_out0>;

					};

				};

			};

		};



		funnel@841000 {	/* APSS funnel only 4 inputs are used */

			compatible = "arm,coresight-funnel", "arm,primecell";
@@ -1227,40 +1225,38 @@ 
			clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;

			clock-names = "apb_pclk", "atclk";



			ports {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					funnel1_in0: endpoint {

						slave-mode;

						remote-endpoint = <&etm0_out>;

					};

				};

				port@1 {

					reg = <1>;

					funnel1_in1: endpoint {

						slave-mode;

						remote-endpoint = <&etm1_out>;

					};

				};

				port@2 {

					reg = <2>;

					funnel1_in2: endpoint {

						slave-mode;

						remote-endpoint = <&etm2_out>;

					};

				};

				port@3 {

					reg = <3>;

					funnel1_in3: endpoint {

						slave-mode;

						remote-endpoint = <&etm3_out>;

					};

				};

				port@4 {

					reg = <0>;

			};



			out-ports {

				port {

					funnel1_out: endpoint {

						remote-endpoint = <&funnel0_in4>;

					};
@@ -1309,12 +1305,14 @@ 


			cpu = <&CPU0>;



			out-ports {

				port {

					etm0_out: endpoint {

						remote-endpoint = <&funnel1_in0>;

					};

				};

			};

		};



		etm@85d000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1325,12 +1323,14 @@ 


			cpu = <&CPU1>;



			out-ports {

				port {

					etm1_out: endpoint {

						remote-endpoint = <&funnel1_in1>;

					};

				};

			};

		};



		etm@85e000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1341,12 +1341,14 @@ 


			cpu = <&CPU2>;



			out-ports {

				port {

					etm2_out: endpoint {

						remote-endpoint = <&funnel1_in2>;

					};

				};

			};

		};



		etm@85f000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1357,12 +1359,14 @@ 


			cpu = <&CPU3>;



			out-ports {

				port {

					etm3_out: endpoint {

						remote-endpoint = <&funnel1_in3>;

					};

				};

			};

		};



		venus: video-codec@1d00000 {

			compatible = "qcom,msm8916-venus";

CRA Git | Maintained and supported by SUSTech CRA and CCSE