From patchwork Fri Nov 25 16:03:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9448093 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 CBEFF6071C for ; Fri, 25 Nov 2016 19:59:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB50327D76 for ; Fri, 25 Nov 2016 19:59:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF78527DC2; Fri, 25 Nov 2016 19:59:25 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A84FB27D76 for ; Fri, 25 Nov 2016 19:59:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 892396E3AC; Fri, 25 Nov 2016 19:59:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) by gabe.freedesktop.org (Postfix) with ESMTPS id 349ED6E3AE for ; Fri, 25 Nov 2016 16:03:22 +0000 (UTC) Received: by mail-wm0-x235.google.com with SMTP id g23so148122651wme.1 for ; Fri, 25 Nov 2016 08:03:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8ovPaFtXV9eicd7XE+Wfgm3Sy08gR/4PwWLP0g/6b9M=; b=LN6/LI0SKo60tCrWAQaRqSpbrOYHPCOpcGylcPnHUWE5JMvE/YblzuEK2ub0/d6ACA cTfF38I/a9fsebc5uLtWFLl+BzzM8zJpoLkTiLDWkew3jUlJbuPUKKOpZIxIyQBvK9E/ 081MSpKi+ZLqJ9ocTpZNuRsfp3IesqoMt4o/tkDe40D9lb9WXvYsyS05KHM8EzVO7YpR AruLHsF+77+sIV18yEzFpVQOPo1TqMNPx8+oUNsBcJzSS/w6TtJU4k+86dgekNIvEf01 VfMG61ZVVMxZ2WN8nyc/huH8AADA7x+THR26SS2K2mbF/2HT0h4xrBeHfBXepAHpyngp rWOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8ovPaFtXV9eicd7XE+Wfgm3Sy08gR/4PwWLP0g/6b9M=; b=IQE83ONG4gdRHtNGLY4a5rUsZtDx5tGuagm894lVWjX9Xk/7FmkPPOKnWmC5lCsN6H mUQky4ePyyMdahzr6BU9xeEjJVMmsxGFvy0RPrcDvM0bWFXtaEdAI5i44zcbAazbGgVH CSXYnT7aFwPe9N/MrhAvi5g5qw/oIOoY4ZWo29wEjcy8T6SmBo0LWWMT/P4XyOnjRcln 69qQoTOtMdq+Rb5MCobZnLDuskcLfRthmzVnUKndFfEGXVpPC5I3l4UbsDPdRMkKi+CL KgfHCrv8o8mDKdiTDIxvGARhk01E0jIMAmND6jX9R88Ss3mbe9mRi7XFOdvjcT0fjQRG S/gA== X-Gm-Message-State: AKaTC02o63nHc6NKOhsLpdzK4cNhMCN3mD4iaqEKjJYChgT2jOZNLr7Llw9B1XRmtaSJLgSv X-Received: by 10.28.31.23 with SMTP id f23mr8775072wmf.94.1480089800263; Fri, 25 Nov 2016 08:03:20 -0800 (PST) Received: from localhost.localdomain (home.amouriers.starnux.net. [82.228.250.61]) by smtp.gmail.com with ESMTPSA id 14sm14114807wmk.1.2016.11.25.08.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Nov 2016 08:03:19 -0800 (PST) From: Neil Armstrong To: airlied@linux.ie, khilman@baylibre.com, carlo@caione.org Subject: [RFC PATCH 2/3] ARM64: dts: meson-gx: Add Graphic Controller nodes Date: Fri, 25 Nov 2016 17:03:10 +0100 Message-Id: <1480089791-12517-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480089791-12517-1-git-send-email-narmstrong@baylibre.com> References: <1480089791-12517-1-git-send-email-narmstrong@baylibre.com> X-Mailman-Approved-At: Fri, 25 Nov 2016 19:59:18 +0000 Cc: devicetree@vger.kernel.org, Xing.Xu@amlogic.com, victor.wan@amlogic.com, Neil Armstrong , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, jerry.cao@amlogic.com, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Video Processing Unit and CVBS Output nodes, and enable CVBS on selected boards. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 46 ++++++++++++++++++++++ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 ++ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 4 ++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 ++++++ .../boot/dts/amlogic/meson-gxl-nexbox-a95x.dts | 4 ++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 ++++ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 ++ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 9 +++++ 8 files changed, 91 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index fc033c0..bcc1d1f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -153,6 +153,27 @@ }; }; + venc_cvbs: venc-cvbs { + compatible = "amlogic,meson-gx-venc-cvbs"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + enc_cvbs_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + venc_cvbs_in_vpu: endpoint@0 { + reg = <0>; + remote-endpoint = <&vpu_out_venc_cvbs>; + }; + }; + }; + }; + soc { compatible = "simple-bus"; #address-cells = <2>; @@ -356,5 +377,30 @@ status = "disabled"; }; }; + + vpu: vpu@d0100000 { + compatible = "amlogic,meson-gx-vpu"; + reg = <0x0 0xd0100000 0x0 0x100000>, + <0x0 0xc883c000 0x0 0x1000>, + <0x0 0xc8838000 0x0 0x1000>; + reg-names = "base", "hhi", "dmc"; + interrupts = ; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + vpu_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + vpu_out_venc_cvbs: endpoint@0 { + reg = <0>; + remote-endpoint = <&venc_cvbs_in_vpu>; + }; + }; + }; + }; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 9696820..a55d1cf 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -229,3 +229,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&venc_cvbs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 5e5e2de..3c09bd1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -266,3 +266,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&venc_cvbs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index ac5ad3b..99ff37c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -506,3 +506,15 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; + +&venc_cvbs { + status = "okay"; +}; + +&venc_cvbs { + compatible = "amlogic,meson-gxbb-venc-cvbs", "amlogic,meson-gx-venc-cvbs"; +}; + +&vpu { + compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts index e99101a..2a9b46f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts @@ -203,3 +203,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&venc_cvbs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 3af54dc..98b8118 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -299,3 +299,11 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; + +&venc_cvbs { + compatible = "amlogic,meson-gxl-venc-cvbs", "amlogic,meson-gx-venc-cvbs"; +}; + +&vpu { + compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index d320727..1ae2451 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -167,3 +167,7 @@ max-speed = <1000>; }; }; + +&venc_cvbs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi index c1974bb..7bf2d6e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi @@ -112,3 +112,12 @@ }; }; }; + + +&venc_cvbs { + compatible = "amlogic,meson-gxm-venc-cvbs", "amlogic,meson-gx-venc-cvbs"; +}; + +&vpu { + compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu"; +};