ARM: dts: Correct camera pinctrl nodes for Exynos4x12 SoCs

Add separate nodes for the CAMCLK pin and turn off pull-up on camera
ports A, B. The video bus pins and the clock output (CAMCLK) pin need
separate nodes since full camera port is not used in some configurations,
e.g. for MIPI CSI-2 bus only CAMCLK is required and data/clock signal
use separate dedicated pins.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 704290f7c5c099243957ccfd8cccbd25448b88b1..55ff73b4851532cc78ef7b38df1c55b97d0d68d2 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -401,13 +401,26 @@
                        samsung,pin-drv = <0>;
                };
 
-               cam_port_a: cam-port-a {
+               cam_port_a_io: cam-port-a-io {
                        samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
                                        "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
-                                       "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-3",
-                                       "gpj1-4";
+                                       "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
                        samsung,pin-function = <2>;
-                       samsung,pin-pud = <3>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <0>;
+               };
+
+               cam_port_a_clk_active: cam-port-a-clk-active {
+                       samsung,pins = "gpj1-3";
+                       samsung,pin-function = <2>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <3>;
+               };
+
+               cam_port_a_clk_idle: cam-port-a-clk-idle {
+                       samsung,pins = "gpj1-3";
+                       samsung,pin-function = <0>;
+                       samsung,pin-pud = <1>;
                        samsung,pin-drv = <0>;
                };
        };
@@ -778,16 +791,29 @@
                        samsung,pin-drv = <3>;
                };
 
-               cam_port_b: cam-port-b {
+               cam_port_b_io: cam-port-b-io {
                        samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
                                        "gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
-                                       "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1",
-                                       "gpm2-2";
+                                       "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
                        samsung,pin-function = <3>;
                        samsung,pin-pud = <3>;
                        samsung,pin-drv = <0>;
                };
 
+               cam_port_b_clk_active: cam-port-b-clk-active {
+                       samsung,pins = "gpm2-2";
+                       samsung,pin-function = <3>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <3>;
+               };
+
+               cam_port_b_clk_idle: cam-port-b-clk-idle {
+                       samsung,pins = "gpm2-2";
+                       samsung,pin-function = <0>;
+                       samsung,pin-pud = <1>;
+                       samsung,pin-drv = <0>;
+               };
+
                eint0: ext-int0 {
                        samsung,pins = "gpx0-0";
                        samsung,pin-function = <0xf>;