From patchwork Mon Jun 24 18:05:44 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: 2772601 Return-Path: X-Original-To: patchwork-linux-arm@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 331AE9F3A0 for ; Mon, 24 Jun 2013 18:07:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50FBE201F5 for ; Mon, 24 Jun 2013 18:07:36 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0861C201EF for ; Mon, 24 Jun 2013 18:07:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrBAO-0000rV-Cg; Mon, 24 Jun 2013 18:07:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrBAE-0000g3-H4; Mon, 24 Jun 2013 18:06:54 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrB9x-0000dQ-6p for linux-arm-kernel@lists.infradead.org; Mon, 24 Jun 2013 18:06:38 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOW0060CSYLFAR0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2013 03:06:21 +0900 (KST) X-AuditID: cbfee61b-b7f8e6d00000524c-f4-51c88a9d01c3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E1.EB.21068.D9A88C15; Tue, 25 Jun 2013 03:06:21 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOW005HYSXU1L40@mmp2.samsung.com>; Tue, 25 Jun 2013 03:06:21 +0900 (KST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Subject: [PATCH v2 1/8] ARM: dts: Correct camera pinctrl nodes for Exynos4x12 SoCs Date: Mon, 24 Jun 2013 20:05:44 +0200 Message-id: <1372097151-18122-2-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1372097151-18122-1-git-send-email-s.nawrocki@samsung.com> References: <1372097151-18122-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsVy+t9jQd25XScCDVbvMbM4MPshq0Xv1eeM Fr0LrrJZnG16w26x6fE1VosZ5/cxWaw9cpfd4nbjCjaL3a+WslocftPOarF+xmsWB26PzUvq Pc7PWMjocfDdHiaPvi2rGD0+b5ILYI3isklJzcksSy3St0vgyliwu5+pYItIxb2u4+wNjJMF uhg5OSQETCQ2909ngrDFJC7cW8/WxcjFISQwnVHi4JpZrCAJIYEOJondz8VBbDYBQ4neo32M ILaIgKREU8MfZpAGZoFjTBI/G2+wgySEBUIk/ixfzwxiswioSlw4dgpsEK+Am8THiSuB4hxA 2xQk5kyyAQlzCrhLHH64kR1il5tE25oelgmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn 525iBIfeM+kdjKsaLA4xCnAwKvHwfog7ESjEmlhWXJl7iFGCg1lJhDdUBCjEm5JYWZValB9f VJqTWnyIUZqDRUmc92CrdaCQQHpiSWp2ampBahFMlomDU6qBMbT77hprxuOXb7yP7vv/+5cl 98R7niaTfF5bt/55Vv7/Dv/eXQtLe44Lfdu553D7z893wyq/7LooZu63WHU1b8RhY5mFZZs9 /Fd0OWcfujlnmg7LDOb+uq2hk8+nHImUe/7gfWKen4n2z5y3WdJVZ47Xza++EXGrjNljxQXv iENS1V5K/9Sk/ymxFGckGmoxFxUnAgDh0GhxOQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130624_140637_939765_B7DA8C25 X-CRM114-Status: UNSURE ( 8.84 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -8.0 (--------) Cc: phil.carmody@partner.samsung.com, devicetree-discuss@lists.ozlabs.org, t.figa@samsung.com, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, myungjoo.ham@samsung.com, Sylwester Nawrocki , j.anaszewski@samsung.com, linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 --- Changes since v1: - enabled pull down in cam-port-{a, b}-clk-idle nodes. --- arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 40 ++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) -- 1.7.9.5 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>;