2d69c14406c29de96b031fcc139839460f08d729ba98a64782b6d429.patch

From f78a3718e736cd62ec599b120a5f59b53e0ed54a Mon Sep 17 00:00:00 2001
From: Stephen Boyd <swboyd@chromium.org>
Date: Wed, 27 Jul 2022 21:31:55 -0700
Subject: [PATCH] CHROMIUM: arm64: dts: qcom: Restore camera bits on
 quackingstick/wormdingler

Carry over the few camera includes and overrides from quackingstick and
wormdingler to chromeos-5.15 so that camera continues to work.

BUG=b:240504892
TEST=open camera app on wormdingler and quackingstick, see image

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Change-Id: I53a7f44ae2af48fe5c835851ae76802cea63ce1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3790524
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Commit-Queue: Douglas Anderson <dianders@chromium.org>
---
 .../arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 8 ++++++++
 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
index 5f06842c683b5797ab06d34cf5a226169db3b89e..e59a405c04fd0d8581ac53e4562416df335548cc 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
@@ -9,6 +9,7 @@
 
 #include "sc7180-trogdor.dtsi"
 #include "sc7180-trogdor-rt5682i-sku.dtsi"
+#include "sc7180-trogdor-mipi-camera.dtsi"
 
 /* This board only has 1 USB Type-C port. */
 /delete-node/ &usb_c1;
@@ -39,6 +40,13 @@ v1p8_disp: v1p8-disp-regulator {
 	};
 };
 
+&cam_cci0 {
+	eeprom_rear: qcom,eeprom@0 {
+		i2c-address = <0x50>;
+		memory-bytes = <8192>;
+	};
+};
+
 &backlight {
 	pwms = <&cros_ec_pwm 0>;
 };
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index 305ad127246e6a58be81b4eb57cf6027708f7929..a76ed1d7324e8ef676013105f7ee061f734329b2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "sc7180-trogdor.dtsi"
+#include "sc7180-trogdor-mipi-camera.dtsi"
 
 / {
 	avdd_lcd: avdd-lcd-regulator {
-- 
2.43.0.rc2.451.g8631bc7472-goog