From patchwork Fri Feb 2 15:43:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10197077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC2B46037D for ; Fri, 2 Feb 2018 15:44:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC91D28EB4 for ; Fri, 2 Feb 2018 15:44:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B125028EB8; Fri, 2 Feb 2018 15:44:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EFB928EB4 for ; Fri, 2 Feb 2018 15:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbeBBPoy (ORCPT ); Fri, 2 Feb 2018 10:44:54 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:42708 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751967AbeBBPoO (ORCPT ); Fri, 2 Feb 2018 10:44:14 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180202154412euoutp02b34e058b6dfaeadf0a5d4f9be1291e4f~PjKfwdz833127431274euoutp02W; Fri, 2 Feb 2018 15:44:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180202154412euoutp02b34e058b6dfaeadf0a5d4f9be1291e4f~PjKfwdz833127431274euoutp02W DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517586252; bh=h8ihQXJXXP6LG4lxTEViFnZQV5Sq2/1tjexBK7vnkU8=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=SMJwfWNP5FK3lYMTlBBXQxQ9ZC/J0yPQtys3LZ+CDUvMIXt16/Jr8qEzVcCHj7J2m 8JqOAk1fAZbs/nljuwOspyNUliLivEPKnMx/DLhO8tOoNBlxOjZ3Zx8Z4h3qbgbb1r nateqHztPdyrr/3SOQf+0QRDGo5wk/XDwsgEGnJE= Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180202154411eucas1p2dc9e0066cd187707745eba59e059275a~PjKfRgEFY2323923239eucas1p2G; Fri, 2 Feb 2018 15:44:11 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 4A.3B.30163.B47847A5; Fri, 2 Feb 2018 15:44:11 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180202154410eucas1p253a471a4532ba80e1b0a4d4bce7bdeca~PjKecwSop0230802308eucas1p2r; Fri, 2 Feb 2018 15:44:10 +0000 (GMT) X-AuditID: cbfec7f4-f790c6d0000075d3-06-5a74874b93a6 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 4F.F4.20118.A47847A5; Fri, 2 Feb 2018 15:44:10 +0000 (GMT) Received: from AMDC2075.DIGITAL.local ([106.120.51.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P3J00LNH51AHA20@eusync4.samsung.com>; Fri, 02 Feb 2018 15:44:10 +0000 (GMT) From: Maciej Purski To: linux-samsung-soc@vger.kernel.org Cc: Kukjin Kim , Krzysztof Kozlowski , devicetree@vger.kernel.org, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, Maciej Purski Subject: [PATCH 09/10] ARM: dts: exynos: Use labels instead of full names in exynos4412-trats2 Date: Fri, 02 Feb 2018 16:43:54 +0100 Message-id: <1517586235-16603-10-git-send-email-m.purski@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1517586235-16603-1-git-send-email-m.purski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsWy7djPc7re7SVRBnM2qFhsnLGe1WL+kXOs Fv2PXzNbnD+/gd1ixvl9TBYLXt5isVh75C67A7vHplWdbB59W1YxenzeJBfAHMVlk5Kak1mW WqRvl8CVcXvXS8aCA6IVHw7+Y21gfCPQxcjJISFgIjHzYgsbhC0mceHeeiCbi0NIYCmjxNvO 4ywQzmdGibWv97LCdDTMvgSVWMYosfBZKyOE859R4vGbp0xdjBwcbAJaEmva40EaRARUJT63 LWAHqWEWOMQo8anlEjtIQlggQaJ913VmkHoWoKJf37xBwrwCrhKbT7UzQiyTk7h5rpMZxOYE il/r/sACEf/LKvHgth2E7SLx8NxPJghbWOLV8S3sELaMxOXJ3VD11RIXv+6CerNGovH2Bqga a4nPk7aAzWcW4JOYtG062DkSArwSHW1CEKaHxKbZshCmo8Ti/4oQz85glJj/7yDbBEbpBYwM qxhFUkuLc9NTi030ihNzi0vz0vWS83M3MQLj8fS/4192MC4+ZnWIUYCDUYmH1yCrJEqINbGs uDIXGBoczEoivNt8gUK8KYmVValF+fFFpTmpxYcYpTlYlMR5baPaIoUE0hNLUrNTUwtSi2Cy TBycUg2MqiXydVefVb9aXL9o84TDq1fc3dsSf66874F0Vs7uHaciPqa8//OqxfBYDtesFauE 7l/0VmK4sDBBv6Vz52GXpKa3F1b/c6o51i20+WxrhG3h+Zvyinl6/DvWbfvTf7M16IR/Z/I2 AbPfv4I6357R7DwXudYg6fkn33Urw1b/ZJ2SmnP65OXIzUosxRmJhlrMRcWJAB+l3SHDAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e/4NV2v9pIog79HLS02zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DKuL3rJWPBAdGKDwf/sTYwvhHoYuTkkBAwkWiYfYkFwhaTuHBvPVsXIxeHkMASRok9 b7axQziNTBIrT7UxdjFycLAJaEmsaY8HaRARUJX43LYArIZZ4BCjxL51z9hBEsICCRLtu64z g9SzABX9+uYNEuYVcJXYfKqdEWKZnMTNc53MIDYnUPxa9wewI4QEXCSaWt6yTWDkXcDIsIpR JLW0ODc9t9hIrzgxt7g0L10vOT93EyMwfLYd+7llB2PXu+BDjAIcjEo8vAZZJVFCrIllxZW5 QLdwMCuJ8G7zBQrxpiRWVqUW5ccXleakFh9ilOZgURLn7d2zOlJIID2xJDU7NbUgtQgmy8TB KdXAWH9spvG31Bm2XXo71wjK1i8MurrLf51csMuss+s1IlQfn/w8Z6rJIwNLhW3bzfUVfnIn dkzXS1773ybWQ7HjRgW/j4K8JSe/4ppdNT+U8k8e7xGU75u5O/NI1LOulfO+bbdN3H3pVE9H 3OLrZf4Kwoc25AV/z7y/7reVWBTbzKTZzbus9jGnKLEUZyQaajEXFScCALoXH/0bAgAA X-CMS-MailID: 20180202154410eucas1p253a471a4532ba80e1b0a4d4bce7bdeca X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180202154410eucas1p253a471a4532ba80e1b0a4d4bce7bdeca X-RootMTR: 20180202154410eucas1p253a471a4532ba80e1b0a4d4bce7bdeca References: <1517586235-16603-1-git-send-email-m.purski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Camera and i2c1_isp labels are defined in exynos4.dtsi and exynos4412.dtsi. Use them exynos4412-trats2. Signed-off-by: Maciej Purski --- arch/arm/boot/dts/exynos4412-trats2.dts | 73 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index f285790..b8abc21 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -288,17 +288,6 @@ }; }; - camera: camera { - pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>; - pinctrl-names = "default"; - status = "okay"; - assigned-clocks = <&clock CLK_MOUT_CAM0>, - <&clock CLK_MOUT_CAM1>; - assigned-clock-parents = <&clock CLK_XUSBXTI>, - <&clock CLK_XUSBXTI>; - - - }; wlan_pwrseq: sdhci3-pwrseq { compatible = "mmc-pwrseq-simple"; @@ -403,6 +392,16 @@ status = "okay"; }; +&camera { + pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>; + pinctrl-names = "default"; + status = "okay"; + assigned-clocks = <&clock CLK_MOUT_CAM0>, + <&clock CLK_MOUT_CAM1>; + assigned-clock-parents = <&clock CLK_XUSBXTI>, + <&clock CLK_XUSBXTI>; +}; + &cpu0 { cpu0-supply = <&buck2_reg>; }; @@ -527,32 +526,6 @@ pinctrl-0 = <&fimc_is_uart>; pinctrl-names = "default"; status = "okay"; - - i2c1_isp: i2c-isp@12140000 { - pinctrl-0 = <&fimc_is_i2c1>; - pinctrl-names = "default"; - - s5k6a3@10 { - compatible = "samsung,s5k6a3"; - reg = <0x10>; - svdda-supply = <&cam_io_reg>; - svddio-supply = <&ldo19_reg>; - afvdd-supply = <&ldo19_reg>; - clock-frequency = <24000000>; - /* CAM_B_CLKOUT */ - clocks = <&camera 1>; - clock-names = "extclk"; - samsung,camclk-out = <1>; - gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>; - - port { - is_s5k6a3_ep: endpoint { - remote-endpoint = <&csis1_ep>; - data-lanes = <1>; - }; - }; - }; - }; }; &fimc_lite_0 { @@ -629,6 +602,32 @@ }; }; +&i2c1_isp { + pinctrl-0 = <&fimc_is_i2c1>; + pinctrl-names = "default"; + + s5k6a3@10 { + compatible = "samsung,s5k6a3"; + reg = <0x10>; + svdda-supply = <&cam_io_reg>; + svddio-supply = <&ldo19_reg>; + afvdd-supply = <&ldo19_reg>; + clock-frequency = <24000000>; + /* CAM_B_CLKOUT */ + clocks = <&camera 1>; + clock-names = "extclk"; + samsung,camclk-out = <1>; + gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>; + + port { + is_s5k6a3_ep: endpoint { + remote-endpoint = <&csis1_ep>; + data-lanes = <1>; + }; + }; + }; +}; + &i2c_3 { samsung,i2c-sda-delay = <100>; samsung,i2c-slave-addr = <0x10>;