Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb826773 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I7fe3deb4,I7549c080,I75e5e625,I743c082a,Ie414514c into msm-next 

* changes:
  defconfig: arm64: Enable RPMH and CommandDB for SDM855
  ARM: dts: msm: enable RSC mailboxes for SDM855
  ARM: dts: msm: add CommandDB device bindings for SDM855
  ARM: dts: msm: add system PM device binding for SDM855
  ARM: dts: msm: fix register offsets for APPS RSC for SDM855
parents 7b11778f dfaf138b

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

+12 −4
Original line number Diff line number Diff line
@@ -1219,10 +1219,10 @@ 
		status = "disabled";

	};



	apps_rsc: mailbox@18200000 {

	apps_rsc: mailbox@18220000 {

		compatible = "qcom,tcs-drv";

		label = "apps_rsc";

		reg = <0x18200000 0x100>, <0x18200d00 0x3000>;

		reg = <0x18220000 0x100>, <0x18220d00 0x3000>;

		interrupts = <0 5 0>;

		#mbox-cells = <1>;

		qcom,drv-id = <2>;
@@ -1230,7 +1230,6 @@ 
				  <SLEEP_TCS   3>,

				  <WAKE_TCS    3>,

				  <CONTROL_TCS 1>;

		status = "disabled";

	};



	disp_rsc: mailbox@af20000 {
@@ -1244,7 +1243,6 @@ 
				  <SLEEP_TCS   0>,

				  <WAKE_TCS    0>,

				  <CONTROL_TCS 0>;

		status = "disabled";

	};



	apcs_glb: mailbox@17c00000 {
@@ -1288,6 +1286,16 @@ 
			interrupts = <GIC_SPI 574 IRQ_TYPE_EDGE_RISING>;

		};

	};



	system_pm {

		compatible = "qcom,system-pm";

		mboxes = <&apps_rsc 0>;

	};



	cmd_db: qcom,cmd-db@c3f000c {

		compatible = "qcom,cmd-db";

		reg = <0xc3f000c 8>;

	};

};



&emac_gdsc {

arch/arm64/configs/sdm855-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ CONFIG_CLOCK_CPU_OSM=y 
CONFIG_MSM_DISPCC_SDM855=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y
@@ -342,6 +341,8 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_ICNSS=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QTI_RPMH_API=y

CONFIG_QCOM_GLINK=y

CONFIG_IIO=y

CONFIG_PWM=y

arch/arm64/configs/sdm855_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ CONFIG_CLOCK_CPU_OSM=y 
CONFIG_MSM_DISPCC_SDM855=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y
@@ -355,6 +354,8 @@ CONFIG_MSM_GLADIATOR_HANG_DETECT=y 
CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_ICNSS=y

CONFIG_ICNSS_DEBUG=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QTI_RPMH_API=y

CONFIG_QCOM_GLINK=y

CONFIG_IIO=y

CONFIG_PWM=y