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: 10889163 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 BB7C2139A for ; Mon, 8 Apr 2019 09:32:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C827284B1 for ; Mon, 8 Apr 2019 09:32:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9099C28657; Mon, 8 Apr 2019 09:32: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=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 1DF7B284B1 for ; Mon, 8 Apr 2019 09:32:18 +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=m+uS1inOQgXlbMn4zpHGe/0K/gJoxOaA6/HADISEseA=; b=fnOoDoUJlvP2eQ zRImqZ3qOXgSt1URpy4y/HD1MFCIRyyjIGjlPsfH7St/NNQX9QhB/m5C+zwScVV1uOAXBRfoo+c8F 521KLeUZW0F5zxtEe1XF+vmx+Hh4Kd2T2ASQ8HcwOPRGxyb9itARxbFJVLXSo7A8YCvii3KL1lv39 Xbuw46M2wFkl/sIFdGCl1dYmf7QMCdB6Xde1ggkM/nMzIkYVPVPTa50o5TxFUajD8GWa1Ji+s/DPo w7rqjpGVTLUhSJ6nZhg70dbpjGEjLpKNDJO5rKeem87gTIODgfgEDJN+A14B6AFfCpXqsRjcFPfp+ ODFH5BZ/TfbdCl5oObaQ==; 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 1hDQdF-00086W-Io; Mon, 08 Apr 2019 09:32:01 +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 1hDQcx-0007o6-QF for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 09:31:48 +0000 Received: by mail-wm1-x342.google.com with SMTP id w15so13911204wmc.3 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=QHZPiIxlUezb6rGfNmJ7gnu3ni4y78tJQUDqCMU6v630cBYXeuWeA4GH9tKpqOu3Gi fG7ijZGlNxmGntGpauj9j6DPJlJqWboliPXSeVdhPi01C8Ife58gh9fHI2eCMlimw8QC Ux5R39erzx1ScWbstDHuihWiM9RcWYuy0WMc8H4yIDLMLf/d3Dqg7sWDc89H1A70KDtR gsR1C3Zq3LOwZzb9HQZHdZ+k+au76mQky2hQEDDfU/kybGfqcx4ranBR0zHqY0MDWjyk O3iTRi9HjLchOMV0CGDfk/vBagk4MkHbCr17zO64dN8EbljR2cKjgF2VFWBS55ZrzYIs d9Dw== X-Gm-Message-State: APjAAAVgk1jSScYTHDzq3K5QXvtSisTcXdF3iLYS5GSSTw4ZoAn4sr0/ t1HiaeUjVSg7i3NHXoUrMxvvjg== 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_326517_61D5F532 X-CRM114-Status: GOOD ( 13.58 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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: 10889169 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 7CC0F922 for ; Mon, 8 Apr 2019 09:32:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F6AA28657 for ; Mon, 8 Apr 2019 09:32:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52F3C2866C; Mon, 8 Apr 2019 09:32:43 +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 0B4E728657 for ; Mon, 8 Apr 2019 09:32:43 +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=gICMryIVZC6u3gXkAp01VtuAkxwlnIraBDIga3I/dgY=; b=Sf88L1fUQE6FLr aJhXbZLLUR+bmYjRyYtlRrToCxZmuxwkbC3+jvgoIYLSLExmvCRPI63u2yynzmGO6JVff6JO2F8rB Dx4TjAyLoxGGPpY4l4aRI547z9aohjx3EAWKkdHwG0WV/vDVLJFTpM+4H6lJhQUbpGMe6wmAa3kWE RUrOc+R5BTrM+HO5PX6c2gtp87WgBD29iA0PH8V0Nqm+eMr0tAMCsnmCv5N1MKvR86pfkLnM+B31i lVRpZGPejACTjiPxIhIsJOt2CgpINfg4Sf5zinKumCuCB+bfjqmoqLQJq604aF5rOldiFLuagwM5R 01V8FmvhuAEuJM/0OjMQ==; 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 1hDQds-0000Xo-Cw; Mon, 08 Apr 2019 09:32:40 +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-0007o8-7M for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 09:31:50 +0000 Received: by mail-wm1-x342.google.com with SMTP id z24so13992428wmi.5 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=Mz6cwI1XKIiWJn5KaSA4aacqzDX0bTNQkVh1lueVttWLdrxv+idDrQHUKafreAyhkp +GeZXmsc6TF43nLUTtpvAmAhraNsfXmvqMlJIQxlHrZ7yWZmceVoSsrE7BNVGXG3rlMg C7Guh+v7g0hSkGslRb/SQaF/Xqn09CeuekLueoCYepzcC0p1rcazAZBfNWGqWg7rMdyy pOtgvnvPJdJUNB8577JMERcbherpzqH0IbSxzHZS5nxjhsWl80zf0NGt6kyDjOPnj3ey AwC8hdzUjNs5yajXJfZLYE67POOQRd5z9b/7aV4BdwWRsyTSfyPYgLRzEq90J0zH6JcV wbVQ== X-Gm-Message-State: APjAAAXHE19wMZi/oCq6fWNBBt/2yS4o3sXCm0WBe8uaq+3FwZK3cmRA eeobR+fDv1gAQZVVK408mZX4OQ== 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_023146_376362_16A2A8D7 X-CRM114-Status: GOOD ( 13.02 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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: 10889167 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 88B5B922 for ; Mon, 8 Apr 2019 09:32:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BEE8284B1 for ; Mon, 8 Apr 2019 09:32:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6015E28657; Mon, 8 Apr 2019 09:32:38 +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 EF17F284B1 for ; Mon, 8 Apr 2019 09:32:37 +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=8vDa8L7JR4dDzfOjuZxYhak5NKRrfeADywInSYtQ8no=; b=lqqvWBiLzNbIGu J5dxGcxs2IMCdhsAZdc8JSfvw9E7m/FeeVGkHwJUOqqAiBZ1qCvHvZtB4+4bxgc+KaMkyUl+5lCJ5 9N1wCnjUV0Pdjr/TLC+k4X9Ait94x/pygBG3Jf87YMRCTKg1eJbPuT/r9718/zN0XLwc6dzYCa9pH vW3eF8gqMzLpBhj3wRVOdOvsRK92G3ozZU47li18RTzOjg5XkGqDjF+SdegxicJyvOCy4CancAw3c YyL6jsh2q/u/JoOKq3sRxyP/P9cL+JVN74cSnCdY20ks7F3LEzo56FKMnhj1XrhZ00SrK7saDKL3a KPPwh5PNfC6VFPfhJjLg==; 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 1hDQdh-0000JO-5J; Mon, 08 Apr 2019 09:32:29 +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-0007oE-W6 for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 09:31:50 +0000 Received: by mail-wm1-x342.google.com with SMTP id z6so14790406wmi.0 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=bGshnMKWH7eZLMpVdvBNGXm8Bbp37pXri1fvYnCdhHbxFmOG0ST5w1kzoQvSHjQlkC fsKdGFvQZG/sPj7rsJOX4VyZNx5RKJCAY3cehoaQ8gs6Y/90K4fqJJ8ccavie+C4j/bC Ld22TBmdEj0+HmK+j//2BLefgkH/RHxWgxoci0IeXmLyjKKFhdXdzEOsgIXc3+DIw8kH idd8sFIeb3pXIQCGsA0Nr2RoUBGJgah8Q2cRYICzLczGiz9LyBe9OCrwlbzUen/Lmnbs 12s6YjfSBsFkhtSg2TLIeF9v/ZNXxOba6GJTqADwDamgMQmE9Q0m6er1+Lmfw0Ah/5jv mscA== X-Gm-Message-State: APjAAAV1uYSw5NE2j8IiDegz0RSm6GvLIywbO8+rfCSfQ++2PwP5+efD 5u/993weiSkYzZvPI5JZE/XEJw== 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_379285_2B5AAE1F X-CRM114-Status: GOOD ( 13.15 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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: 10889161 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 7BF1C922 for ; Mon, 8 Apr 2019 09:32:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F7B7284B1 for ; Mon, 8 Apr 2019 09:32:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53DCC28657; Mon, 8 Apr 2019 09:32:17 +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 ED8D5284B1 for ; Mon, 8 Apr 2019 09:32:16 +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=8eimHYIl0SxUli2VhufQs1GU3OC+GeuBZRb+zJd1J/c=; b=Y2URatlD5C0DyT 9Am5zoocV+d9PoU/WJSSiLThG8vA5AZoFfQC/IDTKPbbydko9uRoR1zTvQiq201XRODD+u/DUKFvC c6z/SI+eGjKfASTDrv2jp6ln+RehVZHta+ehPHRR4CZcoHhyn8Tw0EIVUOIGG/5ApWMXIxsD/o21m BARpiGAK0Fjx3ONkhcuBm2a0iWfqvWLd4zYs9Aa7k8N0ytKGktHojzqyZcirrpMM+vqk0eS6SG82C gwVzgd6v2U5bEdjMzXpt0pXXJLR9xrt4YMfojj7u+RHbQ8vPkHr0a1/VsRM3HGiB14VVXXdiZmmqP 5ewmyDVbyRkpQCIYVdMA==; 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 1hDQdR-0008LI-7N; Mon, 08 Apr 2019 09:32:13 +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-0007oG-Op for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 09:31:49 +0000 Received: by mail-wm1-x344.google.com with SMTP id v14so13895336wmf.2 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=q5DEtP9rjtWaO1kAzbNRbYfoqA+RixEvXEfgAiix8EGqhfsenxS54omSqY1Nep/fDT LTNjdLnkMQFED+cqX1wYS8m22BFBH/lOUa9lzGRkNgztQQ037iprs3sy0KxXP+XsUPju 9FXiu0Q3dlEgKPnY5wVGqx53O8HZs2rU89DgYjvd2M7Oy4jPnXya7PYvcA3tjQCWdh9U a5X6VgMxsChOcJjFc8NLnYOsTIx/6HkgUSZZlPzTmWhl/yU+YxEAq5YnSTCjF5HXk84E vooYvjSXhkeYd4UF+d8GXSGWxQDVIjEkIAiM7RzaCteJmEOP6izS6oALb4E7ZuoM68Kr nYvA== X-Gm-Message-State: APjAAAWhwTihDh1cyRRW7mspiXJDKku5Jr/8p1pCTVTwwjnK28BFkboz 4/g9CsbDUKWroUW3w/XAjdq3jw== 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_374033_F1E1C21A X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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: 10889173 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 79912139A for ; Mon, 8 Apr 2019 09:32:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D8E228657 for ; Mon, 8 Apr 2019 09:32:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5205C2866C; Mon, 8 Apr 2019 09:32:58 +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 F406B28657 for ; Mon, 8 Apr 2019 09:32:57 +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=y29UdAw+3fQp9wjeJaVT77v/r9F4lDqWiobL7jdFdYU=; b=uraScx67diRuhV EC//u6S/0aT+XsVs+KrEaunD3J4r5QY8J7pkRPgjZb3iijl4igCKAO6xmUmw0FND70tCDT+FXT3+1 8EpTeYJxrUmlnZ3zXrTnTn7saT6dSV7lZAXcPPBCR+bsmie8XhLJqJMWmdLcqZIX4l9xSy/1rH2Zz G1RSUFwcz7paoUNJoU79YYPdhj+Eq19ERHuLBBM/t618OgZ1pGPVgR5glA9odilSptTBAYpKsuqVx pmOXvBczppHfvoN+Js+yzhP1f4Sivjh7QcnnpD4ycmYnv9xKcVM9PXQaaUCDqxg1w93lU/a7wZ6dH EKpIjKOIg6aFxEvwuQpg==; 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 1hDQe8-0000st-4c; Mon, 08 Apr 2019 09:32:56 +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 1hDQd1-0007pP-5t for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 09:31:53 +0000 Received: by mail-wm1-x342.google.com with SMTP id q16so13494930wmj.3 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=KbIUjXQ2xOe8IpdHstkEp4+57JL56VkHo41a2ICwFxHYCNG5g1zqEgEC+YLZrRR4Cy p+synVfCUVYJy6cS4yTOiu0r6vxC9PcKCOsmpZGIr21y78AFVVvNmu+ACryEsxB5OQQX +BWYr2ndaNzq+iH6llHYMADBvF6Z245tWYSUxu7OZRtS5+EJiuk4pV7yvRwR1k/PEv9e +daEWfEgM3H0P4tYFDxNTDrsOZPK8UzuYt9CdaDrG3MnBZ2GO0btZdBxBxPYckNkc3XK iY+nKSwVUSfGtGXQdPHgkyqGbEeVrgYEA0+RU4BDoBltCY/ZIKtK9BB55ty6t8ryUrCc cXOA== X-Gm-Message-State: APjAAAXIRMccNwtyxCj62nM6k6gjJvpXGBLbYRpcQ6HraUYZKBo+I0um yP7ek0vCPcAy9zCCllTJPUyr/rudAyLdjQ== 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_353719_93664984 X-CRM114-Status: GOOD ( 13.24 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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>;