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

Commit e9d3e53e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdxprairie: Enable subsystem firmware loader support"

parents 098d2b1d b3cb8824

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -293,7 +293,16 @@ CONFIG_RPMSG_CHAR=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_SYSMON_QMI_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000

CONFIG_PANIC_ON_SSR_NOTIF_TIMEOUT=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_CONFIG_RPMH=y

CONFIG_QCOM_COMMAND_DB=y

arch/arm/configs/vendor/sdxprairie_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -283,7 +283,16 @@ CONFIG_RPMSG_CHAR=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_SYSMON_QMI_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000

CONFIG_PANIC_ON_SSR_NOTIF_TIMEOUT=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_CONFIG_RPMH=y

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

+72 −0
Original line number Diff line number Diff line
@@ -240,6 +240,78 @@ 
		status = "ok";

	};



	qcom,msm-imem@1468F000 {

		compatible = "qcom,msm-imem";

		reg = <0x1468F000 0x1000>; /* Address and size of IMEM */

		ranges = <0x0 0x1468F000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		mem_dump_table@10 {

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

			reg = <0x10 8>;

		};



		restart_reason@65c {

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

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

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

			reg = <0x6b0 32>;

		};



		pil@94c {

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

			reg = <0x94c 200>;

		};



		diag_dload@c8 {

			compatible = "qcom,msm-imem-diag-dload";

			reg = <0xc8 200>;

		};

	};



	pil_modem: qcom,mss@4080000 {

		compatible = "qcom,pil-tz-generic";

		reg = <0x4080000 0x100>;



		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clock-names = "xo";

		qcom,proxy-clock-names = "xo";



		vdd_cx-supply = <&VDD_CX_LEVEL>;

		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

		vdd_mss-supply = <&VDD_MODEM_LEVEL>;

		qcom,vdd_mss-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

		qcom,proxy-reg-names = "vdd_cx", "vdd_mss";



		qcom,firmware-name = "modem";

		memory-region = <&mpss_adsp_mem>;

		qcom,pas-id = <4>;

		qcom,smem-id = <421>;

		qcom,sysmon-id = <0>;

		qcom,ssctl-instance-id = <0x12>;



		interrupts-extended = <&intc 0 250 1>,

				<&modem_smp2p_in 0 0>,

				<&modem_smp2p_in 2 0>,

				<&modem_smp2p_in 1 0>,

				<&modem_smp2p_in 3 0>;



		interrupt-names = "qcom,wdog",

				"qcom,err-fatal",

				"qcom,proxy-unvote",

				"qcom,err-ready",

				"qcom,stop-ack";



		qcom,smem-states = <&modem_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";



		status = "ok";

	};



	qcom,msm_gsi {

		compatible = "qcom,msm_gsi";

	};