From patchwork Thu Mar 6 16:20:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 3785631 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C6829F369 for ; Thu, 6 Mar 2014 17:33:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F35C32025B for ; Thu, 6 Mar 2014 17:33:32 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A90D920256 for ; Thu, 6 Mar 2014 17:33:31 +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 1WLb5q-0004i2-RW; Thu, 06 Mar 2014 16:24:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLb54-0005NC-A0; Thu, 06 Mar 2014 16:23:34 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLb4R-0005G9-Et for linux-arm-kernel@lists.infradead.org; Thu, 06 Mar 2014 16:22:58 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2000541W5JE380@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2014 01:22:31 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-be-5318a0c77b84 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B9.DC.29263.7C0A8135; Fri, 07 Mar 2014 01:22:31 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2000GKMW21L980@mmp1.samsung.com>; Fri, 07 Mar 2014 01:22:31 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v6 10/10] ARM: dts: exynos4: Update camera clk provider and s5k6a3 sensor node Date: Thu, 06 Mar 2014 17:20:19 +0100 Message-id: <1394122819-9582-11-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1394122819-9582-1-git-send-email-s.nawrocki@samsung.com> References: <1394122819-9582-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNLMWRmVeSWpSXmKPExsVy+t9jAd3jCySCDY6f0LG4te4cq8X8I0Ci /81CVoveBVfZLM42vWG32PT4GqtFz4atrBYzzu9jslh6/SKTReveI+wWh9+0szpwe6yZt4bR 43JfL5PHplWdbB6bl9R79G1ZxejxeZNcAFsUl01Kak5mWWqRvl0CV8au+bOYC/7xVSxvesfW wPiVu4uRk0NCwETi2bLXLBC2mMSFe+vZuhi5OIQEFjFK/JzbwwzhdDBJPPt2gwmkik3AUKL3 aB8jiC0iYC1x/MMxdpAiZoFWJonOHTfZQBLCAgkS+9+1sIPYLAKqEq+3XgdawcHBK+AmsWge B4gpIaAgMWeSDUgFJ1B038nzYJ1CAq4S99d9ZJrAyLuAkWEVo2hqQXJBcVJ6rqFecWJucWle ul5yfu4mRnAQPpPawbiyweIQowAHoxIP7wY/8WAh1sSy4srcQ4wSHMxKIryVcyWChXhTEiur Uovy44tKc1KLDzFKc7AoifMeaLUOFBJITyxJzU5NLUgtgskycXBKNTAmfmWtffcp2aNQSfRT 1L+DV815GwQ9F/4KkLvXNiuz93NcoALT/b2iKjHKyS4bbskW+7ae+3Tnhlrnold3Fu7ccOBV qsY/t6lJIQe+3DlzfD8Tx7mtXCtFp5xyDLf89+jqgef3j6zM/WgW9OGwzyn9qxfEp9Sxpia6 /3BMEpw6/WOb4NJeR75AJZbijERDLeai4kQAGmZubT4CAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140306_112255_835259_47F10ED1 X-CRM114-Status: GOOD ( 10.24 ) X-Spam-Score: -6.9 (------) Cc: mark.rutland@arm.com, linux-samsung-soc@vger.kernel.org, a.hajda@samsung.com, kyungmin.park@samsung.com, robh+dt@kernel.org, Sylwester Nawrocki , galak@codeaurora.org, kgene.kim@samsung.com, linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Remove unused /camera/clock-controller node and required clock properties to the camera node. This is required for a clock provider that will be referenced by image sensor devices. Also add required clock related changes to s5k6a3 device node and afvdd regulator supply. Signed-off-by: Sylwester Nawrocki Acked-by: Kyungmin Park --- Changes since v5: - none. Changes since v4: - added changes at the s5k6a3 device node. - clock output names adjusted to better match documentation. --- arch/arm/boot/dts/exynos4.dtsi | 6 ++---- arch/arm/boot/dts/exynos4412-trats2.dts | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 08452e1..6430a0e 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -109,12 +109,10 @@ status = "disabled"; #address-cells = <1>; #size-cells = <1>; + #clock-cells = <1>; + clock-output-names = "cam_a_clkout", "cam_b_clkout"; ranges; - clock_cam: clock-controller { - #clock-cells = <1>; - }; - fimc_0: fimc@11800000 { compatible = "samsung,exynos4210-fimc"; reg = <0x11800000 0x1000>; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 0c6afbe..d7e13a4 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -647,10 +647,11 @@ reg = <0x10>; svdda-supply = <&cam_io_reg>; svddio-supply = <&ldo19_reg>; + afvdd-supply = <&ldo19_reg>; clock-frequency = <24000000>; /* CAM_B_CLKOUT */ - clocks = <&clock_cam 1>; - clock-names = "mclk"; + clocks = <&camera 1>; + clock-names = "extclk"; samsung,camclk-out = <1>; gpios = <&gpm1 6 0>;