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

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

Merge "ARM: dts: msm: Add SPI config regs base address for trinket"

parents 90d48db2 e8c0fff6

arch/arm64/boot/dts/qcom/trinket-pinctrl.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	tlmm: pinctrl@400000 {

		compatible = "qcom,trinket-pinctrl";

		reg = <0x400000 0xc00000>;

		reg-names = "pinctrl";

		interrupts = <0 227 0>;

		gpio-controller;

		#gpio-cells = <2>;

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

+7 −0
Original line number Diff line number Diff line
@@ -580,6 +580,13 @@ 
		clocks = <&clock_rpmcc RPM_QDSS_CLK>;

	};



	rpm_bus: qcom,rpm-smd {

		compatible = "qcom,rpm-smd";

		rpm-channel-name = "rpm_requests";

		interrupts = <GIC_SPI 194 IRQ_TYPE_EDGE_RISING>;

		rpm-channel-type = <15>; /* SMD_APPS_RPM */

	};



	wdog: qcom,wdt@f017000 {

		compatible = "qcom,msm-watchdog";

		reg = <0xf017000 0x1000>;

arch/arm64/configs/vendor/trinket_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ CONFIG_RPMSG_CHAR=y 
CONFIG_RPMSG_QCOM_GLINK_RPM=y

CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_RPMSG_QCOM_GLINK_SPI=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_QMI_HELPERS=y