From patchwork Mon Feb 24 17:35:22 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: 3711231 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 4C0119F35F for ; Mon, 24 Feb 2014 17:52:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8606B200ED for ; Mon, 24 Feb 2014 17:52:36 +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 D93EF2012E for ; Mon, 24 Feb 2014 17:52:34 +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 1WHzUw-0001xJ-OQ; Mon, 24 Feb 2014 17:39: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 1WHzUH-0005Jw-IE; Mon, 24 Feb 2014 17:38:41 +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 1WHzTF-00057w-7f for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2014 17:37:39 +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 <0N1I00ALBGYDBK80@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 02:37:25 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-28-530b835425d9 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 80.14.29263.4538B035; Tue, 25 Feb 2014 02:37:25 +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 <0N1I00672GVLX120@mmp1.samsung.com>; Tue, 25 Feb 2014 02:37:24 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v5 10/10] ARM: dts: exynos4: Update camera clk provider and s5k6a3 sensor node Date: Mon, 24 Feb 2014 18:35:22 +0100 Message-id: <1393263322-28215-11-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1393263322-28215-1-git-send-email-s.nawrocki@samsung.com> References: <1393263322-28215-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFLMWRmVeSWpSXmKPExsVy+t9jAd3QZu5gg7k7WCxurTvHajH/CJDo f7OQ1aJ3wVU2i7NNb9gtNj2+xmrRs2Erq8WM8/uYLJZev8hk0br3CLvF4TftrA7cHmvmrWH0 uNzXy+SxaVUnm8fmJfUefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAlfH88SfGgnt8FU3P57I1 MD7g7mLk5JAQMJE4862NBcIWk7hwbz1bFyMXh5DAIkaJI+e7WUESQgIdTBIf59SA2GwChhK9 R/sYQWwRAWuJ4x+OsYM0MAu0Mkl07rjJBpIQFkiQuHjxM1AzBweLgKrEkadKIGFeAXeJDf2T WUDCEgIKEnMm2YCEOYHCF85tZoNY5Sbx+/9q1gmMvAsYGVYxiqYWJBcUJ6XnGuoVJ+YWl+al 6yXn525iBIfgM6kdjCsbLA4xCnAwKvHwdhRzBwuxJpYVV+YeYpTgYFYS4ZXIBwrxpiRWVqUW 5ccXleakFh9ilOZgURLnPdBqHSgkkJ5YkpqdmlqQWgSTZeLglGpg1C/44Hwhi3tSzsWXPrOn vpXt0eY12rAu0rjDePa9BYmRDzw8P6WqvLYuiNoSce4r++VpXiFfF81U7r9R4ZD573ZxX4Op WmOrz/U9nb16/D351QbnJx5dlnrYpH/Gim1VqW/nB2y/XzLbMzPg7rx2/1UnljLcNHb33x+y 7YlbcdxrnhcPX2wMV2Ipzkg01GIuKk4EACUpX4A9AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140224_123737_566325_5F6324A4 X-CRM114-Status: GOOD ( 10.38 ) X-Spam-Score: -3.8 (---) 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=-1.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 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>;