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

Commit cc00f0b7 authored by Govindaraj Rajagopal's avatar Govindaraj Rajagopal Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Keep only default sku in dtsi 

Remove additional vidc nodes and maintain in vidc
driver via static clock table entries.

Change-Id: Ieb172cea6d1d5809f3b1a92eac462af7fa393cde
parent 02d74d32

qcom/shima-vidc.dtsi

+1 −199
Original line number Diff line number Diff line 
&soc {

	msm_vidc0: qcom,vidc0 {

	msm_vidc: qcom,vidc {

		compatible = "qcom,msm-vidc", "qcom,shima-vidc";

		status = "okay";

		sku-index = <1>;

		reg = <0x0aa00000 0x00100000>;

		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
@@ -97,201 +96,4 @@ 
			qcom,secure-context-bank;

		};

	};



	msm_vidc1: qcom,vidc1 {

		compatible = "qcom,msm-vidc", "qcom,shima-vidc";

		status = "okay";

		sku-index = <2>;

		reg = <0x0aa00000 0x00100000>;

		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;



		/* IOMMU Config */

		#address-cells = <1>;

		#size-cells = <1>;



		/* Supply */

		iris-ctl-supply = <&video_cc_mvs0c_gdsc>;

		vcodec-supply = <&video_cc_mvs0_gdsc>;



		/* Clocks */

		clock-names = "gcc_video_axi0", "gcc_video_throttle",

			"core_clk", "vcodec_clk";

		clocks = <&gcc GCC_VIDEO_AXI0_CLK>,

			<&gcc GCC_VIDEO_MVP_THROTTLE_CORE_CLK>,

			<&videocc VIDEO_CC_MVS0C_CLK>,

			<&videocc VIDEO_CC_MVS0_CLK>;

		qcom,proxy-clock-names = "gcc_video_axi0", "gcc_video_throttle",

			"core_clk", "vcodec_clk";

		/* Mask: Bit0: Clock Scaling, Bit1: Mem Retention*/

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

		qcom,allowed-clock-rates = <201600000>;

		resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>,

			<&videocc VIDEO_CC_MVS0C_CLK_ARES>;

		reset-names = "video_axi_reset", "video_core_reset";



		qcom,reg-presets = <0xB0088 0x0 0x11>;



		/* Video Firmware ELF image name */

		vidc,firmware-name = "vpu20_2v";



		/* Bus Interconnects */

		interconnect-names = "venus-cnoc", "venus-ddr";

		interconnects = <&gem_noc MASTER_APPSS_PROC

					&config_noc SLAVE_VENUS_CFG>,

				<&mmss_noc MASTER_VIDEO_P0

					&mc_virt SLAVE_EBI1>;

		/* Bus BW range (low, high) for each bus */

		qcom,bus-range-kbps = <1000 1000

					1000 15000000>;



		/* MMUs */

		non_secure_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_ns";

			iommus = <&apps_smmu 0x2900 0x0400>;

			qcom,iommu-dma-addr-pool = <0x25800000 0xba800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			buffer-types = <0xfff>;

			virtual-addr-pool = <0x25800000 0xba800000>;

		};



		secure_non_pixel_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_non_pixel";

			iommus = <&apps_smmu 0x2904 0x0400>;

			qcom,iommu-dma-addr-pool = <0x01000000 0x24800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0xB>; /* VMID_CP_NON_PIXEL */

			buffer-types = <0x480>;

			virtual-addr-pool = <0x01000000 0x24800000>;

			qcom,secure-context-bank;

		};



		secure_bitstream_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_bitstream";

			iommus = <&apps_smmu 0x2901 0x0404>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0x9>; /* VMID_CP_BITSTREAM */

			buffer-types = <0x241>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;

			qcom,secure-context-bank;

		};



		secure_pixel_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_pixel";

			iommus = <&apps_smmu 0x2903 0x0400>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0xA>; /* VMID_CP_PIXEL */

			buffer-types = <0x106>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;

			qcom,secure-context-bank;

		};

	};



	msm_vidc2: qcom,vidc2 {

		compatible = "qcom,msm-vidc", "qcom,shima-vidc";

		status = "okay";

		sku-index = <0>;

		reg = <0x0aa00000 0x00100000>;

		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;



		/* IOMMU Config */

		#address-cells = <1>;

		#size-cells = <1>;



		/* Supply */

		iris-ctl-supply = <&video_cc_mvs0c_gdsc>;

		vcodec-supply = <&video_cc_mvs0_gdsc>;



		/* Clocks */

		clock-names = "gcc_video_axi0", "gcc_video_throttle",

			"core_clk", "vcodec_clk";

		clocks = <&gcc GCC_VIDEO_AXI0_CLK>,

			<&gcc GCC_VIDEO_MVP_THROTTLE_CORE_CLK>,

			<&videocc VIDEO_CC_MVS0C_CLK>,

			<&videocc VIDEO_CC_MVS0_CLK>;

		qcom,proxy-clock-names = "gcc_video_axi0", "gcc_video_throttle",

			"core_clk", "vcodec_clk";

		/* Mask: Bit0: Clock Scaling, Bit1: Mem Retention*/

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

		qcom,allowed-clock-rates = <240000000 338000000

			366000000 444000000>;

		resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>,

			<&videocc VIDEO_CC_MVS0C_CLK_ARES>;

		reset-names = "video_axi_reset", "video_core_reset";



		qcom,reg-presets = <0xB0088 0x0 0x11>;



		/* Video Firmware ELF image name */

		vidc,firmware-name = "vpu20_2v";



		/* Bus Interconnects */

		interconnect-names = "venus-cnoc", "venus-ddr";

		interconnects = <&gem_noc MASTER_APPSS_PROC

					&config_noc SLAVE_VENUS_CFG>,

				<&mmss_noc MASTER_VIDEO_P0

					&mc_virt SLAVE_EBI1>;

		/* Bus BW range (low, high) for each bus */

		qcom,bus-range-kbps = <1000 1000

					1000 15000000>;



		/* MMUs */

		non_secure_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_ns";

			iommus = <&apps_smmu 0x2900 0x0400>;

			qcom,iommu-dma-addr-pool = <0x25800000 0xba800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			buffer-types = <0xfff>;

			virtual-addr-pool = <0x25800000 0xba800000>;

		};



		secure_non_pixel_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_non_pixel";

			iommus = <&apps_smmu 0x2904 0x0400>;

			qcom,iommu-dma-addr-pool = <0x01000000 0x24800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0xB>; /* VMID_CP_NON_PIXEL */

			buffer-types = <0x480>;

			virtual-addr-pool = <0x01000000 0x24800000>;

			qcom,secure-context-bank;

		};



		secure_bitstream_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_bitstream";

			iommus = <&apps_smmu 0x2901 0x0404>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0x9>; /* VMID_CP_BITSTREAM */

			buffer-types = <0x241>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;

			qcom,secure-context-bank;

		};



		secure_pixel_cb {

			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_pixel";

			iommus = <&apps_smmu 0x2903 0x0400>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetable = "LLC";

			qcom,iommu-vmid = <0xA>; /* VMID_CP_PIXEL */

			buffer-types = <0x106>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;

			qcom,secure-context-bank;

		};

	};

};