From patchwork Fri Feb 2 15:43:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10197065 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 83AB56037D for ; Fri, 2 Feb 2018 15:44:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 744E928EB4 for ; Fri, 2 Feb 2018 15:44:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68F2A28EB9; Fri, 2 Feb 2018 15:44:34 +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 BBF1728EB4 for ; Fri, 2 Feb 2018 15:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151AbeBBPob (ORCPT ); Fri, 2 Feb 2018 10:44:31 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:35467 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbeBBPoL (ORCPT ); Fri, 2 Feb 2018 10:44:11 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180202154409euoutp014dff28370632dabfe1d296743251c344~PjKcuO6pv0842608426euoutp01T; Fri, 2 Feb 2018 15:44:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180202154409euoutp014dff28370632dabfe1d296743251c344~PjKcuO6pv0842608426euoutp01T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517586249; bh=kFKuFUVsB6WmMkjl3YCXGIKpDm+47kSvRAkkqvDg2d4=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=Zjw8z2CQPXIC7PakRPAlwER0aFAi/miVScr+tWkvPCOKKINXWlnXf3bS8aQpTK9q3 rD3V8QRtg7hI/Irpbq8YnA2NXW9QOhLMh7Ko8BTJWKsDfK7SwDIPaHrLvop8rPyU5A Vte0pAMx8wWgXEjxQnndT4ff+64G6QmDACCf42s4= Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180202154408eucas1p26f42d135603bcb2bcbe63a6ae95281dc~PjKb2U51Y2323923239eucas1p2C; Fri, 2 Feb 2018 15:44:08 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 20.0F.12867.747847A5; Fri, 2 Feb 2018 15:44:07 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180202154407eucas1p2b8df9fd358d944e96651bf117b4b0408~PjKbMxPfz0601106011eucas1p2Q; Fri, 2 Feb 2018 15:44:07 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-66-5a7487475031 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 90.D5.18832.747847A5; Fri, 2 Feb 2018 15:44:07 +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:07 +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 04/10] ARM: dts: exynos: Use labels instead of full names in exynos4210 Date: Fri, 02 Feb 2018 16:43:49 +0100 Message-id: <1517586235-16603-5-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+NgFtrMIsWRmVeSWpSXmKPExsWy7djP87ru7SVRBse6LSw2zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DK+P/3CntBn3zFildfGBsYWyS7GDk5JARMJG7dusQIYYtJXLi3nq2LkYtDSGApo8TN LY0sEM5nRom5/1exwHScW90IVbWMUaJxxjRWCOc/o8S+R81Aszg42AS0JNa0x4M0iAioSnxu W8AOUsMscIhR4lPLJXaQGmGBSIlvE0RAaliAatav/w12Bq+Ai8TDFY+YIJbJSdw818kMYnMK uEpc6/4AdpGEwF9WiV3dx6EucpG4+OcU1A/CEq+Ob2GHsGUkOjsOQg2qlrj4dRcbhF0j0Xh7 A1SNtcTnSVvAFjAL8ElM2jadGeQ2CQFeiY42IYgSD4lJveuhyh0ljk2ezAzx7wxGiQWztjJO YJRewMiwilEktbQ4Nz212FivODG3uDQvXS85P3cTIzAqT/87/mkH49cTVocYBTgYlXh4DbJK ooRYE8uKK3OBAcLBrCTCu80XKMSbklhZlVqUH19UmpNafIhRmoNFSZzXNqotUkggPbEkNTs1 tSC1CCbLxMEp1cAo23ThU817U+0zvqvzlv812hOd+XfGLNdMH2FbpVUZMqE3q+cc9b0e4+at 5pR++Ips+LL637L7TPss1EysrJ1E/yks+m6tWu5i5DJXtuwAn45ig32v6w3zori3hXf/ZU3d VGLtc3biOYNNnvn2y7hNtCtUfk6oZk6e+2jvrtsf/fi+2PlnyCmxFGckGmoxFxUnAgA/fFCc xgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e/4NV339pIogxPXpS02zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DK+P/3CntBn3zFildfGBsYWyS7GDk5JARMJM6tbmSDsMUkLtxbD2RzcQgJLGGUaPv2 ihHCaWSSaGqYxdTFyMHBJqAlsaY9HqRBREBV4nPbAnaQGmaBQ4wS+9Y9YwepERaIlPg2QQSk hgWoZv3634wgNq+Ai8TDFY+YIJbJSdw818kMYnMKuEpc6/7AAmILAdU0tbxlm8DIu4CRYRWj SGppcW56brGhXnFibnFpXrpecn7uJkZg+Gw79nPzDsZLG4MPMQpwMCrx8N5IL4kSYk0sK67M BbqFg1lJhHebL1CINyWxsiq1KD++qDQntfgQozQHi5I4b++e1ZFCAumJJanZqakFqUUwWSYO TqkGxoBwtQ0/FsYc3P58YUT40ufzf95MNNa8ENDv92inYYxvZqV2zFT7MHn1tg/rs18Yhig+ NnHX/aspdeek84XTltFtT7kenI8IPaL/yNvnvKZq6vzH2p3Mm9X8fTW/npvX+PJqcGhu6nxu /m0venfPNjXJfyV7d+FeLU+fyUfOlV3ZXJl1OqnLQYmlOCPRUIu5qDgRAFrjI0AbAgAA X-CMS-MailID: 20180202154407eucas1p2b8df9fd358d944e96651bf117b4b0408 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180202154407eucas1p2b8df9fd358d944e96651bf117b4b0408 X-RootMTR: 20180202154407eucas1p2b8df9fd358d944e96651bf117b4b0408 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, fimc, mixer and tmu labels has been defined in exynos4.dtsi. Use them in exynos4210 instead of full names. Signed-off-by: Maciej Purski --- arch/arm/boot/dts/exynos4210.dtsi | 102 +++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 82c1a32..07b2197 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -152,18 +152,6 @@ reg = <0x03860000 0x1000>; }; - tmu: tmu@100c0000 { - compatible = "samsung,exynos4210-tmu"; - interrupt-parent = <&combiner>; - reg = <0x100C0000 0x100>; - interrupts = <2 4>; - clocks = <&clock CLK_TMU_APBIF>; - clock-names = "tmu_apbif"; - samsung,tmu_gain = <15>; - samsung,tmu_reference_voltage = <7>; - status = "disabled"; - }; - thermal-zones { cpu_thermal: cpu-thermal { polling-delay-passive = <0>; @@ -194,45 +182,6 @@ iommus = <&sysmmu_g2d>; }; - camera { - clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>, - <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>; - clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1"; - - fimc_0: fimc@11800000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,cam-if; - }; - - fimc_1: fimc@11810000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,cam-if; - }; - - fimc_2: fimc@11820000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,lcd-wb; - }; - - fimc_3: fimc@11830000 { - samsung,pix-limits = <1920 8192 1366 1920>; - samsung,rotators = <0>; - samsung,mainscaler-ext; - samsung,lcd-wb; - }; - }; - - mixer: mixer@12c10000 { - clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer", - "sclk_mixer"; - clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>, - <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>, - <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>; - }; - ppmu_lcd1: ppmu_lcd1@12240000 { compatible = "samsung,exynos-ppmu"; reg = <0x12240000 0x2000>; @@ -427,6 +376,12 @@ cpu-offset = <0x8000>; }; +&camera { + clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>, + <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>; + clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1"; +}; + &combiner { samsung,combiner-nr = <16>; interrupts = , @@ -447,10 +402,43 @@ ; }; +&fimc_0 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,cam-if; +}; + +&fimc_1 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,cam-if; +}; + +&fimc_2 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,lcd-wb; +}; + +&fimc_3 { + samsung,pix-limits = <1920 8192 1366 1920>; + samsung,rotators = <0>; + samsung,mainscaler-ext; + samsung,lcd-wb; +}; + &mdma1 { power-domains = <&pd_lcd0>; }; +&mixer { + clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer", + "sclk_mixer"; + clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>, + <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>, + <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>; +}; + &pmu_system_controller { clock-names = "clkout0", "clkout1", "clkout2", "clkout3", "clkout4", "clkout8", "clkout9"; @@ -468,4 +456,16 @@ power-domains = <&pd_lcd0>; }; +&tmu { + compatible = "samsung,exynos4210-tmu"; + interrupt-parent = <&combiner>; + reg = <0x100C0000 0x100>; + interrupts = <2 4>; + clocks = <&clock CLK_TMU_APBIF>; + clock-names = "tmu_apbif"; + samsung,tmu_gain = <15>; + samsung,tmu_reference_voltage = <7>; + status = "disabled"; +}; + #include "exynos4210-pinctrl.dtsi"