From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC121C43461 for ; Wed, 9 Sep 2020 09:42:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C68221D7B for ; Wed, 9 Sep 2020 09:42:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rzo9RthF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728663AbgIIJmb (ORCPT ); Wed, 9 Sep 2020 05:42:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726688AbgIIJm2 (ORCPT ); Wed, 9 Sep 2020 05:42:28 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27543C061573; Wed, 9 Sep 2020 02:42:27 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id a9so1675697wmm.2; Wed, 09 Sep 2020 02:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=QEXwLqzrufnYQC84+P/tGhOxwlIm/I5QckE0v14WaiM=; b=rzo9RthFRpF73CFkZMk6dMAEQxVmT7XM73VhV8ZPtPJtqYIi6apdSZIDtyWQM3hnaD CK0PsI/5SlWLHQhmX1Ue2RfwGQNssfGEee6bxKLedufjUvcBBfHR0cG70fSBN/8dlRIC ljMF9x4NaKUntkFyB7Mkwr0aKUqKZ/DGJ1So2kys3uM98pj6ev5b++3jBpbjV0qI/31d lmc3fZfS69IyAZuU/3KstmKX3M0zMk1N5UaB2dw0idfcx8IwWkawNSqxL1mU7RonKMLR t23HqNiYNSWG9DQP/rk3VQ6HEL7QFqJ7hEcGFoL0E8ci2aa2319EWcBUtgk6QEXXBhST cEfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=QEXwLqzrufnYQC84+P/tGhOxwlIm/I5QckE0v14WaiM=; b=MoDfghRW+M5+YsTpidID2O3htYfvoFCk3AkmysILe9MOEHuIOb7w8vKOrZ+wnaEHNf rfOh2kfN2BIHcN8gJnnAIw8l+YDGjX0yP00AiRy94glrnVfMZsQ+OZ8m47beiVPw046n yxlsbpCZGcad/ljI7vYxS/JX7bE8QPtjTVmsXavrK45WwKd7uYflaxALwE2o5YtSglrJ grFgQgwrP8DPT0LfRQNlcA0yRvXF/5rujlimcBRkQP/ATnIsuOxcQuTuqkrWM9Y7xXPC 4ONkiXvtS+pc+/7VBhQsikMH58dt3HTqzAGhn3omhIFcn4OD0+JtNPykRZ2a3/Q5RqJK T+Ag== X-Gm-Message-State: AOAM530+AMDP/KC86JkYlmkqfKmYb7ltUb6Pzkn/mwLzGm3Hws7F9qzl zy90p08tRppNMoNLPh6hw8A= X-Google-Smtp-Source: ABdhPJzJA0J1f3hod/SueHDzxAxM9KsAK9po2kUB+W4SDwcmJnl2dTJUuq5WT1behwRdobpCdHtz0g== X-Received: by 2002:a1c:7f14:: with SMTP id a20mr2724657wmd.95.1599644545774; Wed, 09 Sep 2020 02:42:25 -0700 (PDT) Received: from ziggy.stardust ([213.195.113.201]) by smtp.gmail.com with ESMTPSA id o2sm3085614wmo.37.2020.09.09.02.42.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Sep 2020 02:42:25 -0700 (PDT) Subject: Re: [PATCH v6 2/4] arm: dts: mt7623: move display nodes to separate mt7623n.dtsi To: Frank Wunderlich , linux-mediatek@lists.infradead.org, Chun-Kuang Hu Cc: Frank Wunderlich , Chunfeng Yun , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Kishon Vijay Abraham I , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Philipp Zabel , Rob Herring , Ryder Lee , Sean Wang , David Woodhouse References: <20200904110002.88966-1-linux@fw-web.de> <20200904110002.88966-3-linux@fw-web.de> From: Matthias Brugger Message-ID: <64998e6b-aa2c-4934-7797-0c1e802064a5@gmail.com> Date: Wed, 9 Sep 2020 11:42:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200904110002.88966-3-linux@fw-web.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 04/09/2020 13:00, Frank Wunderlich wrote: > From: Frank Wunderlich > > mt7623a has no graphics support so move nodes from generic mt7623.dtsi > to mt7623n.dtsi > > Fixes: 1f6ed224594 ("arm: dts: mt7623: add Mali-450 device node") > Suggested-by: David Woodhouse > Signed-off-by: Frank Wunderlich Applied to v5.9-next/dts32 Thanks! > --- > arch/arm/boot/dts/mt7623.dtsi | 123 ---------------- > arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 2 +- > arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 2 +- > arch/arm/boot/dts/mt7623n.dtsi | 134 ++++++++++++++++++ > 4 files changed, 136 insertions(+), 125 deletions(-) > create mode 100644 arch/arm/boot/dts/mt7623n.dtsi > > diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi > index a106c0d90a52..d09b5671c91b 100644 > --- a/arch/arm/boot/dts/mt7623.dtsi > +++ b/arch/arm/boot/dts/mt7623.dtsi > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > > @@ -297,17 +296,6 @@ timer: timer@10008000 { > clock-names = "system-clk", "rtc-clk"; > }; > > - smi_common: smi@1000c000 { > - compatible = "mediatek,mt7623-smi-common", > - "mediatek,mt2701-smi-common"; > - reg = <0 0x1000c000 0 0x1000>; > - clocks = <&infracfg CLK_INFRA_SMI>, > - <&mmsys CLK_MM_SMI_COMMON>, > - <&infracfg CLK_INFRA_SMI>; > - clock-names = "apb", "smi", "async"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_DISP>; > - }; > - > pwrap: pwrap@1000d000 { > compatible = "mediatek,mt7623-pwrap", > "mediatek,mt2701-pwrap"; > @@ -339,17 +327,6 @@ sysirq: interrupt-controller@10200100 { > reg = <0 0x10200100 0 0x1c>; > }; > > - iommu: mmsys_iommu@10205000 { > - compatible = "mediatek,mt7623-m4u", > - "mediatek,mt2701-m4u"; > - reg = <0 0x10205000 0 0x1000>; > - interrupts = ; > - clocks = <&infracfg CLK_INFRA_M4U>; > - clock-names = "bclk"; > - mediatek,larbs = <&larb0 &larb1 &larb2>; > - #iommu-cells = <1>; > - }; > - > efuse: efuse@10206000 { > compatible = "mediatek,mt7623-efuse", > "mediatek,mt8173-efuse"; > @@ -725,94 +702,6 @@ mmc0: mmc@11230000 { > status = "disabled"; > }; > > - g3dsys: syscon@13000000 { > - compatible = "mediatek,mt7623-g3dsys", > - "mediatek,mt2701-g3dsys", > - "syscon"; > - reg = <0 0x13000000 0 0x200>; > - #clock-cells = <1>; > - #reset-cells = <1>; > - }; > - > - mali: gpu@13040000 { > - compatible = "mediatek,mt7623-mali", "arm,mali-450"; > - reg = <0 0x13040000 0 0x30000>; > - interrupts = , > - , > - , > - , > - , > - , > - , > - , > - , > - , > - ; > - interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", > - "ppmmu1", "pp2", "ppmmu2", "pp3", "ppmmu3", > - "pp"; > - clocks = <&topckgen CLK_TOP_MMPLL>, > - <&g3dsys CLK_G3DSYS_CORE>; > - clock-names = "bus", "core"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_MFG>; > - resets = <&g3dsys MT2701_G3DSYS_CORE_RST>; > - }; > - > - mmsys: syscon@14000000 { > - compatible = "mediatek,mt7623-mmsys", > - "mediatek,mt2701-mmsys", > - "syscon"; > - reg = <0 0x14000000 0 0x1000>; > - #clock-cells = <1>; > - }; > - > - larb0: larb@14010000 { > - compatible = "mediatek,mt7623-smi-larb", > - "mediatek,mt2701-smi-larb"; > - reg = <0 0x14010000 0 0x1000>; > - mediatek,smi = <&smi_common>; > - mediatek,larb-id = <0>; > - clocks = <&mmsys CLK_MM_SMI_LARB0>, > - <&mmsys CLK_MM_SMI_LARB0>; > - clock-names = "apb", "smi"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_DISP>; > - }; > - > - imgsys: syscon@15000000 { > - compatible = "mediatek,mt7623-imgsys", > - "mediatek,mt2701-imgsys", > - "syscon"; > - reg = <0 0x15000000 0 0x1000>; > - #clock-cells = <1>; > - }; > - > - larb2: larb@15001000 { > - compatible = "mediatek,mt7623-smi-larb", > - "mediatek,mt2701-smi-larb"; > - reg = <0 0x15001000 0 0x1000>; > - mediatek,smi = <&smi_common>; > - mediatek,larb-id = <2>; > - clocks = <&imgsys CLK_IMG_SMI_COMM>, > - <&imgsys CLK_IMG_SMI_COMM>; > - clock-names = "apb", "smi"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; > - }; > - > - jpegdec: jpegdec@15004000 { > - compatible = "mediatek,mt7623-jpgdec", > - "mediatek,mt2701-jpgdec"; > - reg = <0 0x15004000 0 0x1000>; > - interrupts = ; > - clocks = <&imgsys CLK_IMG_JPGDEC_SMI>, > - <&imgsys CLK_IMG_JPGDEC>; > - clock-names = "jpgdec-smi", > - "jpgdec"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; > - mediatek,larb = <&larb2>; > - iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>, > - <&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>; > - }; > - > vdecsys: syscon@16000000 { > compatible = "mediatek,mt7623-vdecsys", > "mediatek,mt2701-vdecsys", > @@ -821,18 +710,6 @@ vdecsys: syscon@16000000 { > #clock-cells = <1>; > }; > > - larb1: larb@16010000 { > - compatible = "mediatek,mt7623-smi-larb", > - "mediatek,mt2701-smi-larb"; > - reg = <0 0x16010000 0 0x1000>; > - mediatek,smi = <&smi_common>; > - mediatek,larb-id = <1>; > - clocks = <&vdecsys CLK_VDEC_CKGEN>, > - <&vdecsys CLK_VDEC_LARB>; > - clock-names = "apb", "smi"; > - power-domains = <&scpsys MT2701_POWER_DOMAIN_VDEC>; > - }; > - > hifsys: syscon@1a000000 { > compatible = "mediatek,mt7623-hifsys", > "mediatek,mt2701-hifsys", > diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > index 2b760f90f38c..344f8c65c4aa 100644 > --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > @@ -6,7 +6,7 @@ > > /dts-v1/; > #include > -#include "mt7623.dtsi" > +#include "mt7623n.dtsi" > #include "mt6323.dtsi" > > / { > diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > index 0447748f9fa0..f8efcc364bc3 100644 > --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > @@ -7,7 +7,7 @@ > > /dts-v1/; > #include > -#include "mt7623.dtsi" > +#include "mt7623n.dtsi" > #include "mt6323.dtsi" > > / { > diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi > new file mode 100644 > index 000000000000..a47e82468895 > --- /dev/null > +++ b/arch/arm/boot/dts/mt7623n.dtsi > @@ -0,0 +1,134 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright © 2017-2020 MediaTek Inc. > + * Author: Sean Wang > + * Ryder Lee > + * > + */ > + > +#include "mt7623.dtsi" > +#include > + > +/ { > + g3dsys: syscon@13000000 { > + compatible = "mediatek,mt7623-g3dsys", > + "mediatek,mt2701-g3dsys", > + "syscon"; > + reg = <0 0x13000000 0 0x200>; > + #clock-cells = <1>; > + #reset-cells = <1>; > + }; > + > + mali: gpu@13040000 { > + compatible = "mediatek,mt7623-mali", "arm,mali-450"; > + reg = <0 0x13040000 0 0x30000>; > + interrupts = , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + ; > + interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", > + "ppmmu1", "pp2", "ppmmu2", "pp3", "ppmmu3", > + "pp"; > + clocks = <&topckgen CLK_TOP_MMPLL>, > + <&g3dsys CLK_G3DSYS_CORE>; > + clock-names = "bus", "core"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_MFG>; > + resets = <&g3dsys MT2701_G3DSYS_CORE_RST>; > + }; > + > + mmsys: syscon@14000000 { > + compatible = "mediatek,mt7623-mmsys", > + "mediatek,mt2701-mmsys", > + "syscon"; > + reg = <0 0x14000000 0 0x1000>; > + #clock-cells = <1>; > + }; > + > + larb0: larb@14010000 { > + compatible = "mediatek,mt7623-smi-larb", > + "mediatek,mt2701-smi-larb"; > + reg = <0 0x14010000 0 0x1000>; > + mediatek,smi = <&smi_common>; > + mediatek,larb-id = <0>; > + clocks = <&mmsys CLK_MM_SMI_LARB0>, > + <&mmsys CLK_MM_SMI_LARB0>; > + clock-names = "apb", "smi"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_DISP>; > + }; > + > + larb1: larb@16010000 { > + compatible = "mediatek,mt7623-smi-larb", > + "mediatek,mt2701-smi-larb"; > + reg = <0 0x16010000 0 0x1000>; > + mediatek,smi = <&smi_common>; > + mediatek,larb-id = <1>; > + clocks = <&vdecsys CLK_VDEC_CKGEN>, > + <&vdecsys CLK_VDEC_LARB>; > + clock-names = "apb", "smi"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_VDEC>; > + }; > + > + larb2: larb@15001000 { > + compatible = "mediatek,mt7623-smi-larb", > + "mediatek,mt2701-smi-larb"; > + reg = <0 0x15001000 0 0x1000>; > + mediatek,smi = <&smi_common>; > + mediatek,larb-id = <2>; > + clocks = <&imgsys CLK_IMG_SMI_COMM>, > + <&imgsys CLK_IMG_SMI_COMM>; > + clock-names = "apb", "smi"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; > + }; > + > + imgsys: syscon@15000000 { > + compatible = "mediatek,mt7623-imgsys", > + "mediatek,mt2701-imgsys", > + "syscon"; > + reg = <0 0x15000000 0 0x1000>; > + #clock-cells = <1>; > + }; > + > + iommu: mmsys_iommu@10205000 { > + compatible = "mediatek,mt7623-m4u", > + "mediatek,mt2701-m4u"; > + reg = <0 0x10205000 0 0x1000>; > + interrupts = ; > + clocks = <&infracfg CLK_INFRA_M4U>; > + clock-names = "bclk"; > + mediatek,larbs = <&larb0 &larb1 &larb2>; > + #iommu-cells = <1>; > + }; > + > + jpegdec: jpegdec@15004000 { > + compatible = "mediatek,mt7623-jpgdec", > + "mediatek,mt2701-jpgdec"; > + reg = <0 0x15004000 0 0x1000>; > + interrupts = ; > + clocks = <&imgsys CLK_IMG_JPGDEC_SMI>, > + <&imgsys CLK_IMG_JPGDEC>; > + clock-names = "jpgdec-smi", > + "jpgdec"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; > + mediatek,larb = <&larb2>; > + iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>, > + <&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>; > + }; > + > + smi_common: smi@1000c000 { > + compatible = "mediatek,mt7623-smi-common", > + "mediatek,mt2701-smi-common"; > + reg = <0 0x1000c000 0 0x1000>; > + clocks = <&infracfg CLK_INFRA_SMI>, > + <&mmsys CLK_MM_SMI_COMMON>, > + <&infracfg CLK_INFRA_SMI>; > + clock-names = "apb", "smi", "async"; > + power-domains = <&scpsys MT2701_POWER_DOMAIN_DISP>; > + }; > +}; >