From patchwork Mon Apr 8 09:31:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10889189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44B20139A for ; Mon, 8 Apr 2019 09:36:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2659C2866C for ; Mon, 8 Apr 2019 09:36:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A6C928676; Mon, 8 Apr 2019 09:36:18 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AEA2E2866C for ; Mon, 8 Apr 2019 09:36:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NGUBj4PiCCR5qKVxtIF99mVPGdtD3joQ05yGKe1rFv4=; b=W2T/gMua48JDAk fJryhNi26SKbpnXNBp7uiUAuAp923U6Dne0hBb9LWJLzD4m38xE887trAD3wnu890w2bQFw3cZnet WKhxaaJnXe9EGQaYYAMm+W43ZN6yGVFzFkoDv7oZ+TLhmDsm/NWyG3GmUorN8roeDZPmldo0REtIf BFvcF/LPi4pUT7JAYZxfz0y7pgYL1NP3ec/0Xp1+nlC4Fgv27+7kwu93CEvUvtmwcgqU+TKEHPkNL OfIG5my+FRi7pKiq8j/CmlQ8chOYbWn/mScopVU6Kr0MKTmcTs7c3/zqpcTpEjV0O3K6NGgoNVuFo Ya46ANeKyyePdQgvpt9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQhM-0002ol-LF; Mon, 08 Apr 2019 09:36:16 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQcx-0007o5-HG for linux-amlogic@lists.infradead.org; Mon, 08 Apr 2019 09:31:50 +0000 Received: by mail-wm1-x344.google.com with SMTP id z24so13992387wmi.5 for ; Mon, 08 Apr 2019 02:31:43 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=87mASUM9ygudYeEf9hAinsvtXlIr8NTEMYy6/2B799Q=; b=gF06Ia9GhqXcCc8ydP5kQwY4S68JuX8eNFLO1ZL1FkAs30UbnCNuQNqjBDt3ZiK2wO JvFVUGATFXWhkz9nBNqihVh/kRzklKk6HzqcT1nCndcj3osHgxPhJStkPrhs/YQJD4Gp /gfoDKUwHNiWsLefdneAsj05ZUovYwqwz56uVUNP0DKRCUgOYErOq2daeWhcIzq/or2S MCem0OFzAG4UP5EeUsvTn4mT3JBId6sYkyesrdXP8m6N8KNqY0FWGQAAZO2vf1xNYpfs yTfK4kuY7O6dWdanoLN8CYSEvYEW4cXcYAJbywyR4WPv3YpICwZj2jHvoE8A9IXD7BP/ xH4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=87mASUM9ygudYeEf9hAinsvtXlIr8NTEMYy6/2B799Q=; b=pWhSCkBuMfrefaR7v7qqS2rzi2gq2FORqUPqAQ5tN9hJAHWnUII1VXihMU+52HFzpD zmCPZZ3KpDx/bmaVRG0LweHghyifnGiat7mnJdLUCHA5vlFqsQy3cMndG6/AUVFX1l7A EjZdRyafFPVExRWy5VTK8/RHRxgn2WJ7GcGeK6DbF4SBl0PZ//QAp/rA00YrQp4Vo4s3 RDes2T0Rrww2jovdqRQ+IK7N9lgm51i7TWusEXprYz3oFLZXMl5NDgB7J9+tHZhS9WyW mBOtQz9QIC0YAITu0TmmsLCGTS96fQbhLjU4QlE4XrL6YX9nnUvI23XYEqGBg32dAEI9 UDLg== X-Gm-Message-State: APjAAAXVi7pbaeSsqESt7GCaYQWWBMUAgVmtXU1Nv4spdAHnQxENPruW Y721id8BneeaiHcI0Ntp2wAKRw== X-Google-Smtp-Source: APXvYqwoTSPxMuBUBF1VfymLN3vYxhA5xZ7jzQXV6UaUiGdrEw45E9DWI6L18fL2b4PcO6U+F/Q6VA== X-Received: by 2002:a1c:81cc:: with SMTP id c195mr17510418wmd.61.1554715901986; Mon, 08 Apr 2019 02:31:41 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id c10sm36777427wru.83.2019.04.08.02.31.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 02:31:41 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 1/5] arm64: dts: meson-g12a: Add VPU and HDMI related nodes Date: Mon, 8 Apr 2019 11:31:35 +0200 Message-Id: <20190408093139.27161-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408093139.27161-1-narmstrong@baylibre.com> References: <20190408093139.27161-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_023146_385507_600BB969 X-CRM114-Status: GOOD ( 12.03 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add VPU and HDMI display support. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 131 ++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 858ddd68665c..a696612f8f44 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -109,6 +109,37 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xff600000 0x0 0x200000>; + hdmi_tx: hdmi-tx@0 { + compatible = "amlogic,meson-g12a-dw-hdmi"; + reg = <0x0 0x0 0x0 0x10000>; + interrupts = ; + resets = <&reset RESET_HDMITX_CAPB3>, + <&reset RESET_HDMITX_PHY>, + <&reset RESET_HDMITX>; + reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; + clocks = <&clkc CLKID_HDMI>, + <&clkc CLKID_HTX_PCLK>, + <&clkc CLKID_VPU_INTR>; + clock-names = "isfr", "iahb", "venci"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + /* VPU VENC Input */ + hdmi_tx_venc_port: port@0 { + reg = <0>; + + hdmi_tx_in: endpoint { + remote-endpoint = <&hdmi_tx_out>; + }; + }; + + /* TMDS Output */ + hdmi_tx_tmds_port: port@1 { + reg = <1>; + }; + }; + periphs: bus@34400 { compatible = "simple-bus"; reg = <0x0 0x34400 0x0 0x400>; @@ -138,6 +169,23 @@ gpio-ranges = <&periphs_pinctrl 0 0 86>; }; + hdmitx_ddc_pins: hdmitx_ddc { + mux { + groups = "hdmitx_sda", + "hdmitx_sck"; + function = "hdmitx"; + bias-disable; + }; + }; + + hdmitx_hpd_pins: hdmitx_hpd { + mux { + groups = "hdmitx_hpd_in"; + function = "hdmitx"; + bias-disable; + }; + }; + uart_a_pins: uart-a { mux { groups = "uart_a_tx", @@ -195,6 +243,19 @@ #phy-cells = <0>; }; + dmc: bus@38000 { + compatible = "simple-bus"; + reg = <0x0 0x38000 0x0 0x400>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>; + + canvas: video-lut@48 { + compatible = "amlogic,canvas"; + reg = <0x0 0x48 0x0 0x14>; + }; + }; + usb2_phy1: phy@3a000 { compatible = "amlogic,g12a-usb2-phy"; reg = <0x0 0x3a000 0x0 0x2000>; @@ -262,6 +323,50 @@ clock-names = "xtal", "mpeg-clk"; }; + pwrc_vpu: power-controller-vpu { + compatible = "amlogic,meson-g12a-pwrc-vpu"; + #power-domain-cells = <0>; + amlogic,hhi-sysctrl = <&hhi>; + resets = <&reset RESET_VIU>, + <&reset RESET_VENC>, + <&reset RESET_VCBUS>, + <&reset RESET_BT656>, + <&reset RESET_RDMA>, + <&reset RESET_VENCI>, + <&reset RESET_VENCP>, + <&reset RESET_VDAC>, + <&reset RESET_VDI6>, + <&reset RESET_VENCL>, + <&reset RESET_VID_LOCK>; + clocks = <&clkc CLKID_VPU>, + <&clkc CLKID_VAPB>; + clock-names = "vpu", "vapb"; + /* + * VPU clocking is provided by two identical clock paths + * VPU_0 and VPU_1 muxed to a single clock by a glitch + * free mux to safely change frequency while running. + * Same for VAPB but with a final gate after the glitch free mux. + */ + assigned-clocks = <&clkc CLKID_VPU_0_SEL>, + <&clkc CLKID_VPU_0>, + <&clkc CLKID_VPU>, /* Glitch free mux */ + <&clkc CLKID_VAPB_0_SEL>, + <&clkc CLKID_VAPB_0>, + <&clkc CLKID_VAPB_SEL>; /* Glitch free mux */ + assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>, + <0>, /* Do Nothing */ + <&clkc CLKID_VPU_0>, + <&clkc CLKID_FCLK_DIV4>, + <0>, /* Do Nothing */ + <&clkc CLKID_VAPB_0>; + assigned-clock-rates = <0>, /* Do Nothing */ + <666666666>, + <0>, /* Do Nothing */ + <0>, /* Do Nothing */ + <250000000>, + <0>; /* Do Nothing */ + }; + ao_pinctrl: pinctrl@14 { compatible = "amlogic,meson-g12a-aobus-pinctrl"; #address-cells = <2>; @@ -341,6 +446,32 @@ }; }; + vpu: vpu@ff900000 { + compatible = "amlogic,meson-g12a-vpu"; + reg = <0x0 0xff900000 0x0 0x100000>, + <0x0 0xff63c000 0x0 0x1000>; + reg-names = "vpu", "hhi"; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + amlogic,canvas = <&canvas>; + power-domains = <&pwrc_vpu>; + + /* CVBS VDAC output port */ + cvbs_vdac_port: port@0 { + reg = <0>; + }; + + /* HDMI-TX output port */ + hdmi_tx_port: port@1 { + reg = <1>; + + hdmi_tx_out: endpoint { + remote-endpoint = <&hdmi_tx_in>; + }; + }; + }; + gic: interrupt-controller@ffc01000 { compatible = "arm,gic-400"; reg = <0x0 0xffc01000 0 0x1000>, From patchwork Mon Apr 8 09:31:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10889155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 436B7922 for ; Mon, 8 Apr 2019 09:31:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 262BF284B1 for ; Mon, 8 Apr 2019 09:31:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19E7F28657; Mon, 8 Apr 2019 09:31:51 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 94099284B1 for ; Mon, 8 Apr 2019 09:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rBeYio/fmatwlZhi8XX9grkKWw51XuVYgSKwI4+eCRI=; b=Yr62zZNXwB1vv9 stey28+G7kyEZZSe4Rwi2bXVxGhK8kGP6VnRZ+BS388NWECyjuQU2WoYy23CaTi05o0WFAaX8QF4s aXWFJb4iNKV7pD9wYIuhlD8zKFzfxanuYDgIEx5KDAJqtYsDguQuk9VnXP36hmlQEH2BXpgxMoiBU swCjLqMnvqgmyqB6Rx82cN0YbQtkfx3rnFon13eZlg6tD8LgZj5IeWq0Lqd5gLEHe0UmsupyHwv2C /Uu7dgIV7GdvsO8yzmXpjjF7nydX62oot15CRYtrROOn0v9EHNU9U+lftfF4U+w0uEZyA7voVggr7 verD9HS+4omHiQsET9NA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQd3-0007sH-ST; Mon, 08 Apr 2019 09:31:49 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQcy-0007o7-AF for linux-amlogic@lists.infradead.org; Mon, 08 Apr 2019 09:31:47 +0000 Received: by mail-wm1-x341.google.com with SMTP id 4so13488355wmf.1 for ; Mon, 08 Apr 2019 02:31:44 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=yuCh+SuKhECtlhXkLgX0ABjHIJEelEdglkUNy443sVE=; b=NTYweWIYmXhepqAvfuqaTi2ccgIw8ICI/bQqVj9sr+LR3VXUOQS64ZTsSLuCKgnMk5 WTG1LicN3ZYJzZetFJ9LD9LyCP+CtLMEsBoRR95VcnWV/XpMwyWzJBeQTHR/fqqd0fTP hoJQ8pghHdN/JkPPnA9mAw7yAzNFr0DD6Ff3qo4k5DCNwNEkdIwPCobCJR20WW8Fmcx2 QYW2+au0nQt7pkLof20cwmR++z7Glw/if7IXQVfDMCGRPMHNHbj6Bb430ZlQgNNpzAh0 sw8//cHjFHVRzr43EoO0B8EnItpNYkrz5t9uQhjJ7V4hxxsyh15xAlGm1ONm98DMyQGI Rdmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yuCh+SuKhECtlhXkLgX0ABjHIJEelEdglkUNy443sVE=; b=REEGZxXkZSW6YBM6PBArcN6Q24XLQxFj+V++fV8EAmcmQc8NoDw3rjLcP6VcZQIMKl uno3k4HLVyL5tibk0NUTx2lensuc8hOhQJcT1nUKR6U4Vo/wgsebryHwwcYhh3z/IukM 0gbBNfI5N8WRUtHevhJ84B878+6lUa9l49Gaw1GK+orZjHkLrxnwk96MNy21ySCo+Ric 5HGUQw4D0+PEPSYsAsTj63L8g7G5O8aa2ZfdBZS7+QWjd8emLtSUesOvp2CbPskAfgQ+ QZWEpM51VXL37dvq35xgq8xd1feJRQq5SrD89uSik1oMlc2TbIgBODe9eKUUaKQrONHb yXAg== X-Gm-Message-State: APjAAAWiAlAg0N+Nwl1I5eyrmlPheWX2Tv2IgULRNLsg2RgPtwMMUP/b 9/Lq/TWQVqtC9xbSkfjlhSw7DA== X-Google-Smtp-Source: APXvYqwwgFSHs9/3+G824dWffRmJ+HBhlvNc420O8SlQjxOOzcOcXRSSqD3ofmaagP8PnWoXvLmHKw== X-Received: by 2002:a1c:f909:: with SMTP id x9mr15941264wmh.18.1554715902802; Mon, 08 Apr 2019 02:31:42 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id c10sm36777427wru.83.2019.04.08.02.31.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 02:31:42 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 2/5] arm64: dts: meson-g12a: Add AO-CEC nodes Date: Mon, 8 Apr 2019 11:31:36 +0200 Message-Id: <20190408093139.27161-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408093139.27161-1-narmstrong@baylibre.com> References: <20190408093139.27161-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amlogic G12A embeds 2 CEC controllers : - AO-CEC-A the same controller as in GXBB, GXL & GXM SoCs - AO-CEC-B is a new controller Note, the two controller can work simultanously since 2 Pads can handle CEC, thus this SoC can handle 2 distinct CEC busses. This patch adds the nodes for the AO-CEC-A and AO-CEC-B controllers. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index a696612f8f44..9f72396ba710 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -169,6 +169,22 @@ gpio-ranges = <&periphs_pinctrl 0 0 86>; }; + cec_ao_a_h_pins: cec_ao_a_h { + mux { + groups = "cec_ao_a_h"; + function = "cec_ao_a_h"; + bias-disable; + }; + }; + + cec_ao_b_h_pins: cec_ao_b_h { + mux { + groups = "cec_ao_b_h"; + function = "cec_ao_b_h"; + bias-disable; + }; + }; + hdmitx_ddc_pins: hdmitx_ddc { mux { groups = "hdmitx_sda", @@ -405,12 +421,30 @@ }; }; + cec_AO: cec@100 { + compatible = "amlogic,meson-gx-ao-cec"; + reg = <0x0 0x00100 0x0 0x14>; + interrupts = ; + clocks = <&clkc_AO CLKID_AO_CEC>; + clock-names = "core"; + status = "disabled"; + }; + sec_AO: ao-secure@140 { compatible = "amlogic,meson-gx-ao-secure", "syscon"; reg = <0x0 0x140 0x0 0x140>; amlogic,has-chip-id; }; + cecb_AO: cec@280 { + compatible = "amlogic,meson-g12a-ao-cec"; + reg = <0x0 0x00280 0x0 0x1c>; + interrupts = ; + clocks = <&clkc_AO CLKID_AO_CTS_OSCIN>; + clock-names = "oscin"; + status = "disabled"; + }; + uart_AO: serial@3000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; From patchwork Mon Apr 8 09:31:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10889165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 42CF8139A for ; Mon, 8 Apr 2019 09:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 249F7284B1 for ; Mon, 8 Apr 2019 09:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1892328657; Mon, 8 Apr 2019 09:32:28 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BAA5C284B1 for ; Mon, 8 Apr 2019 09:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=R8/6HDbcFMs9XINpSxx5hoIg2sk/C2fyLoCJWIOvEyY=; b=B7vRWexP+Yfqtr XJx/Bjbd+So54AmQ4jMKqqQ+rRrnStcLOtXNv3nKLxDh+2deeO2O1ITsWpp0En9bWfbJM32uVKl1U 9ZFY2kDeNrmAjFxuFsMRT0DAALKlPUk9uo9Blzx1CGuV9NzcUQat0LkFNpIktUTMV5DGNXAIG7tdq 7OYg3eHoh1L4wgpGEfwL7ngHetNdA82SGD8xU7NrHXGiRL90oCZRbUuN4usBe9tME22xwahSRt/Eq MuqWJ1LUzvkH5TtwIREE4IVMI98hKx+fWWsN8UEXcyi0vS4TXNuVZmqiZfNzBc4xvC+vtDRKNBv3L s85NpfEu30FAIN9yAbNQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQdd-0000Fr-On; Mon, 08 Apr 2019 09:32:25 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQcy-0007oD-W4 for linux-amlogic@lists.infradead.org; Mon, 08 Apr 2019 09:31:50 +0000 Received: by mail-wm1-x342.google.com with SMTP id 4so13488419wmf.1 for ; Mon, 08 Apr 2019 02:31:44 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=C90Y7HygE0mkNukG/zDtJRz6NFRvz69KyUip09FFMs0=; b=JRc9RRhXAFeK6/yMJOEoo+ScnEDx9ifHzUyRxv7dljS2OoA1xHrAqOPWoAGty9tKhg bch9NbCy7zjwWdfZLjXLx7QGzGXkJs2yGI+3qezzVFCNcH//DdzRZ16nIwZYQl/U9Ia5 te1IHjdP3Sq1WqYVTQFBWJ0LvMHyT319tx4XAcb5ON/rmcdOQiMFPno+5fcadbnX2bz6 BBHVoBr+EVHsmojhrgTktOVXGk85A4RRS7xLOPfVDDMX3SQX5xtHn66vwYOfH3tDMowC ochqLgtlYecoWpI2QbHWYsBYvHUxnt4hcgBa0R6lZkfvJHuWK1VuefNRlR3Rq3G3U3Z5 7tMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C90Y7HygE0mkNukG/zDtJRz6NFRvz69KyUip09FFMs0=; b=rC6uwS4VZmCBQVe90BHlClJxoDe8pBRJu4dwjkEjJOrwwMDSKQc6m97+OAt1myovdN oesW5u6QNhGY76C4xG2pGhi0XcHtFsEutp8h4XBRHucZVTvFkNx+lCPxvFi6pZJbW8mA kUBfe4velxC3FhXRyZEwa/s1FmeV6Dk3LH61yWwunzTAK0/pmPk4lK75+gwEatGGOja3 VWYsdH3gpsxl7Q8vPLZjWasf/XR59PRAGyMSzxTx2qJY7eARNWCNXiaKIPozFoe4+TnF vk2DXMdH4TZcMxqapGuZrmxS9ZHiJsvm4L/JohwYl3BMYQI8psvs/pfqHuiX5mb7cAcj mVDA== X-Gm-Message-State: APjAAAU0lcZ6bbAYTyXWIoav/CQ0AvGPAJqUDz3eSoxIzhPhS0jDT86c WqQBjcgGlUGQCoQ8rpehnA3T8g== X-Google-Smtp-Source: APXvYqzGJm0dfH6FBRfvfvtnlLB9Y1VEibjdkqVJe52rHJ1ryuwPncpH1hHkmVUKV7XvyZS5S5fpXw== X-Received: by 2002:a1c:4187:: with SMTP id o129mr16514545wma.57.1554715903558; Mon, 08 Apr 2019 02:31:43 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id c10sm36777427wru.83.2019.04.08.02.31.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 02:31:43 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 3/5] arm64: dts: meson-g12a-x96-max: Add support for Video Display Date: Mon, 8 Apr 2019 11:31:37 +0200 Message-Id: <20190408093139.27161-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408093139.27161-1-narmstrong@baylibre.com> References: <20190408093139.27161-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_023146_390563_303B550B X-CRM114-Status: GOOD ( 11.60 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the HDMI, CVBS and CEC attributes and nodes to support full display on the X96 Max STB. AO-CEC-B is used by default and AO-CEC-A is disabled. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index b5b88262c06a..b3d913f28f12 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -24,6 +24,27 @@ reg = <0x0 0x0 0x0 0x40000000>; }; + cvbs-connector { + compatible = "composite-video-connector"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; + + hdmi-connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&hdmi_tx_tmds_out>; + }; + }; + }; + flash_1v8: regulator-flash_1v8 { compatible = "regulator-fixed"; regulator-name = "FLASH_1V8"; @@ -90,6 +111,39 @@ }; }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_h_pins>; + pinctrl-names = "default"; + status = "disabled"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; + status = "okay"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; +}; + +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; + pinctrl-names = "default"; + hdmi-supply = <&vcc_5v>; +}; + +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + &uart_A { status = "okay"; pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; From patchwork Mon Apr 8 09:31:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10889171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F41E139A for ; Mon, 8 Apr 2019 09:32:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59A3028657 for ; Mon, 8 Apr 2019 09:32:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 498802866C; Mon, 8 Apr 2019 09:32:54 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F29CC28657 for ; Mon, 8 Apr 2019 09:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0nEfy1lIGkgEz5SGTy3L5e1s+LWcwi7z1OVZUXwdmSc=; b=HZOs1L1dxtI0lu lxVD8HXiykC0opCmoQN42JFvxiaXdOYjAoDjDlZ8vCPDNwLgz2737eILZTar+LbX1KB9FtbnuBpEL QF+nNiaGaE6w5U9eCj8iqIF0adu6BTgWtNgsqzYD9zR3QwUTubLD9g04xBYI7KDh7uTBQRRyoj420 LwbWFznWYKrPikqmNNOxPDGlanPT8PpLGLvL7DxA3MhnhTgxL/2s7aFIkWtg3hybOUyeDqOXbxc25 aot0k5CUqbUGf6SIUJafm4qkeDcQ5n0WuogseukonhR/ELOrFsZVZSarw7I3SnJrPu49+jsWLyGKv L2zGg4pNb61d+x9qkQlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQe3-0000pF-Mj; Mon, 08 Apr 2019 09:32:51 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQcz-0007oF-OL for linux-amlogic@lists.infradead.org; Mon, 08 Apr 2019 09:31:50 +0000 Received: by mail-wm1-x344.google.com with SMTP id w15so13911355wmc.3 for ; Mon, 08 Apr 2019 02:31:45 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=o0OhW0PixCcZE3GgEvOYBQ3vXGDFPSSPy6kTggO+4Z8=; b=Aw66rmbDlY21uk3y7OpuNy9TIevo2FXV++FK0kZ+TLdEpfHoO9BREktAkplxeHy5WT IRXIPfYzylhya6Zp/89Uqxy/MHp0m8kSGxIZfbB2LGMr61/DMbG84LX8bslaqzVjeppi Wn1+/pEEucV2NW8+jsHWYK5AYL0IU7yfOy8qUckBSyLVG7/HhIQNO19e8JUfE56acZlO RaDPzrcnrVrhniIEJvRGNU+xNF1VBde5GRIVcZJHArLxPV3gcvpDrA/FdFbbPIdxJ/jb n8iGa1U//p7KuhMYceq9TLEK4WEht7NKSaMRiEO7Bsh/N0VUSi0EVDu82rBy3PaWeKdm X4zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o0OhW0PixCcZE3GgEvOYBQ3vXGDFPSSPy6kTggO+4Z8=; b=qDDhPdq5oMb0JfpJeu8k/iP0YoWb9DHrIMhfsrQ7/W3uKKv7Oq8xBK2/hEziGHrV1r 8QB6iJPAzeHSVeu1Kfux0nxq7GqJ6KYwose0zgnVaHoInO2N2xjgzjRUYriwVLacY5Ld hbGkilK8EH/6hBfDTNHB3v02Qq6iWKMb0ir/h8Yw/jM0doGrWg5V6FYoGk495cgpGWtU 3wZAKg/4z2KCJAobWL8eW4nSLAKzEWxdAsKt5JIR4koBlx6JCeEFlxT/Gt3/dPoM2c4b PSZPZzWg9ojYiqfNHZ7WDaDIogHvJpRkAE/XhBluXGdHbar2Qh7Grt5JNy7rEbpLqgwW c4Qw== X-Gm-Message-State: APjAAAW1tuyKz/TPXiGJIjrzqN1AV2ZhX2QcN5a8FPGFHP+dfLY4OJm0 g7RvX2gMurX3jM0lkzv30oOVDA== X-Google-Smtp-Source: APXvYqy5TFymeRw5ntPQxMe3cCfJSmX0KwOqNbF0Mqfo24DAhGH3N0rMSXJ59QYDjE/mIqKbjs779g== X-Received: by 2002:a1c:81c9:: with SMTP id c192mr16687549wmd.124.1554715904264; Mon, 08 Apr 2019 02:31:44 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id c10sm36777427wru.83.2019.04.08.02.31.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 02:31:43 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 4/5] arm64: dts: meson-g12a-sei510: Add support for Video Display Date: Mon, 8 Apr 2019 11:31:38 +0200 Message-Id: <20190408093139.27161-5-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408093139.27161-1-narmstrong@baylibre.com> References: <20190408093139.27161-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_023146_392492_2BC0B47C X-CRM114-Status: GOOD ( 11.85 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the HDMI, CVBS and CEC attributes and nodes to support full display on the SEI510 STB. AO-CEC-B is used by default and AO-CEC-A is disabled. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index c350a0165d44..34b40587e5ef 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -44,6 +44,16 @@ stdout-path = "serial0:115200n8"; }; + cvbs-connector { + compatible = "composite-video-connector"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; + dc_in: regulator-dc_in { compatible = "regulator-fixed"; regulator-name = "DC_IN"; @@ -61,6 +71,17 @@ regulator-always-on; }; + hdmi-connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&hdmi_tx_tmds_out>; + }; + }; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; @@ -103,6 +124,26 @@ }; }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_h_pins>; + pinctrl-names = "default"; + status = "disabled"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; + status = "okay"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; +}; + &saradc { status = "okay"; vref-supply = <&vddio_ao1v8>; @@ -120,6 +161,18 @@ }; }; +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; + pinctrl-names = "default"; +}; + +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>; From patchwork Mon Apr 8 09:31:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10889175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36405922 for ; Mon, 8 Apr 2019 09:33:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18B8528657 for ; Mon, 8 Apr 2019 09:33:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CF692866C; Mon, 8 Apr 2019 09:33:07 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA28A28657 for ; Mon, 8 Apr 2019 09:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OvUMV6X/+I1QdJN6cBaxB9D71EFeLlxu/TCRDOyFaJA=; b=BaITn3tynvF/jF YnrcMgJav8JwsSJCFLAeSdLJChRA7IRmqOlPwX2WLdZrDQfqrxw7tBFzHwUJ/E8Gwq9hC+WZIBJOW DYGo1IlJJf9k3kmf7yIrfpuL8FDq+Nr7x2aX9sstSbVC4+SU/BIMG1kI+qzI1RrPmtzHDGEyJZzB3 m9lM7TsSOFrydNRfKfAZTXbVI8h/asuW0/r7ZJy/OEPUPlP8zjZF4+pKbRWtU9OCqQ/3Z72nq1Gum orH67HAZ/oXZ8hQ3Bgt28zs0gfulqQ4pw/4l+sG2lQWEhRtcDDJHDOm125vWyzI6SQVWNqLpL65yZ lo9zLqClfiB3JIKDrRqw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQeG-00015W-Jm; Mon, 08 Apr 2019 09:33:04 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDQd1-0007pO-64 for linux-amlogic@lists.infradead.org; Mon, 08 Apr 2019 09:31:53 +0000 Received: by mail-wm1-x341.google.com with SMTP id z24so13992630wmi.5 for ; Mon, 08 Apr 2019 02:31:47 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=yaU7NIMcW3tdSdPQAkkny9SZP4+9jAbAzKLhaKmgEX0=; b=glJp3/n0ZKJJSx+E6CpcZmnF1wEOmEF/AfSiaJJX/UJL3jDuCqbasudOEZ/kwMD5xh 5n5wGNQ5UYmBrDrigDXiiRPba4S/mFfZMy5spi+B1gcamB/o/VPHeQ9ha0jVJbjyNPdR VA8XpiQBoO0UWZiuWoM3SxUm5l25sB3gg5U+q0ZaVJ94eg5+p1Hue3iHuIlGw4yHHUyL 06Ln/7xW6n46cst2CyV/aiGSNAdHOyGQGNPUAgPi6j0E7qwWFoAuBt3dxTFQBoF4lmP5 Wn6LlSuR32lawNNEv63XJOkShQLLmrpPRIOLYCytV6QjSxhggUKEKpZmfYFBBLu4K7lT DTzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yaU7NIMcW3tdSdPQAkkny9SZP4+9jAbAzKLhaKmgEX0=; b=UWOkmlTtCXA5sz0rZR4elIEKK0e44iQMKWyd51ZFWfMdLO/mBM25Rs9a5bKiKapw5e vS+onPJjuGRsIkmJ5z4IQoPaLukNOPDdKn+ZkCkNz6sJJYN/Q+AybUHO32NtlKcIuT+p 5EJsvh402qT1OoXPt3u+N5vVzWImfPtTrARp/CvtnSRUy/kEYMLbgCe+mkKweEGU8dYA x/YXUEU6xwib+h6Hev079Eqh2TIuF2KTgDyO1uzZQB8ufJ2lbGD9beiVtkqOn39dY6vp OjlzK6hwLbHnwRGPGqyl2N+svaJYu7teapvtMvuYSTctrHz6ANEimEU1jUzFvIt/CYL5 kAdQ== X-Gm-Message-State: APjAAAVLE6gLRzSt/tGKHr0Zao5ygzyHbNGvPug7F/ZswD68WMz0OnUK VUPobVfGybAJA5jK7/QUBB4bKQ== X-Google-Smtp-Source: APXvYqwfSOl9DE6nbVm0MkaxAsI771gH+QmlwapHjt0w1hAxbt8Pvd6trrP6zooM95Hdrymq+oy0PA== X-Received: by 2002:a7b:c5ce:: with SMTP id n14mr17542154wmk.18.1554715905695; Mon, 08 Apr 2019 02:31:45 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id c10sm36777427wru.83.2019.04.08.02.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 02:31:44 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 5/5] arm64: dts: meson-g12a-u200: Add support for Video Display Date: Mon, 8 Apr 2019 11:31:39 +0200 Message-Id: <20190408093139.27161-6-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408093139.27161-1-narmstrong@baylibre.com> References: <20190408093139.27161-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_023147_313444_EE21CB34 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the HDMI, CVBS and CEC attributes and nodes to support full display on the U200 Reference Design. AO-CEC-B is used by default and AO-CEC-A is disabled. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-u200.dts | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 2240e365af27..0e8045b8a915 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -24,6 +24,16 @@ reg = <0x0 0x0 0x0 0x40000000>; }; + cvbs-connector { + compatible = "composite-video-connector"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; + flash_1v8: regulator-flash_1v8 { compatible = "regulator-fixed"; regulator-name = "FLASH_1V8"; @@ -33,6 +43,17 @@ regulator-always-on; }; + hdmi-connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&hdmi_tx_tmds_out>; + }; + }; + }; + main_12v: regulator-main_12v { compatible = "regulator-fixed"; regulator-name = "12V"; @@ -102,6 +123,39 @@ }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_h_pins>; + pinctrl-names = "default"; + status = "disabled"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; + status = "okay"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; +}; + +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; + pinctrl-names = "default"; + hdmi-supply = <&vcc_5v>; +}; + +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>;