From patchwork Sat Apr 13 17:15:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10899567 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 9BBC11669 for ; Sat, 13 Apr 2019 17:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BF2F289DC for ; Sat, 13 Apr 2019 17:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6076A28C26; Sat, 13 Apr 2019 17:15: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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 13559289DC for ; Sat, 13 Apr 2019 17:15: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=9C81gYSHVkuXcpFE9Scl7+4lzmtkkqVyf4eZoLezM0s=; b=YL7knSk79HTBZZ 0/Lmrf0TEdzuu0y6U+GrWo1RS5aRVZSOUhl0Ciar22YWVJliYVv0vdhNT2CFNSiTqVlKIgc5lWzrK PBYvbUYVx51o3xQs8bVk8ULlfARG7g+5ifGNcdKbanIjRqNbThk3KgwgigUmylao2AkFf9KMu3m6I YPVnEPZ+T1JKF+h3ClW9wunewz8Y5dUoV/004iDxPtJ1q5TwWU4ToNsQlet0ANPnpgLQtuvNB30L7 bJ4/uczXsOINEYsdZejPLCFVkFlUXUOOd8NPGP5/oXOjVxcblgcOrn4Be1qTFlN/GbTHoF3uufIVj PBSBVdHbMoMHS1KLSHBA==; 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 1hFMFw-000099-LZ; Sat, 13 Apr 2019 17:15:56 +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 1hFMFo-0008R9-LL; Sat, 13 Apr 2019 17:15:49 +0000 Received: by mail-wm1-x341.google.com with SMTP id w15so14636723wmc.3; Sat, 13 Apr 2019 10:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3t2VA5TTre+AZliJf9BQLiPu2UPCQMoeVa/gyjIW8SY=; b=YNBV7o+DMqHuxMHouOE/GNfPBXveM9hvT5oc9C4FrVqZy8LuDEfwi9/SETrPKnMNvA C+Kqk6/Fa2Ud1yKfudDbcA0f10DSxhjZitAisi2DIfhVbX2YVkxXRHF8OVPWHctBRnW6 m3wmdo7dHjzRAZdsG03XiQnbbOz5r88t8TFknjlZMYDJ5j0OtxwinZlUrNhENO2uyKDB i5Ih2P3jclBMhU9FVRb01pmUo2U8RpCW21QGR3JgOwbeH9HC3xzmQ6opKPI/+oY8P3/A i/ZibEXHLn9utIHzFwUFewN+vv4BHngdOf/JQTALq6UTWHjUpkgJlaC2vBUmwvBeoV2F 2eiA== 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=3t2VA5TTre+AZliJf9BQLiPu2UPCQMoeVa/gyjIW8SY=; b=JMOI7Dw+S4joZw0YTZG5x8PL7NXCrwNm5I3ozLBkq64hxeDNJ0ucIOUExJzPRuv3j8 7LUSzB0gjYL84lIh3QeDNy81Z124nmpg1LtgpPNiRYsHwRKAuh6MepUzbtn5dZ5B+jzB TAkrttZlPbQ45uoj3p01b7qns6hQ3ToRoqqvvZv6jMZXlPHBZQ/6bi9cHmly9ibekBpl XxlawJdRBtG0kl6+13cZFoYF2cU3kr4AOfEVqkfKAc0K7yLtPnbwEK+y5Bp9vw9OuzUE u4RVoQOwWGwromoE+oYXjyAT6QQ/Lby0nGjpAG0ModAPogHffbona9WOifF2sx2aGcKS thmQ== X-Gm-Message-State: APjAAAUb3DywqlTMiJAH+YGmxR/XIwYofSFOEMhDPgWCB32zBW/1m6a7 IRw+B+MZbyegaO6ciEviBtU2+NGA X-Google-Smtp-Source: APXvYqxdocTQnfviHVwHfmzUPilRZK9Z+H8UpylYEkwgI1prhyx5CDMUlAOI4buWF98nqmXS90m26g== X-Received: by 2002:a1c:c186:: with SMTP id r128mr15209469wmf.100.1555175746655; Sat, 13 Apr 2019 10:15:46 -0700 (PDT) Received: from blackbox.darklights.net (p200300F133C8AD0010B8127C043607D1.dip0.t-ipconnect.de. [2003:f1:33c8:ad00:10b8:127c:436:7d1]) by smtp.googlemail.com with ESMTPSA id h84sm16745965wmf.15.2019.04.13.10.15.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 10:15:45 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH 1/3] ARM: dts: meson8: add the canvas module Date: Sat, 13 Apr 2019 19:15:30 +0200 Message-Id: <20190413171532.25967-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> References: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190413_101548_694428_05584A70 X-CRM114-Status: GOOD ( 10.67 ) 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: mjourdan@baylibre.com, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the canvas module to Meson8 because it's required for the VPU (video output) and video decoders. The canvas module is located inside thie "DMC bus" (where also some of the memory controller registers are located). The "DMC bus" itself is part of the so-called "MMC bus". Amlogic's vendor kernel has an explicit #define for the "DMC" register range on Meson8m2 while there's no such #define for Meson8. However, the canvas and memory controller registers on Meson8 are all expressed as "0x6000 + actual offset", while Meson8m2 uses "DMC + actual offset". Thus it's safe to assume that the DMC bus exists on both SoCs even though the registers inside are slightly different. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 7ef442462ea4..6b5c90bb960b 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -228,6 +228,27 @@ }; }; + mmcbus: bus@c8000000 { + compatible = "simple-bus"; + reg = <0xc8000000 0x8000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xc8000000 0x8000>; + + dmcbus: bus@6000 { + compatible = "simple-bus"; + reg = <0x6000 0x400>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x6000 0x400>; + + canvas: video-lut@20 { + compatible = "amlogic,canvas"; + reg = <0x20 0x14>; + }; + }; + }; + apb: bus@d0000000 { compatible = "simple-bus"; reg = <0xd0000000 0x200000>; From patchwork Sat Apr 13 17:15:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10899571 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 3EFC113B5 for ; Sat, 13 Apr 2019 17:16:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B034289DC for ; Sat, 13 Apr 2019 17:16:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3B0528C26; Sat, 13 Apr 2019 17:16:11 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 A9F68289DC for ; Sat, 13 Apr 2019 17:16:11 +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=B3hG9UaZz2I4yTW9YxzDsit0B50Kh5sFUR4mgerhbhs=; b=q4uNKa/2Fdn6iA 8TwRQIQYtGWUakMgjfQzRrEbchMmMzzDxVwWJvwTI++PrbfOxYkJC4UXtofuRV0Voruw8Dm8S+lUT iQ/N6BVL+irBKrIdRB80AQPDXFA0tuTgnKzNaDpXzX6tfl8u1abvpequDDJhS1S51VIn/g2+PKa0m q14H6p1f9PF78iehQBUJeS+uvWkLwXMASq8qmQgqXn+yBazlY5k3h4qWOMASa5iXKm4Cr4LdTrwHQ nje1dIpoI4yFmkuxOK7ejjZuVAIk6gn/dqH5m7O6mz1O0OY2mCN9gc4NmRU0KIwedqSjdevLUPamE qb9x0HLDdjoMW2z69AnA==; 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 1hFMGA-0000Rb-Dh; Sat, 13 Apr 2019 17:16:10 +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 1hFMFp-0008RO-En; Sat, 13 Apr 2019 17:15:50 +0000 Received: by mail-wm1-x341.google.com with SMTP id h18so14643956wml.1; Sat, 13 Apr 2019 10:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9E4DqO8/055EQu/UGPx4DBiSsBA4UG4QMItls5PqPKk=; b=GO3cnXo9kZsGfjtyf+gzqQgQqYKamzRbp9AIl30FP6zlcfwC6HZWxb+96HyFGCl/tC tAaExNm6/xiVgu+fE0uxop2J60+7hva51T4Kz+rJedJWFAIKwHSvizMYADo5Fm/fekLg jIHpKhjdNb+dJeBIfImWiMXlo16mtyhB9LDCbBMVND+Pmw4LvaPq0TTrARRdhObm6FFN i6mp7QEGRi9atbWrsbtLBSz3HMKg/U1BVMXua6Xh9Dl9urx07XSgUAC6ZRplI6xbJw4q 9BNbwvf4A75wQKN9ZsIRW1yDgi7RKvJTcrMJvfrHU3Xv4tn6ywh/Q+TgH1RrXRbz8LfQ Xk5A== 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=9E4DqO8/055EQu/UGPx4DBiSsBA4UG4QMItls5PqPKk=; b=QcIKc1lPSvLoiT3K/i3wZi3oQKtjBYVfKcjBnwKey+iZXUqgjjWKqZ1kpir4KvBSIG D8B7MaJSj6Ta7BXvJctLzaXooctWHvnHT0prghG9BrCisBkQcC6RdZnXs3MRo4hhvIYR 3nNYdpocJ+KEtCCXhP49a7pr1eyUX/VC+/5VkLiGWPXF/G/A7ufFZ6twHbhZkSx3h5wG iOaeFzXTAhhKMNAynOdsya2U5G78R7ixftjKe4nF8bggT5PNdggTnagfkYM3g6Wj3PMP 6fB++fnHjRipQ2n83oAu24NCBRXrU9CayQF7wEcYiLGcz9lmmL0EgMNVRSagKJQOWkKD wJjQ== X-Gm-Message-State: APjAAAWG94Tu4+P5S27wClDNiB1R6oqzF3ZZpOfhDUcHQKcHAOy9n9G3 ++m+C6IdWWGYsQ4DvpQ6oprB3H+D X-Google-Smtp-Source: APXvYqwqulVeTNBwX8bThrfS/jug+deJWy/IZW1GcRXa1i2SC13VSB4fi9ZufadnQs3W+sINIixmXQ== X-Received: by 2002:a05:600c:d4:: with SMTP id u20mr15272538wmm.88.1555175747733; Sat, 13 Apr 2019 10:15:47 -0700 (PDT) Received: from blackbox.darklights.net (p200300F133C8AD0010B8127C043607D1.dip0.t-ipconnect.de. [2003:f1:33c8:ad00:10b8:127c:436:7d1]) by smtp.googlemail.com with ESMTPSA id h84sm16745965wmf.15.2019.04.13.10.15.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 10:15:47 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH 2/3] ARM: dts: meson8m2: update the offset of the canvas module Date: Sat, 13 Apr 2019 19:15:31 +0200 Message-Id: <20190413171532.25967-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> References: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190413_101549_501067_FC6F46E5 X-CRM114-Status: GOOD ( 11.83 ) 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: mjourdan@baylibre.com, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP With the Meson8m2 SoC the canvas module was moved from offset 0x20 (Meson8) to offset 0x48 (same as on Meson8b). The offsets inside the canvas module are identical. Correct the offset so the driver uses the correct registers. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8m2.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/meson8m2.dtsi index bb87b251e16d..e88c36d47e5c 100644 --- a/arch/arm/boot/dts/meson8m2.dtsi +++ b/arch/arm/boot/dts/meson8m2.dtsi @@ -14,6 +14,16 @@ compatible = "amlogic,meson8m2-clkc", "amlogic,meson8-clkc"; }; +&dmcbus { + /* the offset of the canvas registers has changed compared to Meson8 */ + /delete-node/ video-lut@20; + + canvas: video-lut@48 { + compatible = "amlogic,canvas"; + reg = <0x48 0x14>; + }; +}; + ðmac { compatible = "amlogic,meson8m2-dwmac", "snps,dwmac"; reg = <0xc9410000 0x10000 From patchwork Sat Apr 13 17:15:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10899573 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 8CDA113B5 for ; Sat, 13 Apr 2019 17:16:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E287289DC for ; Sat, 13 Apr 2019 17:16:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5249928C26; Sat, 13 Apr 2019 17:16:16 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 00C40289DC for ; Sat, 13 Apr 2019 17:16: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=xo8jyzBdFduvMlOhqBB+PeFfOWD5WCuidUOJBrHihMQ=; b=Cd06pMBKRhU44Q Rpa0kFtkOB+Ox6Wjh5CdR6r7tGtD6ZO+cHiNmdJOHTqYNBNpT5ug75tlazs5Nka0S6khnW3ARd1q2 oWIa1/uZiURQRAN/VQ+kJlGTXR2yb4Al36EOV3kAWyo7CBIRABCph0puY2d9aDHXproP5LCvQ1J4n fMf2Rgkv/upsrcR1hm1LZkDBWnVWf17G00OVEORzN2BRt30+fotjkOy/IFlHnW8FZWpCTF9rgoiPf LDHbB43ibhPXopynfVEXHlajvuWvOomc+vsVfDArm1v6kAXpD22k9Nt9CL1e8jj75XyL31O7f/KRD /bwg4ypXfT7DOyN2Q5nw==; 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 1hFMGF-0000Yl-08; Sat, 13 Apr 2019 17:16:15 +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 1hFMFq-0008S2-Hj; Sat, 13 Apr 2019 17:15:52 +0000 Received: by mail-wm1-x341.google.com with SMTP id z24so14732938wmi.5; Sat, 13 Apr 2019 10:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hh4yQhBPQBAdSO+xFdJJMR708sMAiI2dTB3FREcZ1hY=; b=HJ/Kh2VDa75prfApuD4ohFKbR59qt3c33FjtOX9Syf/JVbkhZspLRmb5DIIt+lheAs nWrn4rqtDiPcVFtE2lH2and3RpljIQ1OykU9DeRuGXzG9/Wf4wHIYq99mkrDVwp4duis XNGCFuIydP3UluqgcMxDdIzaB3o+O86RXSipzq4iSca5wRStLlkZl3LOyplX8jRpImyl ix8KcTtLR07fCoBGp0+QS3bdx2e7EgcDFu0NLPullRshvvU3nbDFBHxfytIfDjw7sVPv 1VY5kzV5PNgtLr3Sgj4ICzys3q+0uMHolqGNadM/7CCaMcxa2PlUuDNa4XWVK7eAZh/c uTlw== 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=Hh4yQhBPQBAdSO+xFdJJMR708sMAiI2dTB3FREcZ1hY=; b=L/J4m04PeFxQxTasZOQ2+nav3XvC0zWuLDrd6E6vKEjvHBk6xnXzOPz1ObqUy5VM/5 fhjiMGXdtJFPm88YKGkcNLyRm7TVYxneFeLu4f6fUwzd+Vn43JYozoHcLIwkyxyB8KWh wSmjZr+kBtfRkUt9wGesZIgAKLX+q4B6ZxoBs+yT+RlkzceQ3nZgdrr1lkgEjPkPQ6re XjDLK0y9jH+r8qKQO4aTYb3kZvDfuxpH0YfFFd2895A/zeb/82SLA0RFHb1ixtDtMbGw PuJIoUxzYadaee3lk5Wyr8p+HXC91Xm1uk8Y4CnDR10BLwFFEK2buGBzehsDfbETupTS /sdQ== X-Gm-Message-State: APjAAAXetT9iGYBK1HiQnA4TF78+unY3Hxecasoam58p9r4DI/f6+6wf gh3qbW+vZOuGU8r9jhEHqJXIqPiM X-Google-Smtp-Source: APXvYqwGOIyVec7OvKYIPCbs4ICpJgtfXHVwGRFw1T99hR9Eoj+/h4tXMYu24BOuFeGlD7h6IVpfIA== X-Received: by 2002:a1c:e188:: with SMTP id y130mr15041584wmg.83.1555175748947; Sat, 13 Apr 2019 10:15:48 -0700 (PDT) Received: from blackbox.darklights.net (p200300F133C8AD0010B8127C043607D1.dip0.t-ipconnect.de. [2003:f1:33c8:ad00:10b8:127c:436:7d1]) by smtp.googlemail.com with ESMTPSA id h84sm16745965wmf.15.2019.04.13.10.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 10:15:48 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH 3/3] ARM: dts: meson8b: add the canvas module Date: Sat, 13 Apr 2019 19:15:32 +0200 Message-Id: <20190413171532.25967-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> References: <20190413171532.25967-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190413_101550_851353_FE0081FB X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. 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: mjourdan@baylibre.com, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the canvas module to Meson8b because it's required for the VPU (video output) and video decoders. The canvas module is located inside the "DMC bus" (where also some of the memory controller registers are located). The "DMC bus" itself is part of the so-called "MMC bus". Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8b.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 800cd65fc50a..f4e832638e9c 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -205,6 +205,27 @@ }; }; + mmcbus: bus@c8000000 { + compatible = "simple-bus"; + reg = <0xc8000000 0x8000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xc8000000 0x8000>; + + dmcbus: bus@6000 { + compatible = "simple-bus"; + reg = <0x6000 0x400>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x6000 0x400>; + + canvas: video-lut@48 { + compatible = "amlogic,canvas"; + reg = <0x48 0x14>; + }; + }; + }; + apb: bus@d0000000 { compatible = "simple-bus"; reg = <0xd0000000 0x200000>;