From patchwork Fri Feb 1 19:09:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 2082391 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D4A4C40E3D for ; Fri, 1 Feb 2013 19:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757328Ab3BATK1 (ORCPT ); Fri, 1 Feb 2013 14:10:27 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:55409 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757242Ab3BATKZ (ORCPT ); Fri, 1 Feb 2013 14:10:25 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHK00ICG2K9TH20@mailout3.samsung.com>; Sat, 02 Feb 2013 04:10:25 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-21-510c132004b3 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2E.45.03880.0231C015; Sat, 02 Feb 2013 04:10:25 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MHK00AVD2JZ3YB0@mmp1.samsung.com>; Sat, 02 Feb 2013 04:10:24 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, kgene.kim@samsung.com, swarren@wwwdotorg.org, rob.herring@calxeda.com, prabhakar.lad@ti.com, devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sylwester Nawrocki Subject: [PATCH v4 10/10] ARM: dts: Correct camera pinctrl nodes for Exynos4x12 SoCs Date: Fri, 01 Feb 2013 20:09:31 +0100 Message-id: <1359745771-23684-11-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1359745771-23684-1-git-send-email-s.nawrocki@samsung.com> References: <1359745771-23684-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGJMWRmVeSWpSXmKPExsVy+t9jAV1FYZ5Agze9zBY9G7ayWsw4v4/J gcnj8ya5AMYoLpuU1JzMstQifbsEroyOFWvYCxqEKrrvXWZrYJzJ18XIwSEhYCLx4BNjFyMn kCkmceHeerYuRi4OIYFFjBI37pxihXA6mCQ6WnawgVSxCRhK9B7tA+sQEZCXeNJ7A6yDWWAu k8SrIx3MIAlhgTCJq/PfMYHYLAKqEivfHWMFsXkF3CV+XbjCBLFZQWLOJBuQMCdQ+Ef3JLD5 QgJuEmcb37JNYORdwMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyPY98+kdzCuarA4xCjA wajEw+vwkztQiDWxrLgy9xCjBAezkgivbS1QiDclsbIqtSg/vqg0J7X4EKM0B4uSOC/jqScB QgLpiSWp2ampBalFMFkmDk6pBsapNzcbPdY2P91txZhiM2GKdBLXo207Ga9adtp1HY5c27tc yf0h86S3QX+cEh+oe7n4+F/k2pxlLLJBKGaWr6hN8qWnpxXNZ+os2Dl9lgWTq49q7VGzzU2X uxpurLA0PLG/+sqy4vYItZU+TH+/Jy1sbN23IkRc7/ARK5XljSrT1G59ljwv+0yJpTgj0VCL uag4EQA90fYk+QEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 on CAMCLK is required and data/clock signal use separate dedicated pins. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Changes since v3: - corrected camera port B part and removed entries for "inactive" state --- arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi index 8e6115a..4c3a2c3 100644 --- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi @@ -401,15 +401,21 @@ 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>; + }; }; pinctrl@11000000 { @@ -834,16 +840,22 @@ samsung,pin-drv = <0>; }; - 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>; + }; + eint0: ext-int0 { samsung,pins = "gpx0-0"; samsung,pin-function = <0xf>;