From: Matthias Brugger <matthias.bgg@gmail.com>
To: Frank Wunderlich <linux@fw-web.de>,
linux-mediatek@lists.infradead.org,
Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Frank Wunderlich <frank-w@public-files.de>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
Kishon Vijay Abraham I <kishon@ti.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Philipp Zabel <p.zabel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Sean Wang <sean.wang@mediatek.com>,
David Woodhouse <dwmw@amazon.co.uk>
Subject: Re: [PATCH v6 2/4] arm: dts: mt7623: move display nodes to separate mt7623n.dtsi
Date: Wed, 9 Sep 2020 11:42:23 +0200 [thread overview]
Message-ID: <64998e6b-aa2c-4934-7797-0c1e802064a5@gmail.com> (raw)
In-Reply-To: <20200904110002.88966-3-linux@fw-web.de>
On 04/09/2020 13:00, Frank Wunderlich wrote:
> From: Frank Wunderlich <frank-w@public-files.de>
>
> 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 <dwmw@amazon.co.uk>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
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 <dt-bindings/power/mt2701-power.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/phy/phy.h>
> -#include <dt-bindings/memory/mt2701-larb-port.h>
> #include <dt-bindings/reset/mt2701-resets.h>
> #include <dt-bindings/thermal/thermal.h>
>
> @@ -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 = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
> - 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 = <GIC_SPI 170 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 171 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 172 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 173 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 174 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 177 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 178 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 179 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 180 IRQ_TYPE_LEVEL_LOW>;
> - 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 = <GIC_SPI 143 IRQ_TYPE_LEVEL_LOW>;
> - 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 <dt-bindings/input/input.h>
> -#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 <dt-bindings/input/input.h>
> -#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 <sean.wang@mediatek.com>
> + * Ryder Lee <ryder.lee@mediatek.com>
> + *
> + */
> +
> +#include "mt7623.dtsi"
> +#include <dt-bindings/memory/mt2701-larb-port.h>
> +
> +/ {
> + 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 = <GIC_SPI 170 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 171 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 172 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 173 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 174 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 177 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 178 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 179 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 180 IRQ_TYPE_LEVEL_LOW>;
> + 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 = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
> + 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 = <GIC_SPI 143 IRQ_TYPE_LEVEL_LOW>;
> + 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>;
> + };
> +};
>
next prev parent reply other threads:[~2020-09-09 9:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 10:59 [PATCH v6 0/4] make hdmi work on bananapi-r2 Frank Wunderlich
2020-09-04 10:59 ` [PATCH v6 1/4] drm/mediatek: disable tmds on mt2701 Frank Wunderlich
2020-09-14 22:09 ` Chun-Kuang Hu
2020-09-04 11:00 ` [PATCH v6 2/4] arm: dts: mt7623: move display nodes to separate mt7623n.dtsi Frank Wunderlich
2020-09-09 9:42 ` Matthias Brugger [this message]
2020-09-04 11:00 ` [PATCH v6 3/4] arm: dts: mt7623: add display subsystem related device nodes Frank Wunderlich
2020-09-09 9:42 ` Matthias Brugger
2020-09-04 11:00 ` [PATCH v6 4/4] arm: dts: mt7623: add lima related regulator Frank Wunderlich
2020-09-09 9:42 ` Matthias Brugger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64998e6b-aa2c-4934-7797-0c1e802064a5@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=chunfeng.yun@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=dwmw@amazon.co.uk \
--cc=frank-w@public-files.de \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@fw-web.de \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).