From patchwork Fri Jun 21 12:50:17 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: 2762041 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3A4F6C0AB1 for ; Fri, 21 Jun 2013 12:51:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 013022012E for ; Fri, 21 Jun 2013 12:51:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EA9C200F0 for ; Fri, 21 Jun 2013 12:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935525Ab3FUMvQ (ORCPT ); Fri, 21 Jun 2013 08:51:16 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:23464 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933510Ab3FUMvQ (ORCPT ); Fri, 21 Jun 2013 08:51:16 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOQ003LGUDENPE0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 21 Jun 2013 21:51:15 +0900 (KST) X-AuditID: cbfee61a-b7f3b6d000006edd-d2-51c44c422f94 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 22.5D.28381.24C44C15; Fri, 21 Jun 2013 21:51:14 +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 <0MOQ00DZCUC2UL40@mmp1.samsung.com>; Fri, 21 Jun 2013 21:51:14 +0900 (KST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, kyungmin.park@samsung.com, myungjoo.ham@samsung.com, m.szyprowski@samsung.com, phil.carmody@partner.samsung.com, j.anaszewski@samsung.com, devicetree-discuss@lists.ozlabs.org, Sylwester Nawrocki Subject: [PATCH 1/8] ARM: dts: Correct camera pinctrl nodes for Exynos4x12 SoCs Date: Fri, 21 Jun 2013 14:50:17 +0200 Message-id: <1371819024-12596-2-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1371819024-12596-1-git-send-email-s.nawrocki@samsung.com> References: <1371819024-12596-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsVy+t9jAV0nnyOBBg/WW1gcmP2Q1aL36nNG i94FV9kszja9YbfY9Pgaq8WM8/uYLNYeuctucbtxBZvF7ldLWS0Ov2lndeDy2Lyk3uP8jIWM Hgff7WHy6NuyitHj8ya5ANYoLpuU1JzMstQifbsErozdX34xFTwXrjj1YxpLA+Ml/i5GTg4J AROJgyseMEHYYhIX7q1n62Lk4hASWMQosX/bTlYIp4NJYsvZNlaQKjYBQ4neo32MILaIgKRE U8MfZpAiZoENTBIr7r5jA0kIC/hLrJ77ix3EZhFQldg4az7YCl4BN4lF0/exdDFyAK1TkJgz yQbE5BRwl/jxvBSkQgioYtaiqWwTGHkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAgO uGdSOxhXNlgcYhTgYFTi4V2hcjhQiDWxrLgy9xCjBAezkghv8B2gEG9KYmVValF+fFFpTmrx IUZpDhYlcd4DrdaBQgLpiSWp2ampBalFMFkmDk6pBsb434Z377k9L3muInHpYJjD46gLpb8v v2LefnNydnChwvN5YqnlC0MTdpubKJ/OnBkuee+dUNGiF4aR/kkS7Zybb7m8uv9K36Ns4bro 50wJ9S94jUOj5RrLTJO+sWr/X7NymsqRxbX/5SarrF736WHqroiFgkm3MpU2Tftb+evHJutN 22XlvtxTYinOSDTUYi4qTgQAgN7F9zQCAAA= 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=-8.4 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..50eaa95 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 = <0>; 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 = <0>; + samsung,pin-drv = <0>; + }; + eint0: ext-int0 { samsung,pins = "gpx0-0"; samsung,pin-function = <0xf>;