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

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

Merge "msm: subsys-pil-tz: Move BCSS PIL/SSR support to generic PIL/SSR driver"

parents eecebf2d cb75b276

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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
* Broadcast Subsystem Peripheral Image Loader



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

and authenticating broadcast demodulator firmware images.



Required properties:

- compatible: "pil-bcss"

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



Optional properties:

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



Example:



	qcom,pil-bcss {

		compatible = "qcom,pil-bcss";



		qcom,firmware-name = "bcss";

	};

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

+3 −1
Original line number Diff line number Diff line
@@ -1086,8 +1086,10 @@ 
	};



	qcom,pil-bcss {

		compatible = "qcom,pil-bcss";

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



		qcom,pas-id = <11>;

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

		qcom,firmware-name = "bcss";

	};

arch/arm/configs/mpq8092_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_LPASS_QDSP6V5=y

CONFIG_MSM_PIL_BCSS=y

CONFIG_MSM_TZ_LOG=y

CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_BUS_SCALING=y

arch/arm/mach-msm/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -961,15 +961,6 @@ config MSM_PIL_MSS_QDSP6V5 


	  If unsure, say N.



config MSM_PIL_BCSS

	tristate "BCSS (Broadcast Subsystem Boot Support)"

	depends on MSM_PIL && MSM_SUBSYSTEM_RESTART

	help

	  Support for booting and shutdown the Broadcast subsystem demodulator.



	  BCSS is the Broadcast subsystem processor to receive and process the

	  Analog/Digital broadcast data from tuners / external demodulator.



config MSM_PIL_PRONTO

	tristate "PRONTO (WCNSS) Boot Support"

	depends on MSM_PIL && MSM_SUBSYSTEM_RESTART

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ obj-$(CONFIG_MSM_PIL_LPASS_QDSP6V5) += pil-q6v5.o pil-q6v5-lpass.o 
obj-$(CONFIG_MSM_PIL_MSS_QDSP6V5) += pil-q6v5.o pil-msa.o pil-q6v5-mss.o

obj-$(CONFIG_MSM_PIL_PRONTO) += pil-pronto.o

obj-$(CONFIG_MSM_PIL_FEMTO) += pil-q6v5.o pil-msa.o pil-femto-modem.o

obj-$(CONFIG_MSM_PIL_BCSS) += pil-bcss.o

obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o

obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o

obj-y += socinfo.o