From 501a1a05b61ae5efd1bf528bcc14a88f44398e00 Mon Sep 17 00:00:00 2001 From: wangdw10 Date: Thu, 31 Jan 2019 09:35:07 +0800 Subject: [PATCH] Troika : arm/dts: add camera config for Troika use different dtsi file for kane and Troika Change-Id: I34788fbb0bbc1da6736b2d75233d49147ffbe536 Signed-off-by: wangdw10 Reviewed-on: https://gerrit.mot.com/1303362 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- .../exynos/exynos9609-robusta2_common.dtsi | 1 - .../dts/exynos/exynos9609-robusta2_evb.dts | 1 + .../boot/dts/exynos/exynos9609-troika_evb.dts | 1 + .../boot/dts/exynos/exynos9610-pinctrl.dtsi | 21 +++++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi index 2e5114e9c735..93ec88498e56 100755 --- 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 #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 dbfd383c77fb..3eb2f467d65f 100755 --- 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 c032e7bc4f4e..17bf48bfef45 100755 --- 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 62e2ccab725e..dc6a2f6879cf 100755 --- 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>; -- 2.20.1