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

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

Merge "soc: qcom: pil: get crypto cell-id through device tree"

parents 60bda87c 52065cdc

Documentation/devicetree/bindings/pil/subsys-pil-tz.txt

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ Optional properties: 
			first segment to end address of last segment will be collected without

			leaving any hole in between.

- qcom,ignore-ssr-failure: Boolean. If set, SSR failures are not considered fatal.

- qcom,mas-crypto: Reference to the bus master of crypto core.



Example:

	qcom,venus@fdce0000 {

drivers/soc/qcom/subsys-pil-tz.c

+13 −2
Original line number Diff line number Diff line
@@ -1065,7 +1065,8 @@ static int pil_tz_driver_probe(struct platform_device *pdev) 
{

	struct pil_tz_data *d;

	struct resource *res;

	u32 proxy_timeout;

	struct device_node *crypto_node;

	u32 proxy_timeout, crypto_id;

	int len, rc;



	d = devm_kzalloc(&pdev->dev, sizeof(*d), GFP_KERNEL);
@@ -1128,7 +1129,17 @@ static int pil_tz_driver_probe(struct platform_device *pdev) 
									rc);

			return rc;

		}

		scm_pas_init(MSM_BUS_MASTER_CRYPTO_CORE_0);



		crypto_id = MSM_BUS_MASTER_CRYPTO_CORE_0;

		crypto_node = of_parse_phandle(pdev->dev.of_node,

						"qcom,mas-crypto", 0);

		if (!IS_ERR_OR_NULL(crypto_node)) {

			of_property_read_u32(crypto_node, "cell-id",

				&crypto_id);

			of_node_put(crypto_node);

		}



		scm_pas_init((int)crypto_id);

	}



	rc = pil_desc_init(&d->desc);