From b07ebf86e80da80402f30b6fb7c2202f0bddce69 Mon Sep 17 00:00:00 2001 From: Dharmender Sharma Date: Thu, 29 Jul 2021 00:03:52 +0530 Subject: [PATCH] ARM: dts: msm: jpeg misr enable Enable jpeg misr for both DMA and Encoder and also supports base address for camnoc. CRs-Fixed: 3012752 Change-Id: I3e8ef8907214adcf779d5a28a420c50b1a76ddb1 Signed-off-by: Dharmender Sharma --- bindings/msm-cam-jpeg.txt | 8 ++++++++ lahaina-camera.dtsi | 18 ++++++++++-------- waipio-camera.dtsi | 18 ++++++++++-------- yupik-camera.dtsi | 18 ++++++++++-------- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/bindings/msm-cam-jpeg.txt b/bindings/msm-cam-jpeg.txt index f2a4a817..9b842aec 100644 --- a/bindings/msm-cam-jpeg.txt +++ b/bindings/msm-cam-jpeg.txt @@ -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,13 @@ the device register map, interrupt map, clocks and regulators. Usage: required Value type: 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_enc_680". + Definition: Should be "qcom,cam_jpeg_dma". + Definition: Should be "qcom,cam_jpeg_dma_165". + Definition: Should be "qcom,cam_jpeg_dma_580". + Definition: Should be "qcom,cam_jpeg_dma_680". - reg-names Usage: optional diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi index c755ca3f..096fc867 100644 --- a/lahaina-camera.dtsi +++ b/lahaina-camera.dtsi @@ -1875,10 +1875,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 = ; regulator-names = "camss-vdd"; @@ -1901,10 +1902,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 = ; regulator-names = "camss-vdd"; diff --git a/waipio-camera.dtsi b/waipio-camera.dtsi index 0e40c5be..aa51b9a2 100644 --- a/waipio-camera.dtsi +++ b/waipio-camera.dtsi @@ -2636,10 +2636,11 @@ cam_jpeg_enc: qcom,jpegenc@ac2a000 { cell-index = <0>; - compatible = "qcom,cam_jpeg_enc"; - reg-names = "jpege_hw"; - reg = <0xac2a000 0x1000>; - reg-cam-base = <0x2a000>; + compatible = "qcom,cam_jpeg_enc_680"; + reg-names = "jpege_hw", "cam_camnoc"; + reg = <0xac2a000 0x1000>, + <0x0ac19000 0x9000>; + reg-cam-base = <0x2a000 0x19000>; interrupt-names = "jpeg"; interrupts = ; regulator-names = "gdsc"; @@ -2663,10 +2664,11 @@ cam_jpeg_dma: qcom,jpegdma@ac2b000 { cell-index = <0>; - compatible = "qcom,cam_jpeg_dma"; - reg-names = "jpegdma_hw"; - reg = <0xac2b000 0x1000>; - reg-cam-base = <0x2b000>; + compatible = "qcom,cam_jpeg_dma_680"; + reg-names = "jpegdma_hw", "cam_camnoc"; + reg = <0xac2b000 0x1000>, + <0x0ac19000 0x9000>; + reg-cam-base = <0x2b000 0x19000>; interrupt-names = "jpegdma"; interrupts = ; regulator-names = "gdsc"; diff --git a/yupik-camera.dtsi b/yupik-camera.dtsi index beb11cfb..9cae295b 100644 --- a/yupik-camera.dtsi +++ b/yupik-camera.dtsi @@ -1052,10 +1052,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 = ; regulator-names = "camss-vdd"; @@ -1078,10 +1079,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 = ; regulator-names = "camss-vdd";