From: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> To: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, "Andreas Färber" <afaerber-l3A5Bk7waGM@public.gmane.org>, "John Crispin" <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> Subject: [PATCH 13/16] arm: dts: rename mt7623-evb.dts to arch/arm/boot/dts/mt7623n-rfb.dtsi Date: Mon, 23 Jan 2017 12:29:32 +0100 [thread overview] Message-ID: <1485170975-51813-14-git-send-email-john@phrozen.org> (raw) In-Reply-To: <1485170975-51813-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> There are 2 versions of the SoC. MT7623N is almost identical to MT7623A but has some additional multimedia features. The reference boards are available as NAND or MMC and might have a different ethernet setup. In order to reduce the duplication of devicetree code we add an intermediate dtsi file for these reference boards. Additionally MTK/WCN pointed out, that the EVB is yet another board and the board in question is infact the RFB. Take this into account while renaming the files. Signed-off-by: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> --- Documentation/devicetree/bindings/arm/mediatek.txt | 4 +-- arch/arm/boot/dts/Makefile | 2 +- arch/arm/boot/dts/mt7623-evb.dts | 33 -------------------- arch/arm/boot/dts/mt7623n-rfb-nand.dts | 21 +++++++++++++ arch/arm/boot/dts/mt7623n-rfb.dtsi | 29 +++++++++++++++++ 5 files changed, 53 insertions(+), 36 deletions(-) delete mode 100644 arch/arm/boot/dts/mt7623-evb.dts create mode 100644 arch/arm/boot/dts/mt7623n-rfb-nand.dts create mode 100644 arch/arm/boot/dts/mt7623n-rfb.dtsi diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt index c860b24..71149cb 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.txt +++ b/Documentation/devicetree/bindings/arm/mediatek.txt @@ -38,9 +38,9 @@ Supported boards: - Evaluation board for MT6795(Helio X10): Required root node properties: - compatible = "mediatek,mt6795-evb", "mediatek,mt6795"; -- Evaluation board for MT7623: +- Reference board for MT7623N with NAND: Required root node properties: - - compatible = "mediatek,mt7623-evb", "mediatek,mt7623"; + - compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623"; - MTK mt8127 tablet moose EVB: Required root node properties: - compatible = "mediatek,mt8127-moose", "mediatek,mt8127"; diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cccdbcb..9735c2c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -976,7 +976,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt6580-evbp1.dtb \ mt6589-aquaris5.dtb \ mt6592-evb.dtb \ - mt7623-evb.dtb \ + mt7623n-rfb-nand.dtb \ mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb diff --git a/arch/arm/boot/dts/mt7623-evb.dts b/arch/arm/boot/dts/mt7623-evb.dts deleted file mode 100644 index 58ed038..0000000 --- a/arch/arm/boot/dts/mt7623-evb.dts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 MediaTek Inc. - * Author: John Crispin <blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -#include "mt7623-mt6323.dtsi" - -/ { - model = "MediaTek MT7623 evaluation board"; - compatible = "mediatek,mt7623-evb", "mediatek,mt7623"; - - chosen { - stdout-path = &uart2; - }; - - memory { - reg = <0 0x80000000 0 0x40000000>; - }; -}; - -&uart2 { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts new file mode 100644 index 0000000..436d51c --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb-nand.dts @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2016 MediaTek Inc. + * Author: John Crispin <blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "mt7623n-rfb.dtsi" + +/ { + model = "MediaTek MT7623N NAND reference board"; + compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623"; +}; diff --git a/arch/arm/boot/dts/mt7623n-rfb.dtsi b/arch/arm/boot/dts/mt7623n-rfb.dtsi new file mode 100644 index 0000000..d46390e --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb.dtsi @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016 MediaTek Inc. + * Author: John Crispin <blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "mt7623-mt6323.dtsi" + +/ { + chosen { + stdout-path = &uart2; + }; + + memory { + reg = <0 0x80000000 0 0x40000000>; + }; +}; + +&uart2 { + status = "okay"; +}; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: john@phrozen.org (John Crispin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/16] arm: dts: rename mt7623-evb.dts to arch/arm/boot/dts/mt7623n-rfb.dtsi Date: Mon, 23 Jan 2017 12:29:32 +0100 [thread overview] Message-ID: <1485170975-51813-14-git-send-email-john@phrozen.org> (raw) In-Reply-To: <1485170975-51813-1-git-send-email-john@phrozen.org> There are 2 versions of the SoC. MT7623N is almost identical to MT7623A but has some additional multimedia features. The reference boards are available as NAND or MMC and might have a different ethernet setup. In order to reduce the duplication of devicetree code we add an intermediate dtsi file for these reference boards. Additionally MTK/WCN pointed out, that the EVB is yet another board and the board in question is infact the RFB. Take this into account while renaming the files. Signed-off-by: John Crispin <john@phrozen.org> --- Documentation/devicetree/bindings/arm/mediatek.txt | 4 +-- arch/arm/boot/dts/Makefile | 2 +- arch/arm/boot/dts/mt7623-evb.dts | 33 -------------------- arch/arm/boot/dts/mt7623n-rfb-nand.dts | 21 +++++++++++++ arch/arm/boot/dts/mt7623n-rfb.dtsi | 29 +++++++++++++++++ 5 files changed, 53 insertions(+), 36 deletions(-) delete mode 100644 arch/arm/boot/dts/mt7623-evb.dts create mode 100644 arch/arm/boot/dts/mt7623n-rfb-nand.dts create mode 100644 arch/arm/boot/dts/mt7623n-rfb.dtsi diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt index c860b24..71149cb 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.txt +++ b/Documentation/devicetree/bindings/arm/mediatek.txt @@ -38,9 +38,9 @@ Supported boards: - Evaluation board for MT6795(Helio X10): Required root node properties: - compatible = "mediatek,mt6795-evb", "mediatek,mt6795"; -- Evaluation board for MT7623: +- Reference board for MT7623N with NAND: Required root node properties: - - compatible = "mediatek,mt7623-evb", "mediatek,mt7623"; + - compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623"; - MTK mt8127 tablet moose EVB: Required root node properties: - compatible = "mediatek,mt8127-moose", "mediatek,mt8127"; diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cccdbcb..9735c2c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -976,7 +976,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt6580-evbp1.dtb \ mt6589-aquaris5.dtb \ mt6592-evb.dtb \ - mt7623-evb.dtb \ + mt7623n-rfb-nand.dtb \ mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb diff --git a/arch/arm/boot/dts/mt7623-evb.dts b/arch/arm/boot/dts/mt7623-evb.dts deleted file mode 100644 index 58ed038..0000000 --- a/arch/arm/boot/dts/mt7623-evb.dts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 MediaTek Inc. - * Author: John Crispin <blogic@openwrt.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -#include "mt7623-mt6323.dtsi" - -/ { - model = "MediaTek MT7623 evaluation board"; - compatible = "mediatek,mt7623-evb", "mediatek,mt7623"; - - chosen { - stdout-path = &uart2; - }; - - memory { - reg = <0 0x80000000 0 0x40000000>; - }; -}; - -&uart2 { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts new file mode 100644 index 0000000..436d51c --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb-nand.dts @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2016 MediaTek Inc. + * Author: John Crispin <blogic@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "mt7623n-rfb.dtsi" + +/ { + model = "MediaTek MT7623N NAND reference board"; + compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623"; +}; diff --git a/arch/arm/boot/dts/mt7623n-rfb.dtsi b/arch/arm/boot/dts/mt7623n-rfb.dtsi new file mode 100644 index 0000000..d46390e --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb.dtsi @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016 MediaTek Inc. + * Author: John Crispin <blogic@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "mt7623-mt6323.dtsi" + +/ { + chosen { + stdout-path = &uart2; + }; + + memory { + reg = <0 0x80000000 0 0x40000000>; + }; +}; + +&uart2 { + status = "okay"; +}; -- 1.7.10.4
next prev parent reply other threads:[~2017-01-23 11:29 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-23 11:29 [PATCH 00/16] arm: dts: extend mt7623 support John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 11/16] arm: dts: add usb nodes to the mt7623.dtsi file John Crispin 2017-01-23 11:29 ` John Crispin [not found] ` <1485170975-51813-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> 2017-01-23 11:29 ` [PATCH 01/16] arm: dts: add clock controller device nodes John Crispin 2017-01-23 11:29 ` John Crispin [not found] ` <1485170975-51813-2-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> 2017-03-22 8:04 ` Sean Wang 2017-03-22 8:04 ` [PATCH " Sean Wang 2017-03-22 8:16 ` Sean Wang 2017-03-22 8:16 ` [PATCH " Sean Wang 2017-01-23 11:29 ` [PATCH 02/16] arm: dts: add subsystem " John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 03/16] arm: dts: add power domain controller device node John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 04/16] arm: dts: add clock-frequency to the a7 timer node to mt7623.dtsi John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 05/16] arm: dts: add pinctrl nodes to the mt7623 dtsi file John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 06/16] arm: dts: add pmic " John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 07/16] arm: dts: add i2c nodes to the mt7623.dtsi file John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 08/16] arm: dts: add spi " John Crispin 2017-01-23 11:29 ` John Crispin [not found] ` <1485170975-51813-9-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org> 2017-01-24 22:39 ` Matthias Brugger 2017-01-24 22:39 ` Matthias Brugger [not found] ` <69d73342-d710-5f6d-567b-8e75a84fdb18-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2017-01-25 5:38 ` John Crispin 2017-01-25 5:38 ` John Crispin 2017-01-23 11:29 ` [PATCH 09/16] arm: dts: add nand " John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 10/16] arm: dts: add mmc " John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 12/16] arm: dts: add mt7623-mt6323.dtsi file John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` John Crispin [this message] 2017-01-23 11:29 ` [PATCH 13/16] arm: dts: rename mt7623-evb.dts to arch/arm/boot/dts/mt7623n-rfb.dtsi John Crispin 2017-01-27 20:13 ` Rob Herring 2017-01-27 20:13 ` Rob Herring 2017-01-23 11:29 ` [PATCH 14/16] arm: dts: cleanup the mt7623n rfb uart nodes John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 15/16] arm: dts: enable the usb device on the mt7623n rfb John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:29 ` [PATCH 16/16] arm: dts: enable the nand device on the mt7623n nand rfb John Crispin 2017-01-23 11:29 ` John Crispin 2017-01-23 11:32 ` [PATCH 00/16] arm: dts: extend mt7623 support John Crispin 2017-01-23 11:32 ` John Crispin
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=1485170975-51813-14-git-send-email-john@phrozen.org \ --to=john-pj+rj9u5fofafugrpc6u6w@public.gmane.org \ --cc=afaerber-l3A5Bk7waGM@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.