From patchwork Mon Feb 5 07:57:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10199951 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 563B8601A1 for ; Mon, 5 Feb 2018 07:57:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A989205A8 for ; Mon, 5 Feb 2018 07:57:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EF7024151; Mon, 5 Feb 2018 07:57:46 +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 CB8A2205A8 for ; Mon, 5 Feb 2018 07:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665AbeBEH5p (ORCPT ); Mon, 5 Feb 2018 02:57:45 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:35363 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752675AbeBEH5e (ORCPT ); Mon, 5 Feb 2018 02:57:34 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180205075732euoutp029dd2e7ee03e75ff3a8ff215c8e2189a1~QXu5uo2b70677906779euoutp02y; Mon, 5 Feb 2018 07:57:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180205075732euoutp029dd2e7ee03e75ff3a8ff215c8e2189a1~QXu5uo2b70677906779euoutp02y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517817452; bh=h8ihQXJXXP6LG4lxTEViFnZQV5Sq2/1tjexBK7vnkU8=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=o/p8kuisuvB9pRGX47QuEeLFEkg4OwEA307Qs3T+GdnMUQkfYI60t/cZWQtp7YDL9 eeU5YQrZ/PHKV0wtgHJyVCbsJlgFLyJhuPXqtvVmXlUGd0tj7J7XyyjJEFKOAdq6uP g6/p4d0fQ5ZXGmgH5IdP5Uw2DjHfbWZOk89F/338= Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180205075731eucas1p2dec41bc01b5ffe5ac53f105671df7d70~QXu4aJj7A1188911889eucas1p2g; Mon, 5 Feb 2018 07:57:31 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id A2.26.30163.A6E087A5; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075730eucas1p196ccf9ed382aed52c2079e5c6c5c42c4~QXu3eHh1o1836818368eucas1p1e; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) X-AuditID: cbfec7f4-f790c6d0000075d3-3f-5a780e6a6309 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 99.66.20118.A6E087A5; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) Received: from AMDC2075.DIGITAL.local ([106.120.51.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P3O00B6Y3FHB200@eusync1.samsung.com>; Mon, 05 Feb 2018 07:57:30 +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 v2 8/9] ARM: dts: exynos: Use labels instead of full names in exynos4412-trats2 Date: Mon, 05 Feb 2018 08:57:07 +0100 Message-id: <1517817428-7898-9-git-send-email-m.purski@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1517817428-7898-1-git-send-email-m.purski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsWy7djP87pZfBVRBit+mVlsnLGe1WL+kXOs Fv2PXzNbnD+/gd1ixvl9TBYLXt5isVh75C67A7vHplWdbB59W1YxenzeJBfAHMVlk5Kak1mW WqRvl8CVcXvXS8aCA6IVHw7+Y21gfCPQxcjJISFgInHo0jNGCFtM4sK99WxdjFwcQgJLGSWW H7kA5XxmlNg2dwYLTMe9Ry+ZIRLLGCUOH+yHqvrPKPFzz12gWRwcbAJaEmva40EaRARUJT63 LWAHqWEWOMQo8anlEjtIQlggUeL16jYmkHoWoKJVc61BwrwCzhKf7h9mh1gmJ3HzXCcziM0p 4CJx8fl8FpA5EgJ/WSX61l5lhShykdjU8pYNwhaWeHV8C1SzjMTlyd1QV1dLXPy6C6qmRqLx 9gaoGmuJz5O2gC1gFuCTmLRtOjPIPRICvBIdbUIQJR4SvzruQrU6Sjw/PIkd4t/pjBKNJ56x TGCUXsDIsIpRJLW0ODc9tdhErzgxt7g0L10vOT93EyMwKk//O/5lB+PiY1aHGAU4GJV4eC3i y6OEWBPLiitzgQHCwawkwut0HSjEm5JYWZValB9fVJqTWnyIUZqDRUmc1zaqLVJIID2xJDU7 NbUgtQgmy8TBKdXAGMBbt/H5oxM/pLTLcuv6nkhr2k04MmvyZvXL699cTDXkzTzVsVv1mWiZ QUvFnEv+1vMLMo5btgj07pp/8fTmf9ZfTi47zPbANu3vLVUZj4NKHl/vPK1/rqbLK/YzMKrt pETktNtSF0svHbD0Dz9oJpfTpiZk++bAz9xA/VVv7r9hzltY++s2vxJLcUaioRZzUXEiAL+V T6PGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnluLIzCtJLcpLzFFi42I5/e/4Zd0svooog92/2C02zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DKuL3rJWPBAdGKDwf/sTYwvhHoYuTkkBAwkbj36CUzhC0mceHeerYuRi4OIYEljBJT j/xignAamSTmT25j7GLk4GAT0JJY0x4P0iAioCrxuW0BO0gNs8AhRol9656xgySEBRIlrhx8 zwxSzwJUtGquNUiYV8BZ4tP9w+wQy+Qkbp7rBFvMKeAicfH5fBaQciGgmr2r5Scw8i5gZFjF KJJaWpybnltspFecmFtcmpeul5yfu4kRGDzbjv3csoOx613wIUYBDkYlHl6L+PIoIdbEsuLK XKBTOJiVRHidrgOFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8/buWR0pJJCeWJKanZpakFoEk2Xi 4JRqYKwM0wz2Eec8aVIgce1Op9XJY3KdAguYZkY88U5856uSU5qx22OltKqh8a/Upx1yr0Qd bsfbP371w2m2suZTKd95mhW9Xql3lRcqHjN9l+fpbeur8K9CVGrizDmX83dssNlzfONaH5Hn H+y90xlZ8/9elxCrFZBOL7zz2/L7ZN8vt+evPKYcrsRSnJFoqMVcVJwIAKpyEacaAgAA X-CMS-MailID: 20180205075730eucas1p196ccf9ed382aed52c2079e5c6c5c42c4 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180205075730eucas1p196ccf9ed382aed52c2079e5c6c5c42c4 X-RootMTR: 20180205075730eucas1p196ccf9ed382aed52c2079e5c6c5c42c4 References: <1517817428-7898-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>;