From patchwork Tue Jun 25 08:24:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Carmody X-Patchwork-Id: 2775061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C249AC0AB1 for ; Tue, 25 Jun 2013 08:25:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B66C20159 for ; Tue, 25 Jun 2013 08:25:23 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15E5420135 for ; Tue, 25 Jun 2013 08:25:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrOYu-0007vh-AR; Tue, 25 Jun 2013 08:25:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrOYr-0007Xk-Tc; Tue, 25 Jun 2013 08:25:13 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrOYn-0007X8-8s for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2013 08:25:11 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOX002XOWMLA8A0@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2013 09:24:35 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-2d-51c953c3c8ee Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id CB.DC.07878.3C359C15; Tue, 25 Jun 2013 09:24:35 +0100 (BST) Received: from ex1.seri.co.uk ([106.1.8.3]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOX007OVWOZUT40@eusync3.samsung.com>; Tue, 25 Jun 2013 09:24:35 +0100 (BST) Received: from ex1.seri.co.uk ([2002:6a01:803::6a01:803]) by ex1.seri.co.uk ([2002:6a01:803::6a01:803]) with mapi id 14.01.0218.012; Tue, 25 Jun 2013 09:24:33 +0100 From: Phil Carmody To: Sylwester Nawrocki , "kgene.kim@samsung.com" Subject: RE: [PATCH v2 6/8] ARM: dts: Add camera subsystem nodes to exynos4x12.dtsi Thread-topic: [PATCH v2 6/8] ARM: dts: Add camera subsystem nodes to exynos4x12.dtsi Thread-index: Ac5xBZ8yQx/TQESgTWOh5PnnWxwRowAdHAkD Date: Tue, 25 Jun 2013 08:24:32 +0000 Message-id: <19E27FB8C8BBCC47BD08BAF8EB69E51E0FFD8601@ex1.seri.co.uk> References: <1372097151-18122-1-git-send-email-s.nawrocki@samsung.com> <1372097151-18122-7-git-send-email-s.nawrocki@samsung.com> In-reply-to: <1372097151-18122-7-git-send-email-s.nawrocki@samsung.com> Accept-Language: en-GB, en-US Content-language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: X-Originating-IP: [106.122.1.104] MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t/xq7qHg08GGkxYr2BxYPZDVoveq88Z LXoXXGWzONv0ht1i0+NrrBYzzu9jslh75C67xe3GFWwWh9+0s1qsn/GaxYHLY/OSeo/zMxYy evRtWcXo8XmTXABLFJdNSmpOZllqkb5dAlfGhDm72Qr+O1XMnvKPvYFxkUYXIyeHhICJxI5N M9ghbDGJC/fWs3UxcnEICSxllDh2ZAkjhNPIJLHu4T4WCGcFo8TyzzdYQVrYBEwlpqz4xgRi iwgkSaz/0QzWwSzwj1ni6/lPYHOFBUIlFq+ewQJRFCZx9sgxqAYjiadf5zKC2CwCqhIPX2wF i/MKuErcWr0f6o5mRonnz3eBFXEKuEv83LyPGcRmFJCV+NK4GsxmFhCXOHb/JiPEEwISS/ac Z4awRSVePv7HCmErSiyf9YgVol5LYv3O40wQtrbEk3cXWCEWC0r8mHyPZQKj+CwkY2chaZmF pGUWkpYFjCyrGEVTS5MLipPSc430ihNzi0vz0vWS83M3MULi9+sOxqXHrA4xCnAwKvHwzow5 ESjEmlhWXJl7iFGCg1lJhDdUBCjEm5JYWZValB9fVJqTWnyIkYmDU6qBsTf4zY3pjpOTH09M tfhQ7jlrOV9MQ1l54AITtv5zHjIV+ifD3jy+yLd/Sc/CfF+d1R59V1acm3PHYlvNjMV/1mxK 9D7xPTj6x+2YsCfNO6or7TV0LL+dejkt4fT5KGAYTjkbYy3yO/3nkhWicjs73trw1kwNyTXN K/BjeMwqXvbj37/cA3+DlViKMxINtZiLihMBM0Ztor0CAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130625_042509_481851_8E79FAF6 X-CRM114-Status: UNSURE ( 5.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -8.0 (--------) Cc: "linux-samsung-soc@vger.kernel.org" , "devicetree-discuss@lists.ozlabs.org" , "t.figa@samsung.com" , "kyungmin.park@samsung.com" , "myungjoo.ham@samsung.com" , "j.anaszewski@samsung.com" , "linux-arm-kernel@lists.infradead.org" , "m.szyprowski@samsung.com" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sylwester Nawrocki wrote: Add common camera node and Exynos4212/4412 specific nodes for FIMC, MIPI-CSIS, FIMC-LITE and FIMC-IS devices. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- arch/arm/boot/dts/exynos4x12.dtsi | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) + ranges; + status = "disabled"; + + pmu { + reg = <0x10020000 0x3000>; + }; + + i2c1_isp: i2c-isp@12140000 { + compatible = "samsung,exynos4212-i2c-isp"; + reg = <0x12130000 0x100>; Typo 1214000 vs. 12130000? + clocks = <&clock 370>; + clock-names = "i2c_isp"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + }; }; Cheers, Phil -- 1.7.9.5 diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 0e24d85..f8cc1d0 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -26,6 +26,8 @@ pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; pinctrl3 = &pinctrl_3; + fimc-lite0 = &fimc_lite_0; + fimc-lite1 = &fimc_lite_1; }; pd_isp: isp-power-domain@10023CA0 { @@ -78,4 +80,120 @@ clock-names = "sclk_fimg2d", "fimg2d"; status = "disabled"; }; + + camera { + clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>, + <&clock 388>, <&clock 389>, <&clock 17>; + clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", + "pxl_async1", "mux_cam0", "mux_cam1", "parent"; + + fimc_0: fimc@11800000 { + compatible = "samsung,exynos4212-fimc"; + clocks = <&clock 256>, <&clock 128>, <&clock 384>, <&clock 17>; + clock-names = "fimc", "sclk_fimc", "mux", "parent"; + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,isp-wb; + samsung,cam-if; + }; + + fimc_1: fimc@11810000 { + compatible = "samsung,exynos4212-fimc"; + clocks = <&clock 257>, <&clock 129>, <&clock 385>, <&clock 17>; + clock-names = "fimc", "sclk_fimc", "mux", "parent"; + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,isp-wb; + samsung,cam-if; + }; + + fimc_2: fimc@11820000 { + compatible = "samsung,exynos4212-fimc"; + clocks = <&clock 258>, <&clock 130>, <&clock 386>, <&clock 17>; + clock-names = "fimc", "sclk_fimc", "mux", "parent"; + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,isp-wb; + samsung,lcd-wb; + samsung,cam-if; + }; + + fimc_3: fimc@11830000 { + compatible = "samsung,exynos4212-fimc"; + clocks = <&clock 259>, <&clock 131>, <&clock 387>, <&clock 17>; + clock-names = "fimc", "sclk_fimc", "mux", "parent"; + samsung,pix-limits = <1920 8192 1366 1920>; + samsung,rotators = <0>; + samsung,mainscaler-ext; + samsung,isp-wb; + samsung,lcd-wb; + }; + + csis_0: csis@11880000 { + clocks = <&clock 260>, <&clock 134>, <&clock 390>, <&clock 17>; + clock-names = "csis", "sclk_csis", "mux", "parent"; + }; + + csis_1: csis@11890000 { + clocks = <&clock 261>, <&clock 135>, <&clock 391>, <&clock 17>; + clock-names = "csis", "sclk_csis", "mux", "parent"; + }; + + fimc_lite_0: fimc-lite@12390000 { + compatible = "samsung,exynos4212-fimc-lite"; + reg = <0x12390000 0x1000>; + interrupts = <0 105 0>; + samsung,power-domain = <&pd_isp>; + clocks = <&clock 353>; + clock-names = "flite"; + status = "disabled"; + }; + + fimc_lite_1: fimc-lite@123A0000 { + compatible = "samsung,exynos4212-fimc-lite"; + reg = <0x123A0000 0x1000>; + interrupts = <0 106 0>; + samsung,power-domain = <&pd_isp>; + clocks = <&clock 354>; + clock-names = "flite"; + status = "disabled"; + }; + + fimc_is: fimc-is@12000000 { + compatible = "samsung,exynos4212-fimc-is", "simple-bus"; + reg = <0x12000000 0x260000>; + interrupts = <0 90 0>, <0 95 0>; + samsung,power-domain = <&pd_isp>; + clocks = <&clock 353>, <&clock 354>, <&clock 355>, + <&clock 356>, <&clock 17>, <&clock 357>, + <&clock 358>, <&clock 359>, <&clock 360>, + <&clock 450>,<&clock 451>, <&clock 452>, + <&clock 453>, <&clock 176>, <&clock 13>, + <&clock 454>, <&clock 395>, <&clock 455>; + clock-names = "lite0", "lite1", "ppmuispx", + "ppmuispmx", "mpll", "isp", I notice a tiny typo in the documentation --- a/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt +++ b/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt @@ -15,7 +15,7 @@ Required properties: - interrupts : must contain two FIMC-IS interrupts, in order: ISP0, ISP1; - clocks : list of clock specifiers, corresponding to entries in clock-names property; -- clock-names : must contain "ppmuispx", "ppmuispx", "lite0", "lite1" +- clock-names : must contain "ppmuispx", "ppmuispmx", "lite0", "lite1" "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "uart", "ispdiv0", "ispdiv1", "mcuispdiv0", "mcuispdiv1", "aclk200", "div_aclk200", "aclk400mcuisp", "div_aclk400mcuisp" entries, + "drc", "fd", "mcuisp", + "ispdiv0", "ispdiv1", "mcuispdiv0", + "mcuispdiv1", "uart", "aclk200", + "div_aclk200", "aclk400mcuisp", + "div_aclk400mcuisp"; "sysreg" is missing from that list, but is listed as required in the documentation. + #address-cells = <1>; + #size-cells = <1>;