From patchwork Tue Nov 29 10:47:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9453325 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 256AE6071C for ; Wed, 30 Nov 2016 00:52:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18BEA283FE for ; Wed, 30 Nov 2016 00:52:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D41728404; Wed, 30 Nov 2016 00:52:06 +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 7457E283FE for ; Wed, 30 Nov 2016 00:52:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97C106E7D3; Wed, 30 Nov 2016 00:51:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x22d.google.com (mail-wj0-x22d.google.com [IPv6:2a00:1450:400c:c01::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id DBF016E08E for ; Tue, 29 Nov 2016 10:48:02 +0000 (UTC) Received: by mail-wj0-x22d.google.com with SMTP id mp19so141528378wjc.1 for ; Tue, 29 Nov 2016 02:48:02 -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=/fNCVEi8XWkEPcztklPHDxAKEB4VVGcSP0zjSL0eK2E=; b=TvwHR9SKbpvo62abajV0UbqfiovK0wY9htMtbTjCrM5oieAtgzQf95r80pAlxXlKaU c1OBo6HOwBZdrXVYw+i3cGF0qMx5789lyIcAumMxnFQ7R5fixH94d3CCHCQDwWzUKQje eQiJ61oA4V1wxUzMFZgfSjfXNgZiQX2g2SJp7BLmNVTOqHw81onocO6+aVjrBJu0OQ9/ YzesUDEaeaws4tua2YdLWkiyQD/LFQa5j9BRWjmMT9D5OJs7Nnx3O42FaBAtsIvjhsvI 9AphhgNsMvJ2r9O527aQU9E4GDL3Y05F+wcX9prz+yBfb3S/jqP0lIr59TZqqqxAH4Lp yK3w== 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=/fNCVEi8XWkEPcztklPHDxAKEB4VVGcSP0zjSL0eK2E=; b=f9/sD20Dkz56nEBS7bMcnU7T3vkIL6U7ILOb/rnbKXvkRSDzr9+uiA1wlQsRnkBRJW wy9p7eBSP4cPxbrX2Nq++Bsx8S3HERiKj+DFVdqpjuQ+C8T6ZhJ5PjmuFhteKw2LcNWi YXeqJxKiAakf5EmvvITEGuajeCOgrVMfG0QzhxO4X+93jGwv6nP83YwKAFk0fXKkl5TE jFsKe7rRMrJdcMmz/PEPGIwRB4qy2LnUpdMJOIHfN+H9JGFyVzdnKuWvseIAuFTUSw8r 18soyTREzBOHnzy4MFzJfDQS1yLiGzC1I4NAqw0YDZtdmSSHPY6l/nVxJMtJHW8d7/ok eq8w== X-Gm-Message-State: AKaTC002pda4ubkwBGMVz7Gg6Rro6deE8ni+WP9qfnjjOZNV40fl2Eq5TYj1WGNhWG/gtTop X-Received: by 10.194.60.195 with SMTP id j3mr23905295wjr.149.1480416481257; Tue, 29 Nov 2016 02:48:01 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g197sm2122521wmd.15.2016.11.29.02.48.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 02:48:00 -0800 (PST) From: Neil Armstrong To: airlied@linux.ie, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes Date: Tue, 29 Nov 2016 11:47:47 +0100 Message-Id: <1480416469-9655-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480416469-9655-1-git-send-email-narmstrong@baylibre.com> References: <1480416469-9655-1-git-send-email-narmstrong@baylibre.com> X-Mailman-Approved-At: Wed, 30 Nov 2016 00:51:36 +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, laurent.pinchart@ideasonboard.com, 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 | 8 ++++ .../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 | 8 ++++ 8 files changed, 86 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index fc033c0..644d5f6 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-cvbs"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + venc_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..1a321c8f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -506,3 +506,11 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; + +&venc_cvbs { + compatible = "amlogic,meson-gxbb-cvbs", "amlogic,meson-gx-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..b60c5ce 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-cvbs", "amlogic,meson-gx-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..fecd8c2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi @@ -112,3 +112,11 @@ }; }; }; + +&venc_cvbs { + compatible = "amlogic,meson-gxm-cvbs", "amlogic,meson-gx-cvbs"; +}; + +&vpu { + compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu"; +};