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>,