From patchwork Mon Jul 1 15:22:23 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: 2808301 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF4DE9F3C3 for ; Mon, 1 Jul 2013 15:25:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2D1120141 for ; Mon, 1 Jul 2013 15:25:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A4F120140 for ; Mon, 1 Jul 2013 15:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751728Ab3GAPZB (ORCPT ); Mon, 1 Jul 2013 11:25:01 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:41307 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171Ab3GAPZB (ORCPT ); Mon, 1 Jul 2013 11:25:01 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MP900955K5NTSS0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 02 Jul 2013 00:24:59 +0900 (KST) X-AuditID: cbfee61b-b7f8e6d00000524c-c6-51d19f4b97ed Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0D.9A.21068.B4F91D15; Tue, 02 Jul 2013 00:24:59 +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 <0MP90039BK2QKU00@mmp1.samsung.com>; Tue, 02 Jul 2013 00:24:59 +0900 (KST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Cc: t.figa@samsung.com, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, myungjoo.ham@samsung.com, m.szyprowski@samsung.com, phil.carmody@partner.samsung.com, j.anaszewski@samsung.com, kyungmin.park@samsung.com, devicetree-discuss@lists.ozlabs.org, Sylwester Nawrocki Subject: [PATCH v3 01/13] ARM: dts: Correct camera pinctrl nodes for Exynos4x12 SoCs Date: Mon, 01 Jul 2013 17:22:23 +0200 Message-id: <1372692155-17653-2-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1372692155-17653-1-git-send-email-s.nawrocki@samsung.com> References: <1372692155-17653-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsVy+t9jAV3v+RcDDVof6VocmP2Q1aL36nNG i94FV9kszja9YbfY9Pgaq8WM8/uYLNYeuctucbtxBZvF7ldLWS0Ov2lntVg/4zWLA7fH5iX1 HudnLGT0OPhuD5NH35ZVjB6fN8kFsEZx2aSk5mSWpRbp2yVwZVx4sImx4LlwxZKvU5gaGC/x dzFyckgImEh86N3GDmGLSVy4t56ti5GLQ0hgEaPEzOu3WSCcDiaJGRMWsoFUsQkYSvQe7WME sUUEJCWaGv4wgxQxCxxjkvjZeANoFAeHsECYxMOVliA1LAKqEv2HvjOB2LwCbhJ7T/0CK5EQ UJCYM8kGJMwp4C7RtOID2BFCQCWHD/xkmsDIu4CRYRWjaGpBckFxUnqukV5xYm5xaV66XnJ+ 7iZGcOg9k97BuKrB4hCjAAejEg+vwryLgUKsiWXFlbmHGCU4mJVEeG96A4V4UxIrq1KL8uOL SnNSiw8xSnOwKInzHmy1DhQSSE8sSc1OTS1ILYLJMnFwSjUwtilH1QX5KuWuP99+zu/AqpkP /r4JbU8M8LJQVIzaeJeb+XbtemfBC1rXv/fN2dPK0O9+6OIqFfc1105pu6/nvW1zdM5WmbWG qaI52j9aNxo9D1NKaBPYe8sgVu5T92nbg91rauO1apk8Ei46R4lMFv10QfC/7+O6Bx4bXW22 NKeZWgia8mQqsRRnJBpqMRcVJwIAyO04qDkCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Kyungmin Park --- arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 40 ++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi index 704290f..55ff73b 100644 --- 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>;