From patchwork Mon Feb 5 07:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Purski X-Patchwork-Id: 10199939 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 32A436056A for ; Mon, 5 Feb 2018 07:57:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2678723F88 for ; Mon, 5 Feb 2018 07:57:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B182251F9; Mon, 5 Feb 2018 07:57:37 +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 88A3424151 for ; Mon, 5 Feb 2018 07:57:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbeBEH5f (ORCPT ); Mon, 5 Feb 2018 02:57:35 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:35346 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752653AbeBEH5b (ORCPT ); Mon, 5 Feb 2018 02:57:31 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180205075729euoutp026fab0c00d5b9541c31425d860adb3df0~QXu3Nwooy0645406454euoutp02A; Mon, 5 Feb 2018 07:57:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180205075729euoutp026fab0c00d5b9541c31425d860adb3df0~QXu3Nwooy0645406454euoutp02A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517817449; bh=mX1igYx2p+eYy0Zt7r8Oxf9NN+DNjc/PYHMvWh7kx9g=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=OjiQsgFqW80cKAhjNOsXky11JlKQnBVth9+C0LqxE6HEfXGMKWW/Iu90cpmyGs/zk L3PgCEZJ3lg9VB2xV8/Pz7DJdxPYx4BNeR8BpqRF8mDMKm6tyYXNZf9xl1Azpogib5 qqn6CtMEUz3BsN2kRBMZXPf3801saSvL6nIf3nK8= Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075728eucas1p1f65fe6dfb49b6959c6af6e0b624bff12~QXu2W50ih1683416834eucas1p1m; Mon, 5 Feb 2018 07:57:28 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 0E.B9.12867.86E087A5; Mon, 5 Feb 2018 07:57:28 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205075728eucas1p1c8999b9b16739113d28da384bdeeb6b1~QXu1o-KP40411204112eucas1p1B; Mon, 5 Feb 2018 07:57:28 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-68-5a780e6827db Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 97.66.20118.86E087A5; Mon, 5 Feb 2018 07:57:28 +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:28 +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 3/9] ARM: dts: exynos: Use labels instead of full names in exynos4210 Date: Mon, 05 Feb 2018 08:57:02 +0100 Message-id: <1517817428-7898-4-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+NgFtrCIsWRmVeSWpSXmKPExsWy7djPc7oZfBVRBleWaFlsnLGe1WL+kXOs Fv2PXzNbnD+/gd1ixvl9TBYLXt5isVh75C67A7vHplWdbB59W1YxenzeJBfAHMVlk5Kak1mW WqRvl8CVsaZlOnvBNpWKQ2fnszYwLpbtYuTkkBAwkbje940ZwhaTuHBvPVsXIxeHkMBSRolF by8xQTifGSXuHd/HBNOx4PVXFojEMkaJ6ZMmQDn/GSUWTl8DNIuDg01AS2JNezxIg4iAqsTn tgXsIDXMAocYJT61XGIHSQgLREtcO9HOBmKzABXdXNIMtoFXwFni8t3T7BDb5CRunusEu49T wEXi4vP5YMskBBrZJP6eOc8CUeQi0bL4PSuELSzx6vgWqGYZicuTu6FqqiUuft3FBmHXSDTe 3gBVYy3xedIWsAXMAnwSk7ZNB3tAQoBXoqNNCKLEQ2LOnx1QrY4SSx/eZoR4eDqjxMHpqxkn MEovYGRYxSiSWlqcm55abKxXnJhbXJqXrpecn7uJERiXp/8d/7SD8esJq0OMAhyMSjy8FvHl UUKsiWXFlbnAEOFgVhLhdboOFOJNSaysSi3Kjy8qzUktPsQozcGiJM5rG9UWKSSQnliSmp2a WpBaBJNl4uCUamAsz1/rZchscFv+8sqd1aZ1m/oWGld/uKvAPl+NreXXa+PzrLlB667uFwvt PMV5zSrg2ASnfYvOsme1WgovWi/Qc0zDsm1BjVG8pKqdbsu1F5mb3Gs2rHzm4OGzP3vH1Aey L9UeXzq9s+BTglDdkoemuoddUr8eO+6RM/XpXbvEtA6ePcv/F4sosRRnJBpqMRcVJwIApejm u8cCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e/4Zd0MvooogwOvOS02zljPajH/yDlW i/7Hr5ktzp/fwG4x4/w+JosFL2+xWKw9cpfdgd1j06pONo++LasYPT5vkgtgjuKySUnNySxL LdK3S+DKWNMynb1gm0rFobPzWRsYF8t2MXJySAiYSCx4/ZUFwhaTuHBvPVsXIxeHkMASRokn nROhnEYmiW+7jjB1MXJwsAloSaxpjwdpEBFQlfjctoAdpIZZ4BCjxL51z9hBEsIC0RKTHl9n BLFZgIpuLmlmArF5BZwlLt89zQ6xTU7i5rlOZhCbU8BF4uLz+Swg84WAavaulp/AyLuAkWEV o0hqaXFuem6xkV5xYm5xaV66XnJ+7iZGYPhsO/Zzyw7GrnfBhxgFOBiVeHgt4sujhFgTy4or c4Fu4WBWEuF1ug4U4k1JrKxKLcqPLyrNSS0+xCjNwaIkztu7Z3WkkEB6YklqdmpqQWoRTJaJ g1OqgfHIy/KKLVFdrBrfjljHzbkrahso+FfcfY/z27SS+a1ax+XPt4rvTfwkfdE6KeRj31mx I8sjHd9tXv+49ret7/Xvr0S9nlXycuhZndq3fcqnjPhpYpM5S5lak2bt8I30ud3i9TjveH/Y rrU2GyQLZiyZlTex5s6bPyVfzG9aRZsfXXDTRr3a8aYSS3FGoqEWc1FxIgD7EKnDGwIAAA== X-CMS-MailID: 20180205075728eucas1p1c8999b9b16739113d28da384bdeeb6b1 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180205075728eucas1p1c8999b9b16739113d28da384bdeeb6b1 X-RootMTR: 20180205075728eucas1p1c8999b9b16739113d28da384bdeeb6b1 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 In order to avoid redefining camera node in exynos4* boards, define camera label in exynos4.dtsi. Move some common tmu properties to exynos4.dtsi. Camera, fimc, mixer and tmu labels has been defined in exynos4.dtsi. Use them in exynos4210 instead of full names. Signed-off-by: Maciej Purski --- arch/arm/boot/dts/exynos4.dtsi | 6 ++- arch/arm/boot/dts/exynos4210.dtsi | 98 +++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 6d59cc8..6d4775a 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -195,7 +195,7 @@ #size-cells = <0>; }; - camera { + camera: camera { compatible = "samsung,fimc", "simple-bus"; status = "disabled"; #address-cells = <1>; @@ -718,6 +718,10 @@ }; tmu: tmu@100c0000 { + interrupt-parent = <&combiner>; + reg = <0x100C0000 0x100>; + interrupts = <2 4>; + status = "disabled"; #include "exynos4412-tmu-sensor-conf.dtsi" }; diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 82c1a32..645b976 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -152,18 +152,6 @@ reg = <0x03860000 0x1000>; }; - tmu: tmu@100c0000 { - compatible = "samsung,exynos4210-tmu"; - interrupt-parent = <&combiner>; - reg = <0x100C0000 0x100>; - interrupts = <2 4>; - clocks = <&clock CLK_TMU_APBIF>; - clock-names = "tmu_apbif"; - samsung,tmu_gain = <15>; - samsung,tmu_reference_voltage = <7>; - status = "disabled"; - }; - thermal-zones { cpu_thermal: cpu-thermal { polling-delay-passive = <0>; @@ -194,45 +182,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: fimc@11800000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,cam-if; - }; - - fimc_1: fimc@11810000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,cam-if; - }; - - fimc_2: fimc@11820000 { - samsung,pix-limits = <4224 8192 1920 4224>; - samsung,mainscaler-ext; - samsung,lcd-wb; - }; - - fimc_3: fimc@11830000 { - samsung,pix-limits = <1920 8192 1366 1920>; - samsung,rotators = <0>; - samsung,mainscaler-ext; - samsung,lcd-wb; - }; - }; - - mixer: mixer@12c10000 { - clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer", - "sclk_mixer"; - clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>, - <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>, - <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>; - }; - ppmu_lcd1: ppmu_lcd1@12240000 { compatible = "samsung,exynos-ppmu"; reg = <0x12240000 0x2000>; @@ -427,6 +376,12 @@ cpu-offset = <0x8000>; }; +&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"; +}; + &combiner { samsung,combiner-nr = <16>; interrupts = , @@ -447,10 +402,43 @@ ; }; +&fimc_0 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,cam-if; +}; + +&fimc_1 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,cam-if; +}; + +&fimc_2 { + samsung,pix-limits = <4224 8192 1920 4224>; + samsung,mainscaler-ext; + samsung,lcd-wb; +}; + +&fimc_3 { + samsung,pix-limits = <1920 8192 1366 1920>; + samsung,rotators = <0>; + samsung,mainscaler-ext; + samsung,lcd-wb; +}; + &mdma1 { power-domains = <&pd_lcd0>; }; +&mixer { + clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer", + "sclk_mixer"; + clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>, + <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>, + <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>; +}; + &pmu_system_controller { clock-names = "clkout0", "clkout1", "clkout2", "clkout3", "clkout4", "clkout8", "clkout9"; @@ -468,4 +456,12 @@ power-domains = <&pd_lcd0>; }; +&tmu { + compatible = "samsung,exynos4210-tmu"; + clocks = <&clock CLK_TMU_APBIF>; + clock-names = "tmu_apbif"; + samsung,tmu_gain = <15>; + samsung,tmu_reference_voltage = <7>; +}; + #include "exynos4210-pinctrl.dtsi"