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

Commit 9caf9570 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 support for pronto pil"

parents 0a41a844 83904ef0

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

+22 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -180,4 +180,25 @@ 
		interrupt-controller;

		#interrupt-cells = <2>;

	};



	smp2pgpio_ssr_smp2p_4_in: qcom,smp2pgpio-ssr-smp2p-4-in {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <4>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	smp2pgpio_ssr_smp2p_4_out: qcom,smp2pgpio-ssr-smp2p-4-out {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <4>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

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

+38 −0
Original line number Diff line number Diff line
@@ -846,6 +846,44 @@ 
		qcom,bam-producer-pipe-index = <5>;

		qcom,master-id = <86>;

	};



	qcom,pronto@a21b000 {

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

		reg = <0x0a21b000 0x3000>;

		interrupts = <0 149 1>;



		vdd_pronto_pll-supply = <&pmtellurium_l7>;

		proxy-reg-names = "vdd_pronto_pll";

		vdd_pronto_pll-uV-uA = <1800000 18000>;

		clocks = <&clock_gcc clk_xo_pil_pronto_clk>,

			 <&clock_gcc clk_gcc_crypto_clk>,

			 <&clock_gcc clk_gcc_crypto_ahb_clk>,

			 <&clock_gcc clk_gcc_crypto_axi_clk>,

			 <&clock_gcc clk_crypto_clk_src>;



		clock-names = "xo", "scm_core_clk", "scm_iface_clk",

				"scm_bus_clk", "scm_core_clk_src";

		qcom,proxy-clock-names = "xo", "scm_core_clk", "scm_iface_clk",

				 "scm_bus_clk", "scm_core_clk_src";

		qcom,scm_core_clk_src = <80000000>;



		qcom,pas-id = <6>;

		qcom,proxy-timeout-ms = <10000>;

		qcom,smem-id = <422>;

		qcom,sysmon-id = <6>;

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

		qcom,firmware-name = "wcnss";



		/* GPIO inputs from wcnss */

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

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

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

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



                /* GPIO output to wcnss */

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

		linux,contiguous-region = <&reloc_mem>;

	};

};



&gdsc_venus {