From patchwork Fri Apr 11 14:25:48 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: 3968661 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 CF24F9F336 for ; Fri, 11 Apr 2014 14:26:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15A16207FE for ; Fri, 11 Apr 2014 14:26:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25EF7207F3 for ; Fri, 11 Apr 2014 14:26:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756102AbaDKO0s (ORCPT ); Fri, 11 Apr 2014 10:26:48 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:10972 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755528AbaDKO0r (ORCPT ); Fri, 11 Apr 2014 10:26:47 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3V006EJESMGT10@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 11 Apr 2014 23:26:46 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-8b-5347fba68b0f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 17.B4.29263.6ABF7435; Fri, 11 Apr 2014 23:26:46 +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 <0N3V00KJKER47K70@mmp1.samsung.com>; Fri, 11 Apr 2014 23:26:46 +0900 (KST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sylwester Nawrocki Subject: [PATCH] ARM: dts: exynos4: Update camera nodes for Trats2 board Date: Fri, 11 Apr 2014 16:25:48 +0200 Message-id: <1397226348-29907-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAJMWRmVeSWpSXmKPExsVy+t9jAd1lv92DDabfVbLoXXCVzWLT42us FjPO72OyOPymndWBxWPzknqPvi2rGD0+b5ILYI7isklJzcksSy3St0vgyji94Rx7wV3eiu97 7rA1MP7m6mLk5JAQMJHY2TaNGcIWk7hwbz1bFyMXh5DAIkaJBT3bGSGcDiaJrROvMYFUsQkY SvQe7WMEsUUEJCWaGv4AdXNwMAtUSTQ/UQUJCwt4SMxYsRFsKIuAqsTWlq1gNq+Am8TBS2fZ QcolBBQk5kyymcDIvYCRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGsL+fSe1gXNlgcYhR gINRiYc344JbsBBrYllxZe4hRgkOZiUR3k1X3YOFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8x5o tQ4UEkhPLEnNTk0tSC2CyTJxcEo1MC6pEg9sMP95V1pnm0e8clLvjF18TLek+FavfRdVk66y gPkyb4mexmeDcPGen1Ev02eXHWa5d8hI7o+b/fOv4f0PKhv0wo+evHt9Sg6LOK/c1DdHuY9v apzOZ3PNZG3txCXWNm957qY4t/YobGmx6pKRmyd/a98J9Ts5Ubuy1GXPzTMR3S5prMRSnJFo qMVcVJwIAM6RsWrzAQAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 add 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 --- 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 2f8bcd0..b443690 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -129,12 +129,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 9583563d..a55961a 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>;