From 3f7c648b6b1dd5de3d87af706a48a39cc7751846 Mon Sep 17 00:00:00 2001 From: Ravikishore Pampana Date: Fri, 17 Jul 2020 07:02:47 +0530 Subject: [PATCH] ARM: dts: msm: camera: Add hw pid info to ife nodes for lahaina and shima Each ife hardware instance has unique pid values. Add pid values to each ife node instance. These are used to find the ife instance that caused page fault. Added pid values to lahaina and shima ife nodes. CRs-Fixed: 2750690 Change-Id: I42ff0765c1eb21d430d903cda55dfb91ff052376 --- bindings/msm-cam-vfe.txt | 6 ++++++ lahaina-camera.dtsi | 5 +++++ shima-camera.dtsi | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/bindings/msm-cam-vfe.txt b/bindings/msm-cam-vfe.txt index 89866769ce09..85dc19873b16 100644 --- a/bindings/msm-cam-vfe.txt +++ b/bindings/msm-cam-vfe.txt @@ -115,6 +115,11 @@ Optional properties: Definition: Scalable clock names to identify which clocks needs to update along with source clock. +- cam_hw_pid: + Usage: optional + Value type: + Definition: HW unique Pid values + Example: qcom,vfe0@acaf000 { cell-index = <0>; @@ -152,5 +157,6 @@ Example: scl-clk-en; scl-clk-names = "ife_axi_clk"; qcom,cam-cx-ipeak = <&cx_ipeak_lm 2>; + cam_hw_pid = < 28 4 16 8 >; status = "ok"; }; diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi index b729a7315cb2..f785451cdeb7 100644 --- a/lahaina-camera.dtsi +++ b/lahaina-camera.dtsi @@ -1380,6 +1380,7 @@ clocks-option = <&clock_camcc CAM_CC_IFE_0_DSP_CLK>; clock-rates-option = <720000000>; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 28 4 16 8 >; status = "ok"; }; @@ -1466,6 +1467,7 @@ clocks-option = <&clock_camcc CAM_CC_IFE_1_DSP_CLK>; clock-rates-option = <720000000>; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 29 5 17 9 >; status = "ok"; }; @@ -1549,6 +1551,7 @@ scl-clk-names = "ife_2_areg"; clock-control-debugfs = "true"; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 23 6 20 10>; status = "ok"; }; @@ -1621,6 +1624,7 @@ "turbo"; src-clock-name = "ife_clk_src"; clock-control-debugfs = "true"; + cam_hw_pid = < 7 >; status = "ok"; }; @@ -1693,6 +1697,7 @@ "turbo"; src-clock-name = "ife_clk_src"; clock-control-debugfs = "true"; + cam_hw_pid = < 21 >; status = "ok"; }; diff --git a/shima-camera.dtsi b/shima-camera.dtsi index 4ea2ad3b1865..31d514e14fdd 100644 --- a/shima-camera.dtsi +++ b/shima-camera.dtsi @@ -756,6 +756,7 @@ clocks-option = <&camcc CAM_CC_IFE_0_DSP_CLK>; clock-rates-option = <720000000>; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 28 4 16 8 >; status = "ok"; }; @@ -842,6 +843,7 @@ clocks-option = <&camcc CAM_CC_IFE_1_DSP_CLK>; clock-rates-option = <720000000>; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 29 5 17 9 >; status = "ok"; }; @@ -925,6 +927,7 @@ scl-clk-names = "ife_2_areg"; clock-control-debugfs = "true"; ubwc-static-cfg = <0x1026 0x1036>; + cam_hw_pid = < 23 6 18 10>; status = "ok"; }; @@ -997,6 +1000,7 @@ "turbo"; src-clock-name = "ife_clk_src"; clock-control-debugfs = "true"; + cam_hw_pid = < 20 >; status = "ok"; }; @@ -1069,6 +1073,7 @@ "turbo"; src-clock-name = "ife_clk_src"; clock-control-debugfs = "true"; + cam_hw_pid = < 19 >; status = "ok"; };