From patchwork Mon Feb 5 07:57:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10199945 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 B8018601A1 for ; Mon, 5 Feb 2018 07:57:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADB8A24151 for ; Mon, 5 Feb 2018 07:57:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A243B2521E; Mon, 5 Feb 2018 07:57:43 +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 B6065251F9 for ; Mon, 5 Feb 2018 07:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752520AbeBEH5k (ORCPT ); Mon, 5 Feb 2018 02:57:40 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:35351 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbeBEH5c (ORCPT ); Mon, 5 Feb 2018 02:57:32 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180205075730euoutp0231c62e6d48d8e418e485308795fdee91~QXu33EH8I0677906779euoutp02x; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180205075730euoutp0231c62e6d48d8e418e485308795fdee91~QXu33EH8I0677906779euoutp02x DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517817450; bh=BmYb1szyH+BRUk7TDgrfrKD+jWe/oh6hHxphjWeCF74=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=LP5Nxf0pIlJUPFahrdGRD8yjG2cMoVErIwGEZ4mcNmpeEHkuRsCXCMS+UVjeQSBLZ 4RHuFhXIw8PiZ0tM7So9vc/ZCD+EIYGPOxaTDYgRMPkdSMYthUVsZHqYS1OIF5uu1g AhH9s8VsZd9ExBqCOy2nzZppWdgzqbaIBaEXJU24= Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075729eucas1p1aedcf724bb44ac13641bb3677df51371~QXu3A2-qT1683416834eucas1p1o; Mon, 5 Feb 2018 07:57:29 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 53.BF.12907.96E087A5; Mon, 5 Feb 2018 07:57:29 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075728eucas1p10ced799b8df7a7c504c15a1748d15f10~QXu2W1HaA1836818368eucas1p1c; Mon, 5 Feb 2018 07:57:28 +0000 (GMT) X-AuditID: cbfec7f1-f793a6d00000326b-05-5a780e6961ec Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D9.86.18832.86E087A5; Mon, 5 Feb 2018 07:57:28 +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:28 +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 5/9] ARM: dts: exynos: Use labels instead of full names in exynos4210-universal_c210 Date: Mon, 05 Feb 2018 08:57:04 +0100 Message-id: <1517817428-7898-6-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+NgFtrEIsWRmVeSWpSXmKPExsWy7djPc7qZfBVRBkuWiltsnLGe1WL+kXOs Fv2PXzNbnD+/gd1ixvl9TBYLXt5isVh75C67A7vHplWdbB59W1YxenzeJBfAHMVlk5Kak1mW WqRvl8CV0dy3iKXgpWzF622H2BoYD4l3MXJySAiYSDxaep4RwhaTuHBvPVsXIxeHkMBSRonz 56azQjifGSUmr1jJDtOxYuMWJojEMkaJDS93M0M4/xklFk5fA+RwcLAJaEmsaY8HaRARUJX4 3LaAHaSGWeAQo8Snlktgk4QFMiVmrb7NAlLPAlR05YYRSJhXwFnizPS1TBDL5CRunutkBrE5 BVwkLj6fzwIyR0LgL6vE61sLoYpcJNbN74f6QVji1fEtUJfKSHR2HISqqZa4+HUXG4RdI9F4 ewNUjbXE50lbwBYwC/BJTNo2Hex+CQFeiY42IYgSD4mdrR1MEGFHibm/FCHenc4o8arhDtME RukFjAyrGEVSS4tz01OLjfSKE3OLS/PS9ZLzczcxAmPy9L/jH3cwvj9hdYhRgINRiYfXIr48 Sog1say4MhcYHhzMSiK8TteBQrwpiZVVqUX58UWlOanFhxilOViUxHlto9oihQTSE0tSs1NT C1KLYLJMHJxSDYxubF5ZP8rdPZ5NmNNVu91l3+Q8JzGuSTOv6pwRLnZga6v4z6y0wHn/9zde mYYvW9YK90kpvKn/8+u5zVwnQasSpZlvfjtfkQu6erKq657FVKs6tbu7l8h+/an7xDPn6sbw nVpSJfZ9bPUmDdN/36qLrV37Y63Rid4z8r+j0w7fL/2effOJXIQSS3FGoqEWc1FxIgAWio9G xQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnluLIzCtJLcpLzFFi42I5/e/4Zd0MvooogxevLCw2zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DKaO5bxFLwUrbi9bZDbA2Mh8S7GDk5JARMJFZs3MIEYYtJXLi3nq2LkYtDSGAJo0TT 2zWsEE4jk8S3XUeAqjg42AS0JNa0x4M0iAioSnxuW8AOUsMscIhRYt+6Z+wgCWGBTIkZDccZ QepZgIqu3DACCfMKOEucmb4WapmcxM1zncwgNqeAi8TF5/NZQMqFgGr2rpafwMi7gJFhFaNI amlxbnpusaFecWJucWleul5yfu4mRmDwbDv2c/MOxksbgw8xCnAwKvHwWsSXRwmxJpYVV+YC ncLBrCTC63QdKMSbklhZlVqUH19UmpNafIhRmoNFSZy3d8/qSCGB9MSS1OzU1ILUIpgsEwen VANj76Ha8wUn1glOvum00Ov6yd1PD6273RV9vrRu1wv9+ZZ3X5TyrViYYmRo/P7H0e7PqbUq 4X9vbpDONXpl71DhV1f14kqwlx2vUenZzPesB3e8+hTeqWS+aXXxhNsbmrseS6i71oWL8/7b tkVMx6d248eG2vRLzCKcAjPcupbUMa14fGDa1fdOSizFGYmGWsxFxYkAacHMehoCAAA= X-CMS-MailID: 20180205075728eucas1p10ced799b8df7a7c504c15a1748d15f10 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180205075728eucas1p10ced799b8df7a7c504c15a1748d15f10 X-RootMTR: 20180205075728eucas1p10ced799b8df7a7c504c15a1748d15f10 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, Fimc, mct and sysram labels are defined in exynos4210.dtsi. Use them in exynos4210-universal_c210.dts instead of full names. Signed-off-by: Maciej Purski --- arch/arm/boot/dts/exynos4210-universal_c210.dts | 115 ++++++++++++------------ 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index 21fff7c..4e6ff97 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -28,24 +28,6 @@ stdout-path = &serial_2; }; - sysram@2020000 { - smp-sysram@0 { - status = "disabled"; - }; - - smp-sysram@5000 { - compatible = "samsung,exynos4210-sysram"; - reg = <0x5000 0x1000>; - }; - - smp-sysram@1f000 { - status = "disabled"; - }; - }; - - mct@10050000 { - compatible = "none"; - }; fixed-rate-clocks { xxti { @@ -173,45 +155,6 @@ }; }; - camera { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <>; - - fimc_0: fimc@11800000 { - status = "okay"; - assigned-clocks = <&clock CLK_MOUT_FIMC0>, - <&clock CLK_SCLK_FIMC0>; - assigned-clock-parents = <&clock CLK_SCLK_MPLL>; - assigned-clock-rates = <0>, <160000000>; - }; - - fimc_1: fimc@11810000 { - status = "okay"; - assigned-clocks = <&clock CLK_MOUT_FIMC1>, - <&clock CLK_SCLK_FIMC1>; - assigned-clock-parents = <&clock CLK_SCLK_MPLL>; - assigned-clock-rates = <0>, <160000000>; - }; - - fimc_2: fimc@11820000 { - status = "okay"; - assigned-clocks = <&clock CLK_MOUT_FIMC2>, - <&clock CLK_SCLK_FIMC2>; - assigned-clock-parents = <&clock CLK_SCLK_MPLL>; - assigned-clock-rates = <0>, <160000000>; - }; - - fimc_3: fimc@11830000 { - status = "okay"; - assigned-clocks = <&clock CLK_MOUT_FIMC3>, - <&clock CLK_SCLK_FIMC3>; - assigned-clock-parents = <&clock CLK_SCLK_MPLL>; - assigned-clock-rates = <0>, <160000000>; - }; - }; - hdmi_en: voltage-regulator-hdmi-5v { compatible = "regulator-fixed"; regulator-name = "HDMI_5V"; @@ -234,6 +177,13 @@ }; }; +&camera { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <>; +}; + &cpu0 { cpu0-supply = <&vdd_arm_reg>; }; @@ -250,6 +200,38 @@ vbus-supply = <&safeout1_reg>; }; +&fimc_0 { + status = "okay"; + assigned-clocks = <&clock CLK_MOUT_FIMC0>, + <&clock CLK_SCLK_FIMC0>; + assigned-clock-parents = <&clock CLK_SCLK_MPLL>; + assigned-clock-rates = <0>, <160000000>; +}; + +&fimc_1 { + status = "okay"; + assigned-clocks = <&clock CLK_MOUT_FIMC1>, + <&clock CLK_SCLK_FIMC1>; + assigned-clock-parents = <&clock CLK_SCLK_MPLL>; + assigned-clock-rates = <0>, <160000000>; +}; + +&fimc_2 { + status = "okay"; + assigned-clocks = <&clock CLK_MOUT_FIMC2>, + <&clock CLK_SCLK_FIMC2>; + assigned-clock-parents = <&clock CLK_SCLK_MPLL>; + assigned-clock-rates = <0>, <160000000>; +}; + +&fimc_3 { + status = "okay"; + assigned-clocks = <&clock CLK_MOUT_FIMC3>, + <&clock CLK_SCLK_FIMC3>; + assigned-clock-parents = <&clock CLK_SCLK_MPLL>; + assigned-clock-rates = <0>, <160000000>; +}; + &fimd { pinctrl-0 = <&lcd_clk>, <&lcd_data24>; pinctrl-names = "default"; @@ -501,6 +483,10 @@ status = "okay"; }; +&mct { + compatible = "none"; +}; + &mdma1 { reg = <0x12840000 0x1000>; }; @@ -579,3 +565,18 @@ /delete-property/dmas; /delete-property/dma-names; }; + +&sysram { + smp-sysram@0 { + status = "disabled"; + }; + + smp-sysram@5000 { + compatible = "samsung,exynos4210-sysram"; + reg = <0x5000 0x1000>; + }; + + smp-sysram@1f000 { + status = "disabled"; + }; +};