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

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

Merge "ARM: dts: msm: Add modem device for MSM ZIRC"

parents e062952e 296f4118

arch/arm/boot/dts/qcom/msmzirc-smp2p.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -79,4 +79,27 @@ 
		compatible = "qcom,smp2pgpio_test_smp2p_1_out";

		gpios = <&smp2pgpio_smp2p_1_out 0 0>;

	};



	/* ssr - inbound entry from mss. */

	smp2pgpio_ssr_smp2p_1_in: qcom,smp2pgpio-ssr-smp2p-1-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "slave-kernel";

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - outbound entry to mss. */

	smp2pgpio_ssr_smp2p_1_out: qcom,smp2pgpio-ssr-smp2p-1-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "master-kernel";

		qcom,remote-pid = <1>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

arch/arm/boot/dts/qcom/msmzirc.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,51 @@ 
		};

	};



	qcom,mss@4080000{

		compatible = "qcom,pil-q6v55-mss";

		reg = <0x4080000 0x100>,

		      <0x194e000 0x400>,

		      <0x4180000 0x040>,

		      <0x1810000 0x004>;

		reg-names = "qdsp6_base", "halt_base", "rmb_base",

			    "restart_reg";



		clocks = <&clock_rpm clk_xo_clk_src>,

			 <&clock_gcc clk_gcc_mss_cfg_ahb_clk>,

			 <&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,

			 <&clock_gcc clk_gcc_boot_rom_ahb_clk>,

			 <&clock_gcc clk_gpll0_out_msscc>;

		clock-names = "xo", "iface_clk", "bus_clk", "mem_clk",

			      "gpll0_mss_clk";

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

		qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk",

					"gpll0_mss_clk";



		interrupts = <0 24 1>;

		vdd_mss-supply = <&pmd9635_s1>;

		vdd_cx-supply = <&pmd9635_s5_corner>;

		vdd_mx-supply = <&pmd9635_l9_corner>;

		vdd_mx-uV = <7>;

		vdd_pll-supply = <&pmd9635_l7>;

		qcom,vdd_pll = <1800000>;

		qcom,firmware-name = "modem";

		qcom,pil-self-auth;

		qcom,sysmon-id = <0>;

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

		qcom,override-acc;

		qcom,qdsp6v56-1-3;



		/* GPIO inputs from mss */

		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>;

		qcom,gpio-err-ready = <&smp2pgpio_ssr_smp2p_1_in 1 0>;

		qcom,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_1_in 2 0>;

		qcom,gpio-stop-ack = <&smp2pgpio_ssr_smp2p_1_in 3 0>;



		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;



		linux,contiguous-region = <&peripheral1_mem>;

	};

};



&gdsc_usb30 {