From patchwork Mon Feb 5 07:57:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10199947 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 27F7F6056A for ; Mon, 5 Feb 2018 07:57:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BF5923F88 for ; Mon, 5 Feb 2018 07:57:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1084B251F9; Mon, 5 Feb 2018 07:57:44 +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 76BC123F88 for ; Mon, 5 Feb 2018 07:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752689AbeBEH5m (ORCPT ); Mon, 5 Feb 2018 02:57:42 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:35353 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752659AbeBEH5c (ORCPT ); Mon, 5 Feb 2018 02:57:32 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180205075730euoutp027537993109a248e66c49fff95404b0cd~QXu4A51-30645406454euoutp02B; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180205075730euoutp027537993109a248e66c49fff95404b0cd~QXu4A51-30645406454euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517817450; bh=8V/cV1fQHTzGeZQ0N7pl63Bi/GKPEF6CRiSvI5+ThnM=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=OQhHli/kX8P4ElS5jwi6pOA6xi9xbYGD8O34op1x7rya89yuQpwmBqcqI4LCYBJsN OZViEKZUIGpZ9L59Pv8NF+fyTSF5s08Kd2VVgzQXxgBIbhvTL6PuBehC5pTdIy28JT ttvRk3dmS6x9uUn1jwXezEYREoKpt2g1AtHXismE= Received: from eusmges5.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180205075730eucas1p2a123a41f535d8e09f4907a75ce4a48c4~QXu3WOQ5C1188911889eucas1p2e; Mon, 5 Feb 2018 07:57:30 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges5.samsung.com (EUCPMTA) with SMTP id 3A.21.12743.96E087A5; Mon, 5 Feb 2018 07:57:29 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075729eucas1p151ca06d3f2dad9bafef3088af61a498f~QXu2tWmOB1836818368eucas1p1d; Mon, 5 Feb 2018 07:57:29 +0000 (GMT) X-AuditID: cbfec7f5-f79d06d0000031c7-eb-5a780e69fa6c Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 19.66.20118.96E087A5; Mon, 5 Feb 2018 07:57:29 +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:29 +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 6/9] ARM: dts: exynos: Use camera label in exynos4412 Date: Mon, 05 Feb 2018 08:57:05 +0100 Message-id: <1517817428-7898-7-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+NgFtrMIsWRmVeSWpSXmKPExsWy7djPc7qZfBVRBt1tehYbZ6xntZh/5Byr Rf/j18wW589vYLeYcX4fk8WCl7dYLNYeucvuwO6xaVUnm0ffllWMHp83yQUwR3HZpKTmZJal FunbJXBlfF+1gL3gqXHFsdtvmBsYGzW7GDk5JARMJNYe2s4OYYtJXLi3ng3EFhJYyijRPkmk i5ELyP7MKLF//mNWmIafry4xQSSWMUosOd3IDuH8Z5S423sUqJ2Dg01AS2JNezxIg4iAqsTn tgVgNcwChxglPrVcAlsnLOAhsaRhOTOIzQJU9Pv1RLDVvALOEjvvtDNCbJOTuHmuE6yGU8BF 4uLz+SwggyQEGtkkHj38xAZR5CIxYekPqPOEJV4d3wL1j4zE5cndLBB2tcTFr7ug6mskGm9v gKqxlvg8aQvYAmYBPolJ26YzgzwgIcAr0dEmBFHiIfFwwyqoMY4SJ3a/gnp4OqPEuWOXWSYw Si9gZFjFKJJaWpybnlpsqlecmFtcmpeul5yfu4kRGJWn/x3/uoNx6TGrQ4wCHIxKPLwW8eVR QqyJZcWVucAQ4WBWEuF1ug4U4k1JrKxKLcqPLyrNSS0+xCjNwaIkzmsb1RYpJJCeWJKanZpa kFoEk2Xi4JRqYDTvmS/9bL3jYf7o1rQ1N3xvX3i+pap+w5STFfM3fJodZyc33eTBT4MD4o+X fT+fHvEi8FwGp7fCaWXxoLo7cpoBd2oYq6bNtHbT97a5cU9Nkat1yQyVXbGJr9Ybr4yd1eKQ MFdXwVGjfO7NFzd2yXgoKGZ+bzXPulbRUnzYYJ3ibr3M1Ud/sCmxFGckGmoxFxUnAgC43i1i xgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e/4Zd1Mvooogx9/hCw2zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DK+L5qAXvBU+OKY7ffMDcwNmp2MXJySAiYSPx8dYkJwhaTuHBvPVsXIxeHkMASRokD EzezQziNTBITb7UzdzFycLAJaEmsaY8HaRARUJX43LYArIZZ4BCjxL51z9hBEsICHhJLGpYz g9gsQEW/X09kA7F5BZwldt5pZ4TYJidx81wnWA2ngIvExefzWUDmCwHV7F0tP4GRdwEjwypG kdTS4tz03GIjveLE3OLSvHS95PzcTYzA8Nl27OeWHYxd74IPMQpwMCrx8FrEl0cJsSaWFVfm At3Cwawkwut0HSjEm5JYWZValB9fVJqTWnyIUZqDRUmct3fP6kghgfTEktTs1NSC1CKYLBMH p1QDI5vn/sWHq+85PDXV4Z4rO2/6t6UPVgupHpzic0/u2k6mq3bnF6X2qtaIqAR8P21y/PZW PZM25YBkBVaTm+733h56sV5krbOU2EMW/6NlopPu/LvyUOdkE0PRvIRtPAc2Ht5dvPmkKt/F 7X/nn9jaqPL1+dGTbF3WE2+Uh+me/+bHE56VytsTNk2JpTgj0VCLuag4EQDHOQp/GwIAAA== X-CMS-MailID: 20180205075729eucas1p151ca06d3f2dad9bafef3088af61a498f X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180205075729eucas1p151ca06d3f2dad9bafef3088af61a498f X-RootMTR: 20180205075729eucas1p151ca06d3f2dad9bafef3088af61a498f 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 label has been defined in exynos4.dtsi. Use it in exynos4412 instead of defining a new node. Signed-off-by: Maciej Purski --- arch/arm/boot/dts/exynos4412.dtsi | 172 +++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index a49daf9..a6f3f59 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -283,92 +283,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-3] are configured outside, under phandles */ - fimc_lite_0: fimc-lite@12390000 { - compatible = "samsung,exynos4212-fimc-lite"; - reg = <0x12390000 0x1000>; - interrupts = ; - power-domains = <&pd_isp>; - clocks = <&isp_clock CLK_ISP_FIMC_LITE0>; - clock-names = "flite"; - iommus = <&sysmmu_fimc_lite0>; - status = "disabled"; - }; - - fimc_lite_1: fimc-lite@123a0000 { - compatible = "samsung,exynos4212-fimc-lite"; - reg = <0x123A0000 0x1000>; - interrupts = ; - power-domains = <&pd_isp>; - clocks = <&isp_clock CLK_ISP_FIMC_LITE1>; - clock-names = "flite"; - iommus = <&sysmmu_fimc_lite1>; - status = "disabled"; - }; - - fimc_is: fimc-is@12000000 { - compatible = "samsung,exynos4212-fimc-is"; - reg = <0x12000000 0x260000>; - interrupts = , - ; - power-domains = <&pd_isp>; - clocks = <&isp_clock CLK_ISP_FIMC_LITE0>, - <&isp_clock CLK_ISP_FIMC_LITE1>, - <&isp_clock CLK_ISP_PPMUISPX>, - <&isp_clock CLK_ISP_PPMUISPMX>, - <&isp_clock CLK_ISP_FIMC_ISP>, - <&isp_clock CLK_ISP_FIMC_DRC>, - <&isp_clock CLK_ISP_FIMC_FD>, - <&isp_clock CLK_ISP_MCUISP>, - <&isp_clock CLK_ISP_GICISP>, - <&isp_clock CLK_ISP_MCUCTL_ISP>, - <&isp_clock CLK_ISP_PWM_ISP>, - <&isp_clock CLK_ISP_DIV_ISP0>, - <&isp_clock CLK_ISP_DIV_ISP1>, - <&isp_clock CLK_ISP_DIV_MCUISP0>, - <&isp_clock CLK_ISP_DIV_MCUISP1>, - <&clock CLK_MOUT_MPLL_USER_T>, - <&clock CLK_ACLK200>, - <&clock CLK_ACLK400_MCUISP>, - <&clock CLK_DIV_ACLK200>, - <&clock CLK_DIV_ACLK400_MCUISP>, - <&clock CLK_UART_ISP_SCLK>; - clock-names = "lite0", "lite1", "ppmuispx", - "ppmuispmx", "isp", - "drc", "fd", "mcuisp", - "gicisp", "mcuctl_isp", "pwm_isp", - "ispdiv0", "ispdiv1", "mcuispdiv0", - "mcuispdiv1", "mpll", "aclk200", - "aclk400mcuisp", "div_aclk200", - "div_aclk400mcuisp", "uart"; - iommus = <&sysmmu_fimc_isp>, <&sysmmu_fimc_drc>, - <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; - iommu-names = "isp", "drc", "fd", "mcuctl"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - status = "disabled"; - - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - - i2c1_isp: i2c-isp@12140000 { - compatible = "samsung,exynos4212-i2c-isp"; - reg = <0x12140000 0x100>; - clocks = <&isp_clock CLK_ISP_I2C1_ISP>; - clock-names = "i2c_isp"; - #address-cells = <1>; - #size-cells = <0>; - }; - }; - }; - mshc_0: mmc@12550000 { compatible = "samsung,exynos4412-dw-mshc"; reg = <0x12550000 0x1000>; @@ -662,6 +576,92 @@ ; }; +&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-3] are configured outside, under phandles */ + fimc_lite_0: fimc-lite@12390000 { + compatible = "samsung,exynos4212-fimc-lite"; + reg = <0x12390000 0x1000>; + interrupts = ; + power-domains = <&pd_isp>; + clocks = <&isp_clock CLK_ISP_FIMC_LITE0>; + clock-names = "flite"; + iommus = <&sysmmu_fimc_lite0>; + status = "disabled"; + }; + + fimc_lite_1: fimc-lite@123a0000 { + compatible = "samsung,exynos4212-fimc-lite"; + reg = <0x123A0000 0x1000>; + interrupts = ; + power-domains = <&pd_isp>; + clocks = <&isp_clock CLK_ISP_FIMC_LITE1>; + clock-names = "flite"; + iommus = <&sysmmu_fimc_lite1>; + status = "disabled"; + }; + + fimc_is: fimc-is@12000000 { + compatible = "samsung,exynos4212-fimc-is"; + reg = <0x12000000 0x260000>; + interrupts = , + ; + power-domains = <&pd_isp>; + clocks = <&isp_clock CLK_ISP_FIMC_LITE0>, + <&isp_clock CLK_ISP_FIMC_LITE1>, + <&isp_clock CLK_ISP_PPMUISPX>, + <&isp_clock CLK_ISP_PPMUISPMX>, + <&isp_clock CLK_ISP_FIMC_ISP>, + <&isp_clock CLK_ISP_FIMC_DRC>, + <&isp_clock CLK_ISP_FIMC_FD>, + <&isp_clock CLK_ISP_MCUISP>, + <&isp_clock CLK_ISP_GICISP>, + <&isp_clock CLK_ISP_MCUCTL_ISP>, + <&isp_clock CLK_ISP_PWM_ISP>, + <&isp_clock CLK_ISP_DIV_ISP0>, + <&isp_clock CLK_ISP_DIV_ISP1>, + <&isp_clock CLK_ISP_DIV_MCUISP0>, + <&isp_clock CLK_ISP_DIV_MCUISP1>, + <&clock CLK_MOUT_MPLL_USER_T>, + <&clock CLK_ACLK200>, + <&clock CLK_ACLK400_MCUISP>, + <&clock CLK_DIV_ACLK200>, + <&clock CLK_DIV_ACLK400_MCUISP>, + <&clock CLK_UART_ISP_SCLK>; + clock-names = "lite0", "lite1", "ppmuispx", + "ppmuispmx", "isp", + "drc", "fd", "mcuisp", + "gicisp", "mcuctl_isp", "pwm_isp", + "ispdiv0", "ispdiv1", "mcuispdiv0", + "mcuispdiv1", "mpll", "aclk200", + "aclk400mcuisp", "div_aclk200", + "div_aclk400mcuisp", "uart"; + iommus = <&sysmmu_fimc_isp>, <&sysmmu_fimc_drc>, + <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; + iommu-names = "isp", "drc", "fd", "mcuctl"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + pmu@10020000 { + reg = <0x10020000 0x3000>; + }; + + i2c1_isp: i2c-isp@12140000 { + compatible = "samsung,exynos4212-i2c-isp"; + reg = <0x12140000 0x100>; + clocks = <&isp_clock CLK_ISP_I2C1_ISP>; + clock-names = "i2c_isp"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; +}; + &exynos_usbphy { compatible = "samsung,exynos4x12-usb2-phy"; samsung,sysreg-phandle = <&sys_reg>;