From patchwork Mon Nov 27 12:37:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 10076759 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 19617602BC for ; Mon, 27 Nov 2017 12:37:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06B3628D6F for ; Mon, 27 Nov 2017 12:37:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF17F28D96; Mon, 27 Nov 2017 12:37:27 +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 060B428D6F for ; Mon, 27 Nov 2017 12:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbdK0Mh0 (ORCPT ); Mon, 27 Nov 2017 07:37:26 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:51661 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbdK0MhZ (ORCPT ); Mon, 27 Nov 2017 07:37:25 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171127123723euoutp01f601ae9d65085c2bad56d9379bd50982~68ZQzmZKS1560615606euoutp01k; Mon, 27 Nov 2017 12:37:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20171127123723euoutp01f601ae9d65085c2bad56d9379bd50982~68ZQzmZKS1560615606euoutp01k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1511786243; bh=q9tFib0/RizUSKz3Pl7irhXDj/1usWtq0w9uHuuTlMQ=; h=From:To:Cc:Subject:Date:References:From; b=JvI6I1/kz4O4HzTKPgqi7QdjgWRJdW/bd9UtRaWccJieLFI+rimLwkWP+Zj5tKp/s liRzgNKzh0KfcGlI6I2JRt9E5LlCiHC9Zsj3K395Ygre2PL19Xy+rYJpMO4sxhz3ND /vHtkWfe4PfatJAgia6P4MEzqy0VeY/cze/eJkTI= Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171127123723eucas1p22b2a15acece24dd208ccacb39a366785~68ZQG-mBY2318023180eucas1p2P; Mon, 27 Nov 2017 12:37:23 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 83.1B.12576.2070C1A5; Mon, 27 Nov 2017 12:37:22 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd~68ZPQVe9C2318023180eucas1p2N; Mon, 27 Nov 2017 12:37:22 +0000 (GMT) X-AuditID: cbfec7ef-f79ee6d000003120-b8-5a1c07022b45 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 7C.10.20118.2070C1A5; Mon, 27 Nov 2017 12:37:22 +0000 (GMT) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset="UTF-8" Received: from localhost ([106.116.147.110]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P0200HTZTQ95N70@eusync3.samsung.com>; Mon, 27 Nov 2017 12:37:22 +0000 (GMT) From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= To: krzk@kernel.org, linux-samsung-soc@vger.kernel.org Cc: =?UTF-8?q?=C5=81ukasz=20Stelmach?= , m.szyprowski@samsung.com, b.zolnierkie@samsung.com Subject: [PATCH v2] ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5 Date: Mon, 27 Nov 2017 13:37:11 +0100 Message-id: <20171127123711.12081-1-l.stelmach@samsung.com> X-Mailer: git-send-email 2.11.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djPc7pM7DJRBt0fdS02zljPanH+/AZ2 i5uHVjBazDi/j8li7ZG77A6sHptWdbJ59G1ZxejxeZNcAHMUl01Kak5mWWqRvl0CV8bzW48Z CzYIVjRtPcjSwDiZr4uRk0NCwERi/uFvjBC2mMSFe+vZuhi5OIQEljFKXD+zmx3C+cwocWzv TyCHA6zj4fVYuKK5/7uYQLp5BQQlfky+xwJSwywgL3HkUjZImFlAU2Lr7vVQc74wSqycf5IF JMEm4CjRv/QEK4gtImAmse7QdzaIhlKJs/NuM4PYwgKxEk+/PwOzWQRUJea9ewa1y1riy4mt LBBXy0vsarsINodfQEtiTdN1qPgMNomG+/4QtotEx+5uZghbWOLV8S3sELaMxOXJ3Swgx0kI 9DNKHJ7/HSoxhVFi8UIHCNta4s+qiVDH8UlM2jadGRIQvBIdbUIQJR4SP55PgYaio8TnAw/A 7hECuv/Ynf8sExjlZiEF0SxEEM1CCqIFjMyrGEVSS4tz01OLDfWKE3OLS/PS9ZLzczcxAlPB 6X/H3+9gfNoccohRgINRiYdXwUc6Sog1say4MvcQowQHs5IIr+xDoBBvSmJlVWpRfnxRaU5q 8SFGaQ4WJXFe26i2SCGB9MSS1OzU1ILUIpgsEwenVAOj8a7Xrr6TImPEdSRcre9bBBkt32L9 gPFjAvfDpINfvMTt3rZn/XwqK/1QKOeDitv2Rbabteczarx5suRjZrbSujVNR2pymxOWfOe5 Nyns0vEvYpyGrZK7m4Jk09z26XXc0udnXLvU5pkFc2Dj179POIqP1Gx+7KnXozP7267weZ7l rYY3WW4psRRnJBpqMRcVJwIAobXMrgEDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOLMWRmVeSWpSXmKPExsVy+t/xq7pM7DJRBhuOslhsnLGe1eL8+Q3s FjcPrWC0mHF+H5PF2iN32R1YPTat6mTz6NuyitHj8ya5AOYoLpuU1JzMstQifbsErozntx4z FmwQrGjaepClgXEyXxcjB4eEgInEw+uxXYycQKaYxIV769lAbCGBJYwS248Hgdi8AoISPybf YwEpZxaQlzhyKRskzCygLjFp3iLmLkYuoPJvjBIzTk1hBEmwCThK9C89wQpiiwiYSaw79J0N oqFUon/mCzBbWCBWYsJuCJtFQFVi3rtnTBC7rCW+nNjKAnGPvMSutotgc/gFtCTWNF1nmcDI PwvJSbMQTpqF5KQFjMyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAoNz27GfW3Ywdr0LPsQo wMGoxMOr4CMdJcSaWFZcmXuIUYKDWUmEV/YhUIg3JbGyKrUoP76oNCe1+BCjNAeLkjhv757V kUIC6YklqdmpqQWpRTBZJg5OqQZGM7V10z/MeeT9x6a/Wfntd6GI9Y6yc9nPfLky/XqDw97L Pq2vttZPs1vw1Ge9vey29RJh748+fqqrcVLeUGmCYYJ23+5knRCti6vET9zgW220YkPyRcPH 7AyRT0/Pm8A+7eVjxrdiB9UenZVRS157NmKro8iVy3aaz80mRVdfStlvNU94vdWcCUosxRmJ hlrMRcWJAK2nLj9KAgAA X-CMS-MailID: 20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd X-RootMTR: 20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd References: 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 Move Security Subsystem nodes common for Exynos 5250 and Exynos 54xx to exynos5.dtsi to avoid duplication. Signed-off-by: Łukasz Stelmach --- arch/arm/boot/dts/exynos5.dtsi | 6 ++++++ arch/arm/boot/dts/exynos5250.dtsi | 13 +++++-------- arch/arm/boot/dts/exynos54xx.dtsi | 6 ------ 3 files changed, 11 insertions(+), 14 deletions(-) Changes in v2: - Rephrased commit message diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 66d22521c976..7da4a4285b24 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -204,5 +204,11 @@ #size-cells = <0>; status = "disabled"; }; + + sss: sss@10830000 { + compatible = "samsung,exynos4210-secss"; + reg = <0x10830000 0x300>; + interrupts = ; + }; }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 8dbeb873e99c..8032d7e567fc 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -731,14 +731,6 @@ status = "disabled"; }; - sss@10830000 { - compatible = "samsung,exynos4210-secss"; - reg = <0x10830000 0x300>; - interrupts = ; - clocks = <&clock CLK_SSS>; - clock-names = "secss"; - }; - sysmmu_g2d: sysmmu@10A60000 { compatible = "samsung,exynos-sysmmu"; reg = <0x10A60000 0x1000>; @@ -1084,4 +1076,9 @@ dma-names = "rx", "tx"; }; +&sss { + clocks = <&clock CLK_SSS>; + clock-names = "secss"; +}; + #include "exynos5250-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi index 0389e8a10d0b..d0124f45b66a 100644 --- a/arch/arm/boot/dts/exynos54xx.dtsi +++ b/arch/arm/boot/dts/exynos54xx.dtsi @@ -79,12 +79,6 @@ interrupts = ; }; - sss: sss@10830000 { - compatible = "samsung,exynos4210-secss"; - reg = <0x10830000 0x300>; - interrupts = ; - }; - /* i2c_0-3 are defined in exynos5.dtsi */ hsi2c_4: i2c@12ca0000 { compatible = "samsung,exynos5250-hsi2c";