From f1642f0a2bbdb1abafb1469dd61c5e413f799336 Mon Sep 17 00:00:00 2001 From: kartanan Date: Wed, 28 Aug 2019 12:49:44 -0700 Subject: dt-bindings: camera: Add custom HW/csid bindings for KONA The change adds device tree bindings for custom HW for KONA. CRs-Fixed: 2515662 Change-Id: I3ee315c238275e5e4775c5a46a57636877ec44d7 --- bindings/msm-cam-custom-hw.txt | 28 ++++++++++++++++++++++++++++ bindings/msm-cam-custom.txt | 31 +++++++++++++++++++++++++++++++ bindings/msm-cam-ife-csid.txt | 4 ++-- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 bindings/msm-cam-custom-hw.txt create mode 100644 bindings/msm-cam-custom.txt diff --git a/bindings/msm-cam-custom-hw.txt b/bindings/msm-cam-custom-hw.txt new file mode 100644 index 0000000..61125d0 --- /dev/null +++ b/bindings/msm-cam-custom-hw.txt @@ -0,0 +1,28 @@ +* Qualcomm Technologies, Inc. MSM Camera Custom HW + +Camera Custom device provides the definitions for enabling +the custom hardware. It also provides the functions for the client +to control the Custom hardware. + +======================= +Required Node Structure +======================= +The Custom device is described in one level of the device node. + +====================================== +First Level Node - CAM Custom device +====================================== +Required properties: +- compatible + Usage: required + Value type: + Definition: Should specify the compatibility string for matching the + driver. e.g. "qcom,cam_custom_hw_sub_mod". + +Example: + + qcom,cam-custom-hw { + compatible = "qcom,cam_custom_hw_sub_mod"; + arch-compat = "custom"; + status = "ok"; + }; diff --git a/bindings/msm-cam-custom.txt b/bindings/msm-cam-custom.txt new file mode 100644 index 0000000..8c5cc61 --- /dev/null +++ b/bindings/msm-cam-custom.txt @@ -0,0 +1,31 @@ +* Qualcomm Technologies, Inc. MSM Camera Custom + +The MSM camera Custom driver provides the definitions for enabling +the Camera custom hadware. It provides the functions for the Client to +control the custom hardware. + +======================= +Required Node Structure +======================= +The camera Custom device is described in one level of device node. + +================================== +First Level Node - CAM CUSTOM device +================================== +- compatible + Usage: required + Value type: + Definition: Should be "qcom,cam-custom". + +- arch-compat + Usage: required + Value type: + Definition: Should be "custom". + +Example: + + qcom,cam-custom { + compatible = "qcom,cam-custom"; + arch-compat = "custom"; + status = "ok"; + }; diff --git a/bindings/msm-cam-ife-csid.txt b/bindings/msm-cam-ife-csid.txt index 9d1af95..ecff78e 100644 --- a/bindings/msm-cam-ife-csid.txt +++ b/bindings/msm-cam-ife-csid.txt @@ -16,8 +16,8 @@ First Level Node - CAM IFE CSID device Usage: required Value type: Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200", - "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175" - or "qcom,csid-lite480". + "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175", + "qcom,csid-lite480" or "qcom,csid-custom480". - cell-index Usage: required -- cgit v1.2.3 From 2540a3f2d6766e597dcae90d589e40786733f8fc Mon Sep 17 00:00:00 2001 From: kartanan Date: Wed, 21 Aug 2019 14:16:51 -0700 Subject: ARM: dts: msm: Add bus vector for NOM_L1 for kona & lito Add new bus vector for NOMINAL_L1 level in cpas node. CRs-Fixed: 2507919 Change-Id: I7e41cc6a72d066660a71176a47d6d4fc61eaf3b0 --- kona-camera.dtsi | 7 +++++-- lito-camera.dtsi | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/kona-camera.dtsi b/kona-camera.dtsi index e9931d2..0bab6bd 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -564,14 +564,15 @@ <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 400000000 0>, + <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 480000000 0>; clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; + qcom,msm-bus,num-cases = <8>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = , , + ; vdd-corners = , <0 0 0 80000000 0 320000000 0>, <0 0 0 80000000 0 400000000 0>, + <0 0 0 80000000 0 400000000 0>, <0 0 0 80000000 0 480000000 0>; clock-cntl-level = "suspend", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; + qcom,msm-bus,num-cases = <8>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = , , + ; vdd-corners = Date: Mon, 23 Sep 2019 16:33:31 -0700 Subject: ARM: dts: msm: correct the dma addr pool for icp Correct the address mapping for dma addr pool for icp. CRs-Fixed: 2534244 Change-Id: Ic1ed778ff0ac27a155bffc50deea8682762a1c37 --- kona-camera.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kona-camera.dtsi b/kona-camera.dtsi index 0bab6bd..7058993 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -430,7 +430,7 @@ <&apps_smmu 0x2420 0x400>, <&apps_smmu 0x2421 0x400>; label = "icp"; - qcom,iommu-dma-addr-pool = <0xda00000 0xace00000>; + qcom,iommu-dma-addr-pool = <0x10c00000 0xcf300000>; icp_iova_mem_map: iova-mem-map { iova-mem-region-firmware { /* Firmware region is 5MB */ -- cgit v1.2.3 From d9b8bfbde388af96d5f42a58900abc3a41cfd015 Mon Sep 17 00:00:00 2001 From: Jigarkumar Zala Date: Mon, 23 Sep 2019 16:33:31 -0700 Subject: ARM: dts: msm: correct the dma addr pool for icp Correct the address mapping for dma addr pool for icp. CRs-Fixed: 2534244 Change-Id: Ic1ed778ff0ac27a155bffc50deea8682762a1c37 --- kona-camera.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kona-camera.dtsi b/kona-camera.dtsi index 0bab6bd..7058993 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -430,7 +430,7 @@ <&apps_smmu 0x2420 0x400>, <&apps_smmu 0x2421 0x400>; label = "icp"; - qcom,iommu-dma-addr-pool = <0xda00000 0xace00000>; + qcom,iommu-dma-addr-pool = <0x10c00000 0xcf300000>; icp_iova_mem_map: iova-mem-map { iova-mem-region-firmware { /* Firmware region is 5MB */ -- cgit v1.2.3