From patchwork Mon Mar 25 14:59:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10869485 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 44743139A for ; Mon, 25 Mar 2019 14:59:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CF0428DC6 for ; Mon, 25 Mar 2019 14:59:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20D9C28DED; Mon, 25 Mar 2019 14:59:34 +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 6203328DF1 for ; Mon, 25 Mar 2019 14:59:33 +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=VmzWVtK1dOydnk5Evs6ZFDN+tRZgfUzagZJxRXFClng=; b=tJCslQkJmmhpsv FMmv/UYLLpjyS5HHg7jpU1ITe3vONGCXiVTBAGsgd1bo0d29NHhYMbTiMdSgCS0FoV9025OSB7gQ0 IHM/7REW6Ni0pAyXliwj9IG+hmE56vnzc58DTuCfGDjXI1YaqJ2EKwfzMjBGQb2Xn4YzBlYXkuAGz a9hT4cypIhixExhOqMmDjmkQygBiliNON6uM22UbU8CJ94Gmiw2z0IGFRva7FORKTBuzWCbNy3rPh eqSoxRTWd4+zWl9ma/KXMWfgbVnaSIfH8ZBg5g7m6ZbUIH6ZSN9SbWSuMo2plSXDj4/nWJqWLp54U /UWbfget/e3E0lOAtThg==; 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 1h8R4W-00062H-EO; Mon, 25 Mar 2019 14:59:32 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8R4K-0005ri-Gb for linux-amlogic@lists.infradead.org; Mon, 25 Mar 2019 14:59:26 +0000 Received: by mail-wm1-x343.google.com with SMTP id y197so9472133wmd.0 for ; Mon, 25 Mar 2019 07:59:20 -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=+rJnw6/sLHLZof/jwuQ07YQV1SUtaCLQpNMQKKSMv3Q=; b=iaDRYruCuNTMOcQdfqL3S0Jz+ip20OJQX4W0O828+b5XA1e4x3NW4yzTDaarMh4v9E 8py6NFinhYXYWD4DK1r6e+cZjeXmXfXF9bZACMEL//O5zD60g6yPUa3R7+xNoXBU1RTx flhJvx1mIl4IHam5TnOHZEGZXe+rbFi4OEUBzG1g+96WKQZVDUNaUC1/KMY+BBqp3hRP F9aB/H/tRNZmQxpOzhYOgzRlP5wgzj7tzg8kYLbHDZC0KdwZK6MtUBeR8SDQ3q67qbRm PhMP3DydDsdilgmbdGvijILO62dBtPuvrlWRdMC2EW4Z32O0k+Yd1lUhg98qKwQpENjY 2JqA== 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=+rJnw6/sLHLZof/jwuQ07YQV1SUtaCLQpNMQKKSMv3Q=; b=BPHVJV+93s0LTxAJQyFg9l7xQjrN8jw3A9SS1zgiLSUf2tjNXfFKJlTMm1ZXy5/eZm U6no6LLWaNPEmxnpNsH+GO8/Du59y4JyIJhbfEWLm1/fdCYfiJfoOIptyS8pc8kH7Sl5 CvD0HZa2GD5mYlQpE4JJA3TXcUMeQ8COaca4tL8Si6Cgzn6NUGP7U6A4PKOybJ/Eesmc fVA0ltUPn9HsrVnIz0Ui7ALwkc9ZbgOwIdthGbngxl6UZMOXUAf7sH5cd082cmG+A30l mB5uSrQGs7/gsAC7xjUuC/ZltQjQTIalo7pfw1mp9smxpRhF2nCHbjEX2o+coARA9REn oaYA== X-Gm-Message-State: APjAAAX/tCthhlBAintQRNU3qeW7jsg5QYbel0bTT3b5il4crIuYgP4M yewn4Z5DnAGwSM8hVHT7Cj/SRQ== X-Google-Smtp-Source: APXvYqxuE4LLvTbBcNQoODorycPIwVUqrNlNMY4/nJ+V1JDWS8T+pSmvX9xsibLn4BjxVyez0BLGFg== X-Received: by 2002:a1c:495:: with SMTP id 143mr5598598wme.78.1553525958622; Mon, 25 Mar 2019 07:59:18 -0700 (PDT) Received: from localhost.localdomain (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id d11sm12836156wmb.19.2019.03.25.07.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:59:18 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 1/5] arm64: dts: meson-g12a: Add VPU and HDMI related nodes Date: Mon, 25 Mar 2019 15:59:10 +0100 Message-Id: <20190325145914.32391-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325145914.32391-1-narmstrong@baylibre.com> References: <20190325145914.32391-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_075920_554311_8CFC21A3 X-CRM114-Status: GOOD ( 12.01 ) 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 c762e2309b2b..b0ff649bca46 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -101,6 +101,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>; @@ -130,6 +161,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", @@ -187,6 +235,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>; @@ -254,6 +315,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>; @@ -333,6 +438,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 Mar 25 14:59:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10869503 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 18D3B1390 for ; Mon, 25 Mar 2019 15:07:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1389283E8 for ; Mon, 25 Mar 2019 15:06:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E25872869F; Mon, 25 Mar 2019 15:06:59 +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 10ED0283E8 for ; Mon, 25 Mar 2019 15:06:58 +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=qD0DFJekoZvtdoVivA/J0tt+GZ013+5cntPHx5TKKBg=; b=eRvqoJf0Y8l0Wr x0jlWHW9J42HNjg4TK4ESlmM0dpLB+bQE7d4kAoAiZym4kktqgcQg3TQoOCSqyVA/NQ0xgvizVFm9 dSE3kL9u1g7fGTUFsGF575gWs/FPzp3TL1c10ej+mTo+V7fooGj1n4vhhu/YudA1GNZjXbQ8pQQt3 7qKuJfP8qFu+E/895mSFwUJT99iNbUiYqvxBB5wHHWwjMWkm5VMd+hqKayosC9hC9/PBRWdhBkixw 3EXSPmBiNuIe1GSLApcp6GBzWivz5HxnYkYgxwAmSQWlAnpEZylfwewD1XkA+O5pBcsc94zp5CtaZ OntmjoydepjfjPJEv4mQ==; 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 1h8RBh-0003Rv-HW; Mon, 25 Mar 2019 15:06:57 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8R4b-0005sv-A6 for linux-amlogic@lists.infradead.org; Mon, 25 Mar 2019 14:59:43 +0000 Received: by mail-wr1-x444.google.com with SMTP id y7so6424442wrn.11 for ; Mon, 25 Mar 2019 07:59:29 -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=ufyFUHV9MYGt1xCCC/qB6iPXh5pMY/z0nQhLBwQ98yE=; b=cxptG/8mWah8bEph4tDrzfs4MMIET6v3/pp4JpGq68S/DTcPil9NN6P8BdHT8OaZad BFVZU1j4r29YVd2PLL6sNrC9qAX/SjEwD4o20qUMKOt1wPvFK3em4Z14cm3s8ffl1gLw xbWd1qw9ygu4Zhp1T/S+9kEegwGKnQQtM1AzahakmYv55XVv2TmDfQomTWOWB498h7EV XcZaFvdzm+UNsNZIByg5lI5+gaGJJjJzW85txBd/VZqoOroOqdGsb4DfB3XueJI9C/dC 6jrC8BdaHFkGqWSTr8ZXdapj1QV7fGBWNQnReN4REIHEwKMFZSmI7dIB2JHu61B9IKNu EKfQ== 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=ufyFUHV9MYGt1xCCC/qB6iPXh5pMY/z0nQhLBwQ98yE=; b=V9rKGwd5wGd5kqz6/83HoJVx3RsBXitqQb0S218KMkg+U8TjSBJDsN1nIhfuAoWFzP LldCbL4p3M4NPtrT+r4wCdXK6cXxV/2tFtUgxUM+6vufflEOImGWSSftAMOCEFosUy1B SXpuBVIXN9YAikORXqA6YAT1xodIg5uexS1f2xoSSgF0U10bBJ8sqvORObX83oGQBs14 I9OBkFU/BZNb0N4gh68Gt0kj2lRGaGeEykzHujVY5p2OFt73omYsFenNMwvv5JtnKIhm 8KuL0Dbaw/cSGatHeXh+v5X0R8q7rtmnheqPy4zSsYHgJmW8UsO84Eb78Co3Ta5Zd2zM RGBQ== X-Gm-Message-State: APjAAAU+dg9eWPBZk+D3D/RUKBZNi1Xvh1/FMlagcylP3Y8XmzeM8zJ6 uSeg9Fprs/1IfFEoNiil0KYzOQ== X-Google-Smtp-Source: APXvYqwQuNjHn/LKrhYAODYvi5Z6dbejaSh7FedfsWLyzHYS6Qri97GbLnYtEWnSqs8PVKGA2bswmw== X-Received: by 2002:adf:f309:: with SMTP id i9mr11048923wro.258.1553525959906; Mon, 25 Mar 2019 07:59:19 -0700 (PDT) Received: from localhost.localdomain (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id d11sm12836156wmb.19.2019.03.25.07.59.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:59:19 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 2/5] arm64: dts: meson-g12a: Add AO-CEC-A nodes Date: Mon, 25 Mar 2019 15:59:11 +0100 Message-Id: <20190325145914.32391-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325145914.32391-1-narmstrong@baylibre.com> References: <20190325145914.32391-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_075939_649913_BE4BE449 X-CRM114-Status: GOOD ( 11.46 ) 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 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 controller until AO-CEC-B is supported. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index b0ff649bca46..915e00833718 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -161,6 +161,14 @@ 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; + }; + }; + hdmitx_ddc_pins: hdmitx_ddc { mux { groups = "hdmitx_sda", @@ -397,6 +405,16 @@ }; }; + cec_AO: cec@100 { + compatible = "amlogic,meson-gx-ao-cec", + "amlogic,meson-g12a-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>; From patchwork Mon Mar 25 14:59:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10869489 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 62777139A for ; Mon, 25 Mar 2019 14:59:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A3DC28CEC for ; Mon, 25 Mar 2019 14:59:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EABD28EC4; Mon, 25 Mar 2019 14:59:55 +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 DEFAA28CEC for ; Mon, 25 Mar 2019 14:59:54 +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=oJlp/fPo8WseyvoCfsTZZ3qxzAFad1KOBRNGs/TkgEs=; b=NR5wRGAytaSvYe ze5IEbPSjcDHMqJvl5xgq0yEc3z6g6p4du2GIcCt4soK8Eu1PI+zRPs+8z0wy5G7raGw5TN/fgZAk 4uEbYJmqCi7EDt2/8Wgc0YQnbVQIMvIugQrTFFSI1neOjFTNGeasDt4xTZ4RH1Ov89AYFHaT2vibi wB7Pkeki/U6HQ/6IM+ecjLSFoo88veDFPDLtYEc1zAHDbgxH1/Tima95B472luo/ce5D3ziEHEV8V ObDnC36+3jgoagVUtm3LOb/xDBnGscAwoi6N1c1YuTep2Hg5kNOtnb8kIjUrxP+/V4kNj9MZbk84E DMLLERjhqOmxYvccMxCw==; 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 1h8R4p-0006S5-DE; Mon, 25 Mar 2019 14:59:51 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8R4O-0005sw-KJ for linux-amlogic@lists.infradead.org; Mon, 25 Mar 2019 14:59:29 +0000 Received: by mail-wr1-x444.google.com with SMTP id q1so10564156wrp.0 for ; Mon, 25 Mar 2019 07:59:24 -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=P0+TIG6VNjrqUujR6aG+tFwwFoGuZYT2WNxyTgEQcO8=; b=0PXFX9I7jb9iP16DZa4aEdcF7/XDIIQs4p8Vr45jAfJoxVHaeG1I/WVPwRwlK3WzWq h/rCwxiwgpu82NIGy8gJPr65mmxCSX0FLrQ3XteuI8ApgJo6MtqKziw0L2+hzxA82uTr qvFOhLxXR1JtgGGjQAwAicpfynbkrpQ5b8mRMojH3Iz8AsMSTRmz0wXLFhFtRkabEcCj ddYZ+84cQh47kdakz8TZ/s0vVBRFTylxqy8+Aj8pUfK8/tnSVj5YHvb+2yhkaJEChWJT A4u0GxRZdgaQTIoW/sftrpm0slWvl9CAqlPl7An8WtyPrehAvro0CkLxx71JTwsX8WJM 6PWw== 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=P0+TIG6VNjrqUujR6aG+tFwwFoGuZYT2WNxyTgEQcO8=; b=Ea1zj+2caM5qBd3mj3fNM/s/kyu8z9hcjSGh0nKbtJiGC5KYEHautfKApzqIY+dLi3 9SDxe7PoG+FPI+7xOxQ8tgTho04UCiSLCsy//42QjnvVPvOOpMxbhr1Wkhzn9NIf/lCR 6P1gids7+NOEcnz1/5H1MIjA3uldS2M/ahU60Xs0kH0Exj/C+Pwgh4VfmmwhS3N2a0it WVXsHoPKs2Eg1EvEykYT8I0U1esekU3vbm4sWeZS/3EO+Q7SYi9jSL5jF3GZabSbuqN5 oYUOeTkBn8CtmbAxJCTFXTVtGyRV9RG5yJGbx8eDgT3DMN+8aKTkEBE1Nv619/DAJHGl ZK4w== X-Gm-Message-State: APjAAAX4GJB8MsN1lGnTWGT74lFs07+Mb3XQf9+rsNlMgUzdiAN7+8s8 NNuhCJIGSSjOs6lZj1v4O9lI7Q== X-Google-Smtp-Source: APXvYqwMam1A4aufyBg2Z8cGjwAt+XemUqKzVmBCCtbnhW19uT4Uh4kASSjbEU/TLZOQVi4qp0Oisg== X-Received: by 2002:a5d:66c2:: with SMTP id k2mr15403349wrw.312.1553525961075; Mon, 25 Mar 2019 07:59:21 -0700 (PDT) Received: from localhost.localdomain (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id d11sm12836156wmb.19.2019.03.25.07.59.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:59:20 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 3/5] arm64: dts: meson-g12a-x96-max: Add support for Video Display Date: Mon, 25 Mar 2019 15:59:12 +0100 Message-Id: <20190325145914.32391-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325145914.32391-1-narmstrong@baylibre.com> References: <20190325145914.32391-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_075924_715414_CB2AF00E X-CRM114-Status: GOOD ( 11.10 ) 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-A is used for now until AO-CEC-B is supported. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 47 +++++++++++++++++++ 1 file changed, 47 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..eac4f5523e78 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,32 @@ }; }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_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 Mar 25 14:59:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10869495 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 5783414DE for ; Mon, 25 Mar 2019 15:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F1B6290A1 for ; Mon, 25 Mar 2019 15:00:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D73B29415; Mon, 25 Mar 2019 15:00:33 +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 E26B52942E for ; Mon, 25 Mar 2019 15:00:32 +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=j9HhdaHrSUHnrB695F+CrcK0YvUWhKza6axHI9Qadoc=; b=E9zrFOPKxTNZ4f w3sh0qQv2SXMu123I35EYyO2lDzByb2G/1yWneKyJYHmSrgd60eOgyuh9rIHx00VXY9sL7k1q5Tsv 3dodA9/oLIzQYd3OHXWr/wVBPkE3ZIq8mPU7/NUrRmWSuW3UXYpQOaKOfSAQMMJyqLK7j47/QAVWF PFajfbR8iL1jTAdsnlxeZ03pGzyH/gQluYP5+RVDILVAJWp67w8Bzn8LDBD3VxppI8TNlSJoWi2ut NJFHmd7AGLUSP4bCD4t8KAuZUusGBuK3f6aSv81k16afDIuGN0i83V+GqmQGmlnwnYxbdNSDTiHkK U5LRj3jh0Oh+R2AIBUHQ==; 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 1h8R5S-0008Rz-US; Mon, 25 Mar 2019 15:00:30 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8R4R-0005v2-Bx for linux-amlogic@lists.infradead.org; Mon, 25 Mar 2019 14:59:35 +0000 Received: by mail-wr1-x442.google.com with SMTP id t5so10497199wri.7 for ; Mon, 25 Mar 2019 07:59:27 -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=apV9C5vnP7hnEusl0/IGwUCXCWFQYz3Mv2aqqCWrzLU=; b=yfJMTXxVFPlFyyU+42XRfCkkBpWD+/LOPBHR0tPtu4LZ9AoHhwT5tr4c2oZmITtWLk u3E58CoGEDnBteD7ZDxBIKvMKG2EKvKzHRo1KSTarhzBVmAhLSkshkvI9o4UAuuB9jf6 bWdC70hHjT0ZoBoc/2ojDkDWfW26Y/sXvVE6Qc4xmazFSCWmg5Q2NC6yCozsmwBRPehr LV0Wghr+vGUL6hMyQVLbD+SVfBWxpaPUSRvTXyz8169RUtaSHRUhDGhKwWP8CSNpi/xM nXQRYlbnysHV92tZ4T8hfobTL5KQcO0zbK+y0+eRm7skrNNgIbzb1uJRXK79mrbGiUUX ylQg== 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=apV9C5vnP7hnEusl0/IGwUCXCWFQYz3Mv2aqqCWrzLU=; b=GwPcxBW+d8uTDHsWz4kTTzO8y6bHMMljsm9iohoH+KNdcjXKCdVxp2AtwyqhfctXAX SqCksfTNQETns9LSvSfCxRLEdaX4IaZT7YryRf9tnpU+hJ2PXn5TFr6l+AyOCipkDEuE z8TwYYkx+yD0TrwCfkRI7HKarOPOAuNvqgFPqm3wjD0ebm+uUBIcTW3xqDoCAp2RmxqG 9qv+ol0iQBGSX2AuaHA3JvpIV4sOGdH/aD2XCgmNuKXxrzNqE6N+SYhWzjIQwmLd95yi ScZ0V+i3q2EXJaYbfKCtXH/nYlRvIJECeunKahA96mJDl8HHoU+nsfIz2YC144/SsqEm iIhA== X-Gm-Message-State: APjAAAUJn4GiZVXbdIfprtLot4i7+210mfGZHHFS7BAtNucveRNtALMz 4wgNhtkjDJT5NQ4INkdN4XK+aw== X-Google-Smtp-Source: APXvYqwN4zaEmF5iuFKZFyAjXGO9tPJ1DFzwz/S+O80NbMMGeaQKO1pzPObYHUrK3BCPp28MDFhG9Q== X-Received: by 2002:adf:e949:: with SMTP id m9mr6399327wrn.237.1553525962254; Mon, 25 Mar 2019 07:59:22 -0700 (PDT) Received: from localhost.localdomain (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id d11sm12836156wmb.19.2019.03.25.07.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:59:21 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 4/5] arm64: dts: meson-g12a-sei510: Add support for Video Display Date: Mon, 25 Mar 2019 15:59:13 +0100 Message-Id: <20190325145914.32391-5-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325145914.32391-1-narmstrong@baylibre.com> References: <20190325145914.32391-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_075927_798488_4F176618 X-CRM114-Status: GOOD ( 11.25 ) 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-A is used for now until AO-CEC-B is supported. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 46 +++++++++++++++++++ 1 file changed, 46 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..3e7a8a4093f2 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,19 @@ }; }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_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 +154,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 Mar 25 14:59:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10869497 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 76BAF14DE for ; Mon, 25 Mar 2019 15:00:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56AF028F5C for ; Mon, 25 Mar 2019 15:00:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54DCD2942D; Mon, 25 Mar 2019 15:00:36 +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 0388428F5C for ; Mon, 25 Mar 2019 15:00:35 +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=1C+3LoEVDIj+7PNoXnfE8w6SVIjnZcJvv50xJHS54IA=; b=PAZ4VHq6FMs03f QT1O53tHAcN9CboD308UdOoVypicApYm29JO0L21YpFSHVmBL5N4TJn8IA6TZy7FIeL5CxokaZbAM xkALLD25Mc8MnrvMmRBZxCvOh6KBF1ZQEFXC5qFLQFxVLaGLfMuPiDQc7fbKDGSJtztkZoQ6w8DtB uzLd2Wau2Pct7czO2OdRSVLiXsd924f8DBDfJs2Gaqb41DhMCXwwVEPAb5wj4rww3v70QaCC+gYYb LP5q19YH9+bNW8vILk/lEjvd0inWMadwQUdHP+iySDPFdGBwrTSFKD3S6UI/R8WX07tnahqrpp6M9 0XbLrgPFRA9JUhVkAmaA==; 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 1h8R5U-0008Tc-En; Mon, 25 Mar 2019 15:00:32 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8R4R-0005ta-Fm for linux-amlogic@lists.infradead.org; Mon, 25 Mar 2019 14:59:36 +0000 Received: by mail-wr1-x441.google.com with SMTP id j9so10536477wrn.6 for ; Mon, 25 Mar 2019 07:59:25 -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=O1nsOWFPG6K9bGK6UYys+/cEUbualMnKnuKmrKMXNZ0=; b=b0Q4yp19uYsNtycqKcgc6HYVdkmFwenHMO6o9QfqUaE11SN/7syw3bFbBxdnq0glvt G/aCN6KeUKGgDoEs+foL42p3twNe8WnapUEmyhKzWSi1+ZamzhsgFxYJSBxUd8blKlpc DwlMzyNshnv0EX6wreZiDhTJ1XW6krdicRQP+Sv03N2AG+0LQxWKubK/FiT2LBHCfkXH 7KMP9Gp7MYsBITjrp81nYE4ybVr7CFYbmzvA/g3vPlFZE88M4BUTT1rLmFkvAJPF5Ygw fO81KvgQnjFBw7lPDy3B6XlH85MzPsri+JIdnQgze30YptDPpvz8lh9rWCl7I92IImSl 3GKw== 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=O1nsOWFPG6K9bGK6UYys+/cEUbualMnKnuKmrKMXNZ0=; b=m5+aJYhum5Msg9fNk2m6ldkUJeqRO0FQRp3fOYjWfsA0biYnneKwmGgT4xUU7+Gfnx 4Rv13XP7+MaIkn4Q74FgXEcY9Cg6M5lkfiXgUs/ZI0sjo8EV4twXT/34XIz7jasPVGLI 3JNb2r89nfjjKWEvYLI2rSTo8Z2I2MQztnprdgxyYIRax+JZuItpkn7ZGctcgjED7QQM 8x6fQIX+6BXT7Wie30ygd2L7BJv95lVWG1uGeSM4dIkz3KBI5P4woqPETZ3/vM6XZFRp GzNmI/edXtxLNux8wuTLazk76vgZ7lkYJi7rvyLaPPGSxfCE5ALZTxeSfecMeR/8E4dA VJEA== X-Gm-Message-State: APjAAAVC2HTwVCpczyay0+Lqa2rP0W7DAyEjIDeV07GW5xYCi8H67kXk EFXfZ1PYbm9OMu4CtRL+DPqxOGwcZQErXQ== X-Google-Smtp-Source: APXvYqxn3AZzRk5fzm57yi+eh1d1s7G5yiWV3bZNjUt1v+8mTPVc9pfhFOpqFgQrsa0X7XUm3rRzGQ== X-Received: by 2002:a5d:6a08:: with SMTP id m8mr15703740wru.30.1553525963296; Mon, 25 Mar 2019 07:59:23 -0700 (PDT) Received: from localhost.localdomain (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id d11sm12836156wmb.19.2019.03.25.07.59.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:59:22 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 5/5] arm64: dts: meson-g12a-u200: Add support for Video Display Date: Mon, 25 Mar 2019 15:59:14 +0100 Message-Id: <20190325145914.32391-6-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325145914.32391-1-narmstrong@baylibre.com> References: <20190325145914.32391-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_075927_861460_B9981B29 X-CRM114-Status: GOOD ( 11.30 ) 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-A is used for now until AO-CEC-B is supported. Signed-off-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12a-u200.dts | 47 +++++++++++++++++++ 1 file changed, 47 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..a9f217b9e86c 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,32 @@ }; +&cec_AO { + pinctrl-0 = <&cec_ao_a_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>;