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

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

Merge changes I7c618d3e,Ie27d1e68,I4b05cfbd into msm-next 

* changes:
  ARM: dts: msm: Add rtb and sleep-counter nodes for sdm855
  ARM: dts: msm: Add pshold, imem nodes for sdm855
  defconfig: arm64: Enable msm poweroff driver for smd855
parents 78f6d637 da2acb00

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

+42 −0
Original line number Diff line number Diff line
@@ -423,6 +423,48 @@ 
		};

	};





	qcom,msm-imem@146bf000 {

		compatible = "qcom,msm-imem";

		reg = <0x146bf000 0x1000>;

		ranges = <0x0 0x146bf000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		restart_reason@65c {

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		kaslr_offset@6d0 {

			compatible = "qcom,msm-imem-kaslr_offset";

			reg = <0x6d0 12>;

		};

	};



	restart@c264000 {

		compatible = "qcom,pshold";

		reg = <0xc264000 0x4>,

		      <0x1fd3000 0x4>;

		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		qcom,rtb-size = <0x100000>;

	};



	qcom,mpm2-sleep-counter@0xc221000 {

		compatible = "qcom,mpm2-sleep-counter";

		reg = <0xc221000 0x1000>;

		clock-frequency = <32768>;

	};



	clock_rpmh: qcom,rpmhclk {

		compatible = "qcom,dummycc";

		clock-output-names = "rpm_clocks";

arch/arm64/configs/sdm855-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ CONFIG_SPI_SPIDEV=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_MFD_SPMI_PMIC=y

arch/arm64/configs/sdm855_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ CONFIG_SPI_SPIDEV=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_MFD_SPMI_PMIC=y