From ebb3c00c052f2a4e3da49f89fa18a70a15614fad Mon Sep 17 00:00:00 2001
From: Robin Singh Rana <robinsin@qti.qualcomm.com>
Date: Thu, 14 Oct 2021 15:45:20 +0530
Subject: [PATCH] ARM: dts: msm: Update the camera makefile for diwali

- Add camera sensor IDP DTBO to the devicetree makefile for diwali.
- Fix clock handles/load currents in sensor IDP DTSI.

Change-Id: Ib7fd6f85b59e700c5ec6a4503cb0f416c06ea474
CRs-Fixed: 3065086
---
 config/waipio.mk              |  2 ++
 diwali-camera-sensor-idp.dtsi | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/waipio.mk b/config/waipio.mk
index 894b1a4f..4df253a5 100644
--- a/config/waipio.mk
+++ b/config/waipio.mk
@@ -5,6 +5,8 @@ dtbo-$(CONFIG_ARCH_WAIPIO) += waipio-camera-overlay-v2.dtbo \
 								waipio-camera-sensor-qrd.dtbo
 
 dtbo-$(CONFIG_ARCH_DIWALI) += diwali-camera.dtbo
+dtbo-$(CONFIG_ARCH_DIWALI) += diwali-camera-sensor-idp.dtbo
+
 dtbo-$(CONFIG_ARCH_CAPE) += cape-camera.dtbo
 dtbo-$(CONFIG_ARCH_CAPE) += cape-camera-sensor-mtp.dtbo \
 				cape-camera-sensor-cdp.dtbo \
diff --git a/diwali-camera-sensor-idp.dtsi b/diwali-camera-sensor-idp.dtsi
index 22a43098..e484c7f7 100644
--- a/diwali-camera-sensor-idp.dtsi
+++ b/diwali-camera-sensor-idp.dtsi
@@ -88,7 +88,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 					"CAM_RESET1";
 		cci-master = <CCI_MASTER_0>;
-		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;
+		clocks = <&camcc CAM_CC_MCLK1_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -123,7 +123,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 					"CAM_RESET3";
 		cci-master = <CCI_MASTER_1>;
-		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
+		clocks = <&camcc CAM_CC_MCLK3_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -151,7 +151,7 @@
 		rgltr-cntrl-support;
 		rgltr-min-voltage = <1800000 2704000 952000 2704000 0 3008000>;
 		rgltr-max-voltage = <1800000 2896000 1144000 3000000 0 3960000>;
-		rgltr-load-current = <3000 52000 257000 103000 0 7070000>;
+		rgltr-load-current = <3000 52000 257000 103000 0 7840000>;
 		gpio-no-mux = <0>;
 		pinctrl-names = "cam_default", "cam_suspend";
 		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -166,7 +166,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 					"CAM_RESET1";
 		cci-master = <CCI_MASTER_0>;
-		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;
+		clocks = <&camcc CAM_CC_MCLK1_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -194,7 +194,7 @@
 		rgltr-cntrl-support;
 		rgltr-min-voltage = <1800000 2800000 1050000 2704000 0 3008000>;
 		rgltr-max-voltage = <1800000 2896000 1144000 3000000 0 3960000>;
-		rgltr-load-current = <10000 52000 140000 103000 0 7070000>;
+		rgltr-load-current = <10000 52000 140000 103000 0 7840000>;
 		gpio-no-mux = <0>;
 		pinctrl-names = "cam_default", "cam_suspend";
 		pinctrl-0 = <&cam_sensor_mclk3_active
@@ -209,7 +209,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 					"CAM_RESET3";
 		cci-master = <CCI_MASTER_1>;
-		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
+		clocks = <&camcc CAM_CC_MCLK3_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -259,7 +259,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK2",
 					"CAM_RESET2";
 		cci-master = <CCI_MASTER_0>;
-		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;
+		clocks = <&camcc CAM_CC_MCLK2_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -293,7 +293,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 					"CAM_RESET0";
 		cci-master = <CCI_MASTER_0>;
-		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
+		clocks = <&camcc CAM_CC_MCLK0_CLK>;
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
@@ -322,7 +322,7 @@
 		rgltr-cntrl-support;
 		rgltr-min-voltage = <1800000 2904000 1800000 1104000 2704000 0 3008000>;
 		rgltr-max-voltage = <1800000 3000000 1888000 1200000 3000000 0 3960000>;
-		rgltr-load-current = <4000 96000 88000 872000 103000 0 7070000>;
+		rgltr-load-current = <4000 96000 88000 872000 103000 0 7840000>;
 		gpio-no-mux = <0>;
 		pinctrl-names = "cam_default", "cam_suspend";
 		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -362,7 +362,7 @@
 		rgltr-cntrl-support;
 		rgltr-min-voltage = <1800000 2704000 952000 0 3008000>;
 		rgltr-max-voltage = <1800000 2896000 1144000 0 3960000>;
-		rgltr-load-current = <3000 52000 257000 0 7070000>;
+		rgltr-load-current = <3000 52000 257000 0 7840000>;
 		gpio-no-mux = <0>;
 		pinctrl-names = "cam_default", "cam_suspend";
 		pinctrl-0 = <&cam_sensor_mclk0_active