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

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

Merge "qcom: pil: Add properties required by the PIL modem driver"

parents 554ea851 426ced64

Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt

+15 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ Optional properties: 
- qcom,vdd_pll:       Voltage to be set for the PLL's rail.

- reg-names:          "cxrail_bhs_reg" - control register for modem power

		      domain.

- clocks:	      Array of <clock_controller_phandle clock_reference> listing

		      all the clocks that are accesed by this subsystem.

- qcom,proxy-clock-names:  Names of the clocks that need to be turned on/off during

			   proxy voting/unvoting.

- qcom,active-clock-names: Names of the clocks that need to be turned on for the

			   subsystem to run. Turned off when the subsystem is shutdown.

- clock-names:		   Names of all the clocks that are accessed by the subsystem.

- qcom,is-not-loadable: Boolean- Present if the image does not need to

			be loaded.

- qcom,pil-self-auth: Boolean- True if authentication is required.
@@ -62,6 +69,14 @@ Example: 
		vdd_mx-supply = <&pm8841_s1>;

		vdd_mx-uV = <105000>;



		clocks = <&clock_rpm clk_xo_pil_mss_clk>,

			 <&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-names = "xo", "iface_clk", "bus_clk", "mem_clk";

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

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



		qcom,is-not-loadable;

		qcom,firmware-name = "mba";

		qcom,pil-self-auth;

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

+2 −2
Original line number Diff line number Diff line
@@ -1563,8 +1563,8 @@ 
			 <&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,

			 <&clock_gcc clk_gcc_boot_rom_ahb_clk>;

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

		proxy-clock-names = "xo";

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

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

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



		qcom,is-loadable;

		qcom,firmware-name = "modem";

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

+2 −2
Original line number Diff line number Diff line
@@ -1443,8 +1443,8 @@ 
			 <&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,

			 <&clock_gcc clk_gcc_boot_rom_ahb_clk>;

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

		proxy-clock-names = "xo";

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

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

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



		qcom,firmware-name = "modem";

		qcom,pil-self-auth;

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

+2 −2
Original line number Diff line number Diff line
@@ -1354,8 +1354,8 @@ 
			 <&clock_gcc clk_gpll0_out_msscc>;

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

			      "gpll0_mss_clk";

		proxy-clock-names = "xo";

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

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

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

				     "gpll0_mss_clk";



		interrupts = <0 24 1>;

drivers/soc/qcom/pil-q6v5-mss.c

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ static int pil_mss_loadable_init(struct modem_data *drv, 
		return PTR_ERR(q6->rom_clk);



	/* Optional. */

	if (of_property_match_string(pdev->dev.of_node, "active-clock-names",

		"gpll0_mss_clk") >= 0)

	if (of_property_match_string(pdev->dev.of_node,

			"qcom,active-clock-names", "gpll0_mss_clk") >= 0)

		q6->gpll0_mss_clk = devm_clk_get(&pdev->dev, "gpll0_mss_clk");



	ret = pil_desc_init(q6_desc);