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

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

Merge "msm: vidc: remove redundant entries in dtsi files"

parents 5f238f43 d635193f

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

+0 −4
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ Optional properties: 
          internal cmd queue = 0x800

- *-supply: A phandle pointing to the appropriate regulator. Number of

  regulators vary across targets.

- qcom,clock-names: an array of clocks that the driver is supposed to be

  manipulating. The clocks names here correspond to the clock names used in

  clk_get(<name>).

- clock-names: an array of clocks that the driver is supposed to be

  manipulating. The clocks names here correspond to the clock names used in

  clk_get(<name>).
@@ -132,7 +129,6 @@ Example: 
		qcom,reg-presets = <0x80004 0x1>,

			<0x80178 0x00001FFF>;

		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/

		qcom,clock-names = "foo_clk", "bar_clk", "baz_clk";

		clock-names = "foo_clk", "bar_clk", "baz_clk";

		qcom,clock-configs = <0x3 0x1 0x0>;

		qcom,sw-power-collapse;

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

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
		reg = <0xfdc00000 0xff000>;

		interrupts = <0 44 0>;

		venus-supply = <&gdsc_venus>;

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

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

		qcom,clock-configs = <0x3 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <352800 160000000 0xffffffff>,

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

+0 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ 
			 <&clock_gcc clk_gcc_venus0_ahb_clk>,

			 <&clock_gcc clk_gcc_venus0_axi_clk>;

		clock-names = "core_clk", "core0_clk", "iface_clk", "bus_clk";

		qcom,clock-names = "core_clk", "core0_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x1 0x0 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl =

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

+0 −1
Original line number Diff line number Diff line
@@ -1653,7 +1653,6 @@ 
			 <&clock_gcc clk_gcc_venus0_ahb_clk>,

			 <&clock_gcc clk_gcc_venus0_axi_clk>;

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

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x1 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <352800 228570000 0xffffffff>,

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

+0 −1
Original line number Diff line number Diff line
@@ -1458,7 +1458,6 @@ 
			<&clock_gcc clk_gcc_venus0_ahb_clk>,

			<&clock_gcc clk_gcc_venus0_axi_clk>;

		clock-names = "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk";

		qcom,clock-names = "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x1 0x0 0x0 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,enable-minimum-voting;