Troika : arm/dts: add camera config for Troika

use different dtsi file for kane and Troika

Change-Id: I34788fbb0bbc1da6736b2d75233d49147ffbe536
Signed-off-by: wangdw10 <wangdw10@mt.com>
Reviewed-on: https://gerrit.mot.com/1303362
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dawei Wang <wangdw10@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
index 2e5114e9c735d6cdc4c698921e84b1220a543d03..93ec88498e56e22b95f04107a64cfbd2a49dbb38 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
@@ -13,7 +13,6 @@
 #include <dt-bindings/clock/exynos9610.h>
 #include "modem-ss360ap-sit-pdata.dtsi"
 #include "exynos9610-display-lcd.dtsi"
-#include "exynos9610-robusta2-camera.dtsi"
 #include "novatek-nt36xxx-i2c.dtsi"
 #include "himax-hx83112a-i2c.dtsi"
 #include "wing-sensor.dtsi"

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
index dbfd383c77fb088e23384882f5e735864271a0d1..3eb2f467d65f5fdd14e11384a16d65d0dc988a2b 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
@@ -12,6 +12,7 @@
 /dts-v1/;
 /plugin/;
 
+#include "exynos9610-robusta2-camera.dtsi"
 #include "exynos9609-robusta2_common.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
index c032e7bc4f4e64329dfc303d44d531d5a1224867..17bf48bfef45f5683590be7c6c626845e5bb80d6 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
@@ -12,6 +12,7 @@
 /dts-v1/;
 /plugin/;
 
+#include "exynos9610-troika-camera.dtsi"
 #include "exynos9610-troika-common.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
index 62e2ccab725ec36708e25e8f655e7b2be98d7830..dc6a2f6879cf5faf2d57954cb39d7f4e05f2aaac 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
@@ -1226,6 +1226,13 @@
                        samsung,pin-drv = <2>;
                };
 
+               fimc_is_mclk3_in: fimc_is_mclk3_in {
+                       samsung,pins = "gpg3-5";
+                       samsung,pin-function = <0>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <2>;
+               };
+
                fimc_is_mclk0_out: fimc_is_mclk0_out {
                        samsung,pins = "gpc2-0";
                        samsung,pin-function = <1>;
@@ -1254,6 +1261,13 @@
                        samsung,pin-drv = <2>;
                };
 
+               fimc_is_mclk3_out: fimc_is_mclk3_out {
+                       samsung,pins = "gpg3-5";
+                       samsung,pin-function = <1>;
+                       samsung,pin-pud = <1>;
+                       samsung,pin-drv = <2>;
+               };
+
                fimc_is_mclk0_fn: fimc_is_mclk0_fn {
                        samsung,pins = "gpc2-0";
                        samsung,pin-function = <2>;
@@ -1282,6 +1296,13 @@
                        samsung,pin-drv = <2>;
                };
 
+               fimc_is_mclk3_fn: fimc_is_mclk3_fn {
+                       samsung,pins = "gpg3-5";
+                       samsung,pin-function = <2>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <2>;
+               };
+
                decon_f_te_on: decon_f_te_on {
                        samsung,pins = "gpc2-3";
                        samsung,pin-function = <0xf>;