From patchwork Wed Nov 29 11:42:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 119966 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2940115qgn; Wed, 29 Nov 2017 03:42:56 -0800 (PST) X-Google-Smtp-Source: AGs4zMZd8Mcwuer8R9wiqZD6Y6ctX5ddHmuACgg1bcqHoCjZStC1olRrrcLLjsBS2K3t+BaF87E5 X-Received: by 10.98.208.67 with SMTP id p64mr2681932pfg.111.1511955776324; Wed, 29 Nov 2017 03:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511955776; cv=none; d=google.com; s=arc-20160816; b=GswAPhJfzmaxrKdRQapa6piHL7L0DkqxfBEcVIXr+OblNQGKTg4EKYJgOygzcCcSIN K5EgzSU+bnIakYeuIVgwZTJv7NToKeUtpkUaM3ebMeExA2NkD5oPBaltvooyTYASypMx ec00lnzJWy7YWdZkhDqZqLW3gxDAIl5AAcOScyNBjvFh+u8r/OKfFh2Msa/Lc+4GbxGd XuzCb2XS6zIT3KFOc4Wkd21VZlAEdWazFJEtyxE4gkSClc+kwcTnjAfolB+1BHwmHjIr PAcLZjJ0+IoVm3ujmZyPCwB4lgI1pLmqUT8vAExVDzbVHQ9k3JYX6J0Um9tzMV5LfGZ/ lY9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=93Zrg6QUn+CfI9fm/bLSRSKQBIZjnBeEUp/Pr8GE3c0=; b=hP3/EUN25fPqXVpvYBNbhZmEsIRlrnXuuYdXhJgQf9OlGY0EUKU/k/TlOg/M+DJthP PK6sHonD/fNhEMC/UnnY+onVhUDKqYI89dvCwGZCtdLfDe3mfDNxfz2LYDRuC4l1MR/p fKahfMgu4D4sHjPL5v6GfUur7yO57p1YVASD4QHrqI+h8xLy+J2kuJj4CC/ytbTJkSmK TBra03dcR3RkeKbwj4oA6AN8pAKADQdCz4t4nZ0MHow8WjNpyt+9s9OLhNQonyNxz8Yu lAuzUNfo5k7vMpbkLNQ0wkRLW+xqSwME9hBMozWpL21rh5JUPE0og0v2rVWgMDbSrx93 2HwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mmAIetbO; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o1si1163483pld.226.2017.11.29.03.42.56; Wed, 29 Nov 2017 03:42:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mmAIetbO; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275AbdK2Lmz (ORCPT + 3 others); Wed, 29 Nov 2017 06:42:55 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:41337 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751496AbdK2Lmy (ORCPT ); Wed, 29 Nov 2017 06:42:54 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171129114252euoutp0177dd7c026173b3ce5c66580c1e710daa~7i8OuKucy0351103511euoutp01c; Wed, 29 Nov 2017 11:42:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20171129114252euoutp0177dd7c026173b3ce5c66580c1e710daa~7i8OuKucy0351103511euoutp01c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1511955772; bh=JODYj00NXLhiqgm8rJILJW3alSQxluj4lMkharUfhVk=; h=From:To:Cc:Subject:Date:References:From; b=mmAIetbO7Tk430Pnh3p+3NQwPzVAh+SbZlFdgz2/eXqimwxf7LABojXXaLlTTsPgn TTAgatXScb/gn7KlbHO8UQR8BgpXn361taMRexAg0gAMew1jdx0AX5pjkOq1bEkW0T csJwQTnO4vNv5/x10+NQMQN2Be/9HDczgGYwUc/o= Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171129114251eucas1p1e07dff09a43e35403b5887f1099ad9c5~7i8N4SEmv1273712737eucas1p1h; Wed, 29 Nov 2017 11:42:51 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 35.74.12867.B3D9E1A5; Wed, 29 Nov 2017 11:42:51 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171129114250eucas1p17b5a0213e7a486c85f72ef7a5d39f0d5~7i8M7p4Pe1440814408eucas1p1R; Wed, 29 Nov 2017 11:42:50 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-a3-5a1e9d3b2f57 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DF.C3.20118.A3D9E1A5; Wed, 29 Nov 2017 11:42:50 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P06006MKGJ7AM80@eusync4.samsung.com>; Wed, 29 Nov 2017 11:42:50 +0000 (GMT) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Tobias Jakobi Subject: [PATCH RESEND] ARM: dts: exynos: Move G2D node to exynos5.dtsi Date: Wed, 29 Nov 2017 12:42:34 +0100 Message-id: <20171129114234.16132-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.15.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRmVeSWpSXmKPExsWy7djPc7rWc+WiDJ7uYLPYOGM9q8X58xvY LWac38dksfbIXXaLttUfWB1YPTat6mTz+HeM3aNvyypGj8+b5AJYorhsUlJzMstSi/TtErgy rq04zlzQLVpxY/pX9gbG+YJdjJwcEgImEq8OzmSEsMUkLtxbzwZiCwksZZTYvzGui5ELyP7M KNG56Ac7TMPpm7vYIRLLGCXWHVvMDOE0MEm82LUIbBSbgKFE19susFEiAqoSn9sWgHUzC+xn lHh9TAnEFhZwlzjV8ZgVxGYBqvl/YQKQzcHBK2Ar8XGNKMQyeYnF33eyQdh3WSX2rYwAKZEQ cJHoXq8PERaWeHV8C9RtMhKXJ3ezQNj9jBJNrdoQ9gxGiXNveSFsa4nDxy+yQlzDJzFp23Rm iJG8Eh1tQhAlHhLH9p+G2uoo8fnLOyZImMRKzH+8gWUCo9QCRoZVjCKppcW56anFxnrFibnF pXnpesn5uZsYgZF2+t/xTzsYv56wOsQowMGoxMN7YYVslBBrYllxZe4hRgkOZiUR3g1eclFC vCmJlVWpRfnxRaU5qcWHGKU5WJTEeW2j2iKFBNITS1KzU1MLUotgskwcnFINjEFG/YotKYF3 d13ma9ks7CFQmHr1G09o1XnLo+cWcPNene4lMkEwerlX9Wef9hkfjW6zVKjxftbOCF/6KWWV PZdH2yrOvXPuHy/J9H90XZ8zUGPyN7Hj/uIH68+XS7VOvOdRzjnRNfnn8wWHmW99FXsk6lyh uy93NuPqKVMWLPnTLixgeYtVR4mlOCPRUIu5qDgRACQM+zCwAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNJMWRmVeSWpSXmKPExsVy+t/xa7pWc+WiDH7OUrDYOGM9q8X58xvY LWac38dksfbIXXaLttUfWB1YPTat6mTz+HeM3aNvyypGj8+b5AJYorhsUlJzMstSi/TtErgy rq04zlzQLVpxY/pX9gbG+YJdjJwcEgImEqdv7mKHsMUkLtxbz9bFyMUhJLCEUeLbkkPMEE4T k8TZYxPZQKrYBAwlut52gdkiAqoSn9sWsIMUMQscZJRo2PwDbJSwgLvEqY7HrCA2C1DR/wsT gGwODl4BW4mPa0QhtslLLP6+k20CI/cCRoZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgUGw 7djPLTsYu94FH2IU4GBU4uG9sEI2Sog1say4MvcQowQHs5II7wYvuSgh3pTEyqrUovz4otKc 1OJDjNIcLErivL17VkcKCaQnlqRmp6YWpBbBZJk4OKUaGPnvvzvovHrypgcpi6Z2e12/I50t YC5opp0ZJvZZ3Jb/AONPg5t22rEbnZPUvwnvVtPWvlHaZ6WmoH60iuPPBb6v6cn2bpfn/d9+ 8Fac73dT0dIw1/4Xmz8uXHkhdLdZauq6j0q/DOcu/3CtqOBB8FSj7wdXuc3w8r1c8WV5ygyt ngKlMoVnRkosxRmJhlrMRcWJANwvtm7+AQAA X-CMS-MailID: 20171129114250eucas1p17b5a0213e7a486c85f72ef7a5d39f0d5 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20171129114250eucas1p17b5a0213e7a486c85f72ef7a5d39f0d5 X-RootMTR: 20171129114250eucas1p17b5a0213e7a486c85f72ef7a5d39f0d5 References: Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Tobias Jakobi Current the node is only defined in the exynos5250 DT, while the corresponding SYSMMUs are also to be found in the exynos5420 DT. Move the node to exynos5 and only setup the SYSMMUs in the corresponding DT. Disable the node by default, since exynos5410 also includes the dtsi, but currently does not define the G2D clock. Tested-by: Marek Szyprowski Signed-off-by: Tobias Jakobi [mszyprow: rephrased commit message] Signed-off-by: Marek Szyprowski --- resend on Krzysztof's request --- arch/arm/boot/dts/exynos5.dtsi | 7 +++++++ arch/arm/boot/dts/exynos5250.dtsi | 16 +++++++--------- arch/arm/boot/dts/exynos5420.dtsi | 7 +++++++ 3 files changed, 21 insertions(+), 9 deletions(-) -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 66d22521c976..f3fec03a7595 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -204,5 +204,12 @@ #size-cells = <0>; status = "disabled"; }; + + g2d: g2d@10850000 { + compatible = "samsung,exynos5250-g2d"; + reg = <0x10850000 0x1000>; + interrupts = ; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 5286084e1032..b6a8a2ef499a 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -245,15 +245,6 @@ samsung,syscon-phandle = <&pmu_system_controller>; }; - g2d@10850000 { - compatible = "samsung,exynos5250-g2d"; - reg = <0x10850000 0x1000>; - interrupts = ; - clocks = <&clock CLK_G2D>; - clock-names = "fimg2d"; - iommus = <&sysmmu_g2d>; - }; - mfc: codec@11000000 { compatible = "samsung,mfc-v6"; reg = <0x11000000 0x10000>; @@ -1024,6 +1015,13 @@ iommus = <&sysmmu_fimd1>; }; +&g2d { + iommus = <&sysmmu_g2d>; + clocks = <&clock CLK_G2D>; + clock-names = "fimg2d"; + status = "okay"; +}; + &i2c_0 { clocks = <&clock CLK_I2C0>; clock-names = "i2c"; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 8aa2cc7aa125..81447fffcc94 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -1349,6 +1349,13 @@ iommu-names = "m0", "m1"; }; +&g2d { + iommus = <&sysmmu_g2dr>, <&sysmmu_g2dw>; + clocks = <&clock CLK_G2D>; + clock-names = "fimg2d"; + status = "okay"; +}; + &i2c_0 { clocks = <&clock CLK_I2C0>; clock-names = "i2c";