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

Commit 913fe035 authored by Tianyi Gou's avatar Tianyi Gou Committed by Deepak Katragadda
Browse files

msm: subsys-pil-tz: Move venus PIL support to generic PIL/SSR driver 



With the generic PIL and SSR driver, there is no need to have an
individual venus PIL driver. Therefore, remove the standalone PIL
venus driver and move the PIL and SSR support for venus to
subsys-pil-tz.

Change-Id: I5678ccbf153f3d804d5170a84f9ffe4b0d80483e
Signed-off-by: default avatarTianyi Gou <tgou@codeaurora.org>
Signed-off-by: default avatarDeepak Katragadda <dkatraga@codeaurora.org>
parent d1b1ab71

Documentation/devicetree/bindings/pil/pil-venus.txt

deleted100644 → 0
+0 −28
Original line number Original line Diff line number Diff line 
* Qualcomm Venus Video Subsystem Peripheral Image Loader



pil-venus is a peripheral image loading (PIL) driver. It is used for loading

venus firmware images for video codec into memory and preparing the subsystem's

processor to execute code. It is also used for shutting down the processor when

it's not needed.



Required properties:

- compatible: "pil-venus"

- reg: offset and length of the register set for the device.

- reg-names: names of the bases for the above registers. "wrapper_base" and

             "vbif_base" are expected.

- vdd-supply: regulator to supply venus.

- qcom,firmware-name: Base name of the firmware image. Ex. "venus"



Optional properties:

- qcom,restart-group: List of subsystems that will need to restart together.



Example:

        qcom,venus@fdce0000 {

                compatible = "qcom,pil-venus";

                reg = <0xfdce0000 0x4000>,

                      <0xfdc80208 0x8>;

		reg-names = "wrapper_base", "vbif_base";

                vdd-supply = <&gdsc_venus>;



                qcom,firmware-name = "venus";

        };

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

+19 −5
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -2210,12 +2210,26 @@ 
	};

	};





	qcom,venus@fdce0000 {

	qcom,venus@fdce0000 {

		compatible = "qcom,pil-venus";

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

		reg = <0xfdce0000 0x4000>,

		reg = <0xfdce0000 0x4000>;

		      <0xfdc80000 0x400>;



		reg-names = "wrapper_base", "vbif_base";

		vdd-supply = <&gdsc_venus>;

		vdd-supply = <&gdsc_venus>;

		proxy-reg-names = "vdd";

		clock-names = "core_clk", "iface_clk",

				"bus_clk", "mem_clk";

		proxy-clock-names = "core_clk", "iface_clk",

					"bus_clk", "mem_clk";



		qcom,msm-bus,name = "pil-venus";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,active-only = <0>;

		qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 0 304000>;





		qcom,pas-id = <9>;

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

		qcom,firmware-name = "venus";

		qcom,firmware-name = "venus";

	};

	};

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

+18 −4
Original line number Original line Diff line number Diff line
@@ -887,12 +887,26 @@ 
	};

	};





	qcom,venus@fdce0000 {

	qcom,venus@fdce0000 {

		compatible = "qcom,pil-venus";

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

		reg = <0xfdce0000 0x4000>,

		reg = <0xfdce0000 0x4000>;

		      <0xfdc80000 0x400>;



		reg-names = "wrapper_base", "vbif_base";

		vdd-supply = <&gdsc_venus>;

		vdd-supply = <&gdsc_venus>;

		proxy-reg-names = "vdd";

		clock-names = "core_clk", "iface_clk",

				"bus_clk", "mem_clk";

		proxy-clock-names = "core_clk", "iface_clk",

					"bus_clk", "mem_clk";



		qcom,msm-bus,name = "pil-venus";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,active-only = <0>;

		qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 0 304000>;





		qcom,pas-id = <9>;

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

		qcom,firmware-name = "venus";

		qcom,firmware-name = "venus";

	};

	};

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

+18 −4
Original line number Original line Diff line number Diff line
@@ -1115,12 +1115,26 @@ 
	};

	};





	qcom,venus@fdce0000 {

	qcom,venus@fdce0000 {

		compatible = "qcom,pil-venus";

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

		reg = <0xfdce0000 0x4000>,

		reg = <0xfdce0000 0x4000>;

		      <0xfdc80000 0x400>;



		reg-names = "wrapper_base", "vbif_base";

		vdd-supply = <&gdsc_venus>;

		vdd-supply = <&gdsc_venus>;

		proxy-reg-names = "vdd";

		clock-names = "core_clk", "iface_clk",

				"bus_clk", "mem_clk";

		proxy-clock-names = "core_clk", "iface_clk",

					"bus_clk", "mem_clk";



		qcom,msm-bus,name = "pil-venus";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,active-only = <0>;

		qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 0 304000>;





		qcom,pas-id = <9>;

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

		qcom,firmware-name = "venus";

		qcom,firmware-name = "venus";

	};

	};

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

+18 −4
Original line number Original line Diff line number Diff line
@@ -2131,12 +2131,26 @@ 
	};

	};





	qcom,venus@fdce0000 {

	qcom,venus@fdce0000 {

		compatible = "qcom,pil-venus";

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

		reg = <0xfdce0000 0x4000>,

		reg = <0xfdce0000 0x4000>;

		      <0xfdc80000 0x400>;



		reg-names = "wrapper_base", "vbif_base";

		vdd-supply = <&gdsc_venus>;

		vdd-supply = <&gdsc_venus>;

		proxy-reg-names = "vdd";

		clock-names = "core_clk", "iface_clk",

				"bus_clk", "mem_clk";

		proxy-clock-names = "core_clk", "iface_clk",

					"bus_clk", "mem_clk";



		qcom,msm-bus,name = "pil-venus";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,active-only = <0>;

		qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 0 304000>;





		qcom,pas-id = <9>;

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

		qcom,firmware-name = "venus";

		qcom,firmware-name = "venus";

	};

	};