From 98e7b2093655dfaf60cdc2f3eaa10de036bd0a08 Mon Sep 17 00:00:00 2001 From: "zhiwei.zhang" Date: Wed, 27 Sep 2023 10:57:09 +0800 Subject: [PATCH] camera: t7 mipi yuv camera support on android-u [1/1] PD#SWPL-138932 Problem: need to support android-u Solution: mercury camera0 using amlogic-yuvcamera.ko mercury split csi-a(i2c2) and csi-b(i2c3) device node; Verify: android-u Change-Id: I7f2873ab82ad37a62eb7e3a434a35d26c27f2a20 Signed-off-by: zhiwei.zhang --- arch/arm64/boot/dts/amlogic/mesont7c.dtsi | 2 +- arch/arm64/boot/dts/amlogic/t7c_a311d2_an400_mercury.dts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesont7c.dtsi b/arch/arm64/boot/dts/amlogic/mesont7c.dtsi index af0158772..0fa5f1feb 100644 --- a/arch/arm64/boot/dts/amlogic/mesont7c.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesont7c.dtsi @@ -2246,7 +2246,7 @@ assigned-clocks = <&clkc CLKID_MIPI_CSI_PHY_CLK>; }; - camera2 { + camera2: camera2 { compatible = "amlogic, camera"; index = <2>; csiphy = <&csiphy2>; diff --git a/arch/arm64/boot/dts/amlogic/t7c_a311d2_an400_mercury.dts b/arch/arm64/boot/dts/amlogic/t7c_a311d2_an400_mercury.dts index 7c23c7f92..85334be4b 100644 --- a/arch/arm64/boot/dts/amlogic/t7c_a311d2_an400_mercury.dts +++ b/arch/arm64/boot/dts/amlogic/t7c_a311d2_an400_mercury.dts @@ -1602,7 +1602,7 @@ //pinctrl-1 = <&i2c2_sleep_pins2>; clock-frequency = <100000>; /* default 100k */ amlsens_0: sensor0@1a { - compatible = "amlogic, sensor"; + compatible = "amlogic, sensor-csi-a", "amlogic, sensor"; index = <0>; reg = <0x1a>; reg-addr-type = <2>; @@ -1632,7 +1632,7 @@ pinctrl-0 = <&i2c3_pins1>; clock-frequency = <100000>; /* default 100k */ amlsens_2: sensor2@1a { - compatible = "amlogic, sensor"; + compatible = "amlogic, sensor-csi-b", "amlogic, sensor"; index = <2>; reg = <0x1a>; reg-addr-type = <2>; @@ -1828,6 +1828,10 @@ }; }; +&camera0 { + compatible = "amlogic, yuvcamera"; +}; + &ir { status = "disabled"; pinctrl-0 = <&remote_pins>;