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

Commit 985aec5d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: vidc: Enable 4K60 for Auto"

parents 5fe8747e dce022b7

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
- compatible : one of:

	- "qcom,msm-vidc"

	- "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

	- "qcom,sa6155p-vidc" : Invokes driver specific data for SA6155P.

        - "qcom,sm8150-vidc" : Invokes driver specific data for SM8150.

        - "qcom,sdmmagpie-vidc" : Invokes driver specific data for sdmmagpie.

        - "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

arch/arm64/boot/dts/qcom/sa6155p.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,12 @@ 
	status = "ok";

};



&msm_vidc {

	compatible = "qcom,msm-vidc", "qcom,sm6150-vidc", "qcom,sa6155p-vidc";

	qcom,allowed-clock-rates = <133330000 240000000 300000000

		380000000 410000000 460000000>;

};



&clock_gcc {

	compatible = "qcom,gcc-sa6155", "syscon";

	/delete-property/ protected-clocks;

drivers/media/platform/msm/vidc/msm_vidc_res_parse.c

+6 −0
Original line number Diff line number Diff line
@@ -960,6 +960,12 @@ int read_platform_resources_from_dt( 
		goto err_load_allowed_clocks_table;

	}



	if (of_device_is_compatible(pdev->dev.of_node,

		"qcom,sa6155p-vidc")) {

		res->max_load = 2073600;

		dprintk(VIDC_INFO, "msm_vidc: Use higher max_load on Auto\n");

	}



	rc = msm_vidc_load_reset_table(res);

	if (rc) {

		dprintk(VIDC_ERR,