Merge 38a0e9b401 on remote branch

Change-Id: I78655cd63d4dee67723ee31d5d919ff3e3a86c2a
This commit is contained in:
Linux Build Service Account 2021-09-17 02:55:22 -07:00
commit 88355c3a07
3 changed files with 26 additions and 16 deletions

View file

@ -48,6 +48,7 @@ Required Node Structure
=======================
Encoder/DMA Nodes provide interface for JPEG driver about
the device register map, interrupt map, clocks and regulators.
Compatible string definition should be based on target.
- cell-index
Usage: required
@ -58,6 +59,11 @@ the device register map, interrupt map, clocks and regulators.
Usage: required
Value type: <string>
Definition: Should be "qcom,cam_jpeg_enc".
Definition: Should be "qcom,cam_jpeg_enc_165".
Definition: Should be "qcom,cam_jpeg_enc_580".
Definition: Should be "qcom,cam_jpeg_dma".
Definition: Should be "qcom,cam_jpeg_dma_165".
Definition: Should be "qcom,cam_jpeg_dma_580".
- reg-names
Usage: optional

View file

@ -1881,10 +1881,11 @@
cam_jpeg_enc: qcom,jpegenc {
cell-index = <0>;
compatible = "qcom,cam_jpeg_enc";
reg-names = "jpege_hw";
reg = <0xac53000 0x4000>;
reg-cam-base = <0x53000>;
compatible = "qcom,cam_jpeg_enc_580";
reg-names = "jpege_hw","cam_camnoc";
reg = <0xac53000 0x4000>,
<0x0ac42000 0x8000>;
reg-cam-base = <0x53000 0x42000>;
interrupt-names = "jpeg";
interrupts = <GIC_SPI 474 IRQ_TYPE_EDGE_RISING>;
regulator-names = "camss-vdd";
@ -1907,10 +1908,11 @@
cam_jpeg_dma: qcom,jpegdma {
cell-index = <0>;
compatible = "qcom,cam_jpeg_dma";
reg-names = "jpegdma_hw";
reg = <0xac57000 0x4000>;
reg-cam-base = <0x57000>;
compatible = "qcom,cam_jpeg_dma_580";
reg-names = "jpegdma_hw", "cam_camnoc";
reg = <0xac57000 0x4000>,
<0x0ac42000 0x8000>;
reg-cam-base = <0x57000 0x42000>;
interrupt-names = "jpegdma";
interrupts = <GIC_SPI 475 IRQ_TYPE_EDGE_RISING>;
regulator-names = "camss-vdd";

View file

@ -1057,10 +1057,11 @@
cam_jpeg_enc: qcom,jpegenc {
cell-index = <0>;
compatible = "qcom,cam_jpeg_enc";
reg-names = "jpege_hw";
reg = <0xac4e000 0x4000>;
reg-cam-base = <0x4e000>;
compatible = "qcom,cam_jpeg_enc_165";
reg-names = "jpege_hw", "cam_camnoc";
reg = <0xac4e000 0x4000>,
<0x0ac9f000 0x10000>;
reg-cam-base = <0x4e000 0x9f000>;
interrupt-names = "jpeg";
interrupts = <GIC_SPI 474 IRQ_TYPE_EDGE_RISING>;
regulator-names = "camss-vdd";
@ -1083,10 +1084,11 @@
cam_jpeg_dma: qcom,jpegdma {
cell-index = <0>;
compatible = "qcom,cam_jpeg_dma";
reg-names = "jpegdma_hw";
reg = <0xac52000 0x4000>;
reg-cam-base = <0x52000>;
compatible = "qcom,cam_jpeg_dma_165";
reg-names = "jpegdma_hw", "cam_camnoc";
reg = <0xac52000 0x4000>,
<0x0ac9f000 0x10000>;
reg-cam-base = <0x52000 0x9f000>;
interrupt-names = "jpegdma";
interrupts = <GIC_SPI 475 IRQ_TYPE_EDGE_RISING>;
regulator-names = "camss-vdd";