Message ID | tencent_DC7B4D416B69D6D6789356010B5B9647C606@qq.com |
---|---|
State | Changes Requested, archived |
Headers | show |
Series | sun7i-a20-marsboard.dts: add marsboard-a20 support | expand |
Context | Check | Description |
---|---|---|
robh/checkpatch | warning | total: 0 errors, 3 warnings, 238 lines checked |
robh/dtbs-check | success | |
robh/dt-meta-schema | success |
On Sat, Dec 25, 2021 at 12:43:41AM +0800, conleylee@foxmail.com wrote: > From: Conley Lee <conleylee@foxmail.com> > > ARM dts: sun7i: Add Marsboard A20 board > > This patch add support for Marsboard A20 board. > > The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD > card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 > USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. > > Signed-off-by: Conley Lee <conleylee@foxmail.com> > --- > .../devicetree/bindings/arm/sunxi.yaml | 5 + > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun7i-a20-marsboard.dts | 220 ++++++++++++++++++ Bindings and dts files should be separate patches. > 3 files changed, 226 insertions(+) > create mode 100644 arch/arm/boot/dts/sun7i-a20-marsboard.dts > > diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml > index 889128acf49a..4bd93ae26bd1 100644 > --- a/Documentation/devicetree/bindings/arm/sunxi.yaml > +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml > @@ -444,6 +444,11 @@ properties: > - const: haoyu,a10-marsboard > - const: allwinner,sun4i-a10 > > + - description: HAOYU Electronics Marsboard A20 > + items: > + - const: haoyu,a20-marsboard > + - const: allwinner,sun7i-a20 > + > - description: MapleBoard MP130 > items: > - const: mapleboard,mp130 > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 0de64f237cd8..4628a2617313 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-icnova-swac.dtb \ > sun7i-a20-lamobo-r1.dtb \ > sun7i-a20-linutronix-testbox-v2.dtb \ > + sun7i-a20-marsboard.dtb \ > sun7i-a20-m3.dtb \ > sun7i-a20-mk808c.dtb \ > sun7i-a20-olimex-som-evb.dtb \ > diff --git a/arch/arm/boot/dts/sun7i-a20-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > new file mode 100644 > index 000000000000..159e69e148e7 > --- /dev/null > +++ b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > @@ -0,0 +1,220 @@ > +/* > + * Copyright 2021 Conley Lee > + * Conley Lee <conleylee@foxmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file 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. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. Use SPDX tag instead. > + */ > + > +/dts-v1/; > +#include "sun7i-a20.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + model = "HAOYU Electronics Marsboard A20"; > + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_con_in: endpoint { > + remote-endpoint = <&hdmi_out_con>; > + }; > + }; > + }; > +}; > + > +&ahci { > + target-supply = <®_ahci_5v>; > + status = "okay"; > +}; > + > +&codec { > + status = "okay"; > +}; > + > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > +&de { > + status = "okay"; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&gmac_mii_pins { > + pins = "PA0", "PA1", "PA2", > + "PA3", "PA4", "PA5", "PA6", > + "PA7", "PA8", "PA9", "PA10", > + "PA11", "PA12", "PA13", "PA14", > + "PA15", "PA16", "PA17"; > +}; > + > +&gmac { > + pinctrl-names = "default"; > + pinctrl-0 = <&gmac_mii_pins>; > + phy-handle = <&phy0>; > + phy-mode = "mii"; > + status = "okay"; > +}; > + > +&hdmi { > + status = "okay"; > +}; > + > +&hdmi_out { > + hdmi_out_con: endpoint { > + remote-endpoint = <&hdmi_con_in>; > + }; > +}; > + > +&i2c0 { > + status = "okay"; > + > + axp209: pmic@34 { > + reg = <0x34>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > + }; > +}; > + > +&mmc0 { > + vmmc-supply = <®_vcc3v3>; > + bus-width = <4>; > + cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ > + status = "okay"; > +}; > + > +&gmac_mdio { > + phy0: ethernet-phy@0 { > + reg = <0>; > + }; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&ohci1 { > + status = "okay"; > +}; > + > +&otg_sram { > + status = "okay"; > +}; > + > +®_ahci_5v { > + status = "okay"; > +}; > + > +#include "axp209.dtsi" > + > +&ac_power_supply { > + status = "okay"; > +}; > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1450000>; > + regulator-name = "vdd-cpu"; > +}; > + > +®_dcdc3 { > + regulator-always-on; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-int-dll"; > +}; > + > +®_ldo1 { > + regulator-name = "vdd-rtc"; > +}; > + > +®_ldo2 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "avcc"; > +}; > + > +®_usb1_vbus { > + status = "okay"; > +}; > + > +®_usb2_vbus { > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pb_pins>; > + status = "okay"; > +}; > + > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > +&usbphy { > + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ > + usb1_vbus-supply = <®_usb1_vbus>; > + usb2_vbus-supply = <®_usb2_vbus>; > + status = "okay"; > +}; > -- > 2.34.1 > >
Hi, On Wed, Jan 05, 2022 at 10:45:50AM +0800, conleylee@foxmail.com wrote: > From: conley <conleylee@foxmail.com> This should be your full name in the author and signed-off-by > ARM dts: sun7i: Add Marsboard A20 board > > This patch add support for Marsboard A20 board. > > The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD > card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 > USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. > > Change since v1. > - Spearate biddings and dts as two patches. > - use SPDX tag And the changelog should be after the --- below > Signed-off-by: conley <conleylee@foxmail.com> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun7i-a20-marsboard.dts | 183 ++++++++++++++++++++++ > 2 files changed, 184 insertions(+) > create mode 100644 arch/arm/boot/dts/sun7i-a20-marsboard.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 0de64f237cd8..4628a2617313 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-icnova-swac.dtb \ > sun7i-a20-lamobo-r1.dtb \ > sun7i-a20-linutronix-testbox-v2.dtb \ > + sun7i-a20-marsboard.dtb \ > sun7i-a20-m3.dtb \ > sun7i-a20-mk808c.dtb \ > sun7i-a20-olimex-som-evb.dtb \ > diff --git a/arch/arm/boot/dts/sun7i-a20-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > new file mode 100644 > index 000000000000..7ab6aa30fee6 > --- /dev/null > +++ b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > @@ -0,0 +1,183 @@ > +// SPDX-License-Identifier: LGPL-2.1+ The license for DT files is usually a dual-license with GPL and MIT, which would be: SPDX-License-Identifier: (GPL-2.0+ OR MIT) You can't link to a DT, so GPL and LGPL should be equivalent here, and MIT is useful for other projects (like the *BSD) that reuse the DT. > +/* > + * Copyright 2021 Conley Lee > + * Conley Lee <conleylee@foxmail.com> > + */ > + > +/dts-v1/; > +#include "sun7i-a20.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + model = "HAOYU Electronics Marsboard A20"; > + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; Is there multiple boards called marsboard? If not, then the compatible should be haoyu,marsboard. The file name should be sun7i-a20-haoyu-marsboard too. > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_con_in: endpoint { > + remote-endpoint = <&hdmi_out_con>; > + }; > + }; > + }; > +}; > + > +&ahci { > + target-supply = <®_ahci_5v>; > + status = "okay"; > +}; > + > +&codec { > + status = "okay"; > +}; > + > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > +&de { > + status = "okay"; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&gmac_mii_pins { > + pins = "PA0", "PA1", "PA2", > + "PA3", "PA4", "PA5", "PA6", > + "PA7", "PA8", "PA9", "PA10", > + "PA11", "PA12", "PA13", "PA14", > + "PA15", "PA16", "PA17"; > +}; Why do you need that node? Maxime
On 01/11/22 at 11:35上午, Maxime Ripard wrote: > Date: Tue, 11 Jan 2022 11:35:42 +0100 > From: Maxime Ripard <maxime@cerno.tech> > To: conleylee@foxmail.com > Cc: robh@kernel.org, wens@csie.org, devicetree@vger.kernel.org, > linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2 1/2] sun7i-a20-marsboard.dts: add marsboard-a20 > support > > Hi, > > On Wed, Jan 05, 2022 at 10:45:50AM +0800, conleylee@foxmail.com wrote: > > From: conley <conleylee@foxmail.com> > > This should be your full name in the author and signed-off-by > > > ARM dts: sun7i: Add Marsboard A20 board > > > > This patch add support for Marsboard A20 board. > > > > The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD > > card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 > > USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. > > > > Change since v1. > > - Spearate biddings and dts as two patches. > > - use SPDX tag > > And the changelog should be after the --- below > > > Signed-off-by: conley <conleylee@foxmail.com> > > --- > > arch/arm/boot/dts/Makefile | 1 + > > arch/arm/boot/dts/sun7i-a20-marsboard.dts | 183 ++++++++++++++++++++++ > > 2 files changed, 184 insertions(+) > > create mode 100644 arch/arm/boot/dts/sun7i-a20-marsboard.dts > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index 0de64f237cd8..4628a2617313 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > > sun7i-a20-icnova-swac.dtb \ > > sun7i-a20-lamobo-r1.dtb \ > > sun7i-a20-linutronix-testbox-v2.dtb \ > > + sun7i-a20-marsboard.dtb \ > > sun7i-a20-m3.dtb \ > > sun7i-a20-mk808c.dtb \ > > sun7i-a20-olimex-som-evb.dtb \ > > diff --git a/arch/arm/boot/dts/sun7i-a20-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > > new file mode 100644 > > index 000000000000..7ab6aa30fee6 > > --- /dev/null > > +++ b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > > @@ -0,0 +1,183 @@ > > +// SPDX-License-Identifier: LGPL-2.1+ > > The license for DT files is usually a dual-license with GPL and MIT, > which would be: > > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > You can't link to a DT, so GPL and LGPL should be equivalent here, and > MIT is useful for other projects (like the *BSD) that reuse the DT. > > > +/* > > + * Copyright 2021 Conley Lee > > + * Conley Lee <conleylee@foxmail.com> > > + */ > > + > > +/dts-v1/; > > +#include "sun7i-a20.dtsi" > > +#include "sunxi-common-regulators.dtsi" > > + > > +#include <dt-bindings/gpio/gpio.h> > > +#include <dt-bindings/interrupt-controller/irq.h> > > + > > +/ { > > + model = "HAOYU Electronics Marsboard A20"; > > + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; > > Is there multiple boards called marsboard? > > If not, then the compatible should be haoyu,marsboard. > > The file name should be sun7i-a20-haoyu-marsboard too. > > > + aliases { > > + serial0 = &uart0; > > + }; > > + > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > + > > + hdmi-connector { > > + compatible = "hdmi-connector"; > > + type = "a"; > > + > > + port { > > + hdmi_con_in: endpoint { > > + remote-endpoint = <&hdmi_out_con>; > > + }; > > + }; > > + }; > > +}; > > + > > +&ahci { > > + target-supply = <®_ahci_5v>; > > + status = "okay"; > > +}; > > + > > +&codec { > > + status = "okay"; > > +}; > > + > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > +&de { > > + status = "okay"; > > +}; > > + > > +&ehci0 { > > + status = "okay"; > > +}; > > + > > +&ehci1 { > > + status = "okay"; > > +}; > > + > > +&gmac_mii_pins { > > + pins = "PA0", "PA1", "PA2", > > + "PA3", "PA4", "PA5", "PA6", > > + "PA7", "PA8", "PA9", "PA10", > > + "PA11", "PA12", "PA13", "PA14", > > + "PA15", "PA16", "PA17"; > > +}; > > Why do you need that node? > > Maxime 1. There are two boards called marsboard, another one is based on sun4i-a10. 2. About the gmac_mii_pins node: the pin PA17 is connected to PHY as EXTERR signal on sun7i-a20-marsboard, it's different from the definetion in dtsi. Thanks ~
ARM dts: sun7i: Add Marsboard A20 board This patch add support for Marsboard A20 board, patch 1 is for the dts file and patch 2 is for the biddings The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. Change since v1. - Spearate biddings and dts as two patches. - use SPDX tag Change since v2. - reformat patch - dual-license with GPL and MIT - rename dts filename to sun7i-a20-haoyu-marsboard.dts Conley Lee (2): sun7i-a20-haoyu-marsboard.dts: add marsboard-a20 support sunxi.yaml: add HAOYU Electronics Marsboard A20 .../devicetree/bindings/arm/sunxi.yaml | 5 + arch/arm/boot/dts/Makefile | 1 + .../boot/dts/sun7i-a20-haoyu-marsboard.dts | 183 ++++++++++++++++++ 3 files changed, 189 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts
Hi, On Wed, Jan 12, 2022 at 10:37:55AM +0800, Conley Lee wrote: > On 01/11/22 at 11:35上午, Maxime Ripard wrote: > > Date: Tue, 11 Jan 2022 11:35:42 +0100 > > From: Maxime Ripard <maxime@cerno.tech> > > To: conleylee@foxmail.com > > Cc: robh@kernel.org, wens@csie.org, devicetree@vger.kernel.org, > > linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > > Subject: Re: [PATCH v2 1/2] sun7i-a20-marsboard.dts: add marsboard-a20 > > support > > > > Hi, > > > > On Wed, Jan 05, 2022 at 10:45:50AM +0800, conleylee@foxmail.com wrote: > > > From: conley <conleylee@foxmail.com> > > > > This should be your full name in the author and signed-off-by > > > > > ARM dts: sun7i: Add Marsboard A20 board > > > > > > This patch add support for Marsboard A20 board. > > > > > > The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD > > > card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 > > > USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. > > > > > > Change since v1. > > > - Spearate biddings and dts as two patches. > > > - use SPDX tag > > > > And the changelog should be after the --- below > > > > > Signed-off-by: conley <conleylee@foxmail.com> > > > --- > > > arch/arm/boot/dts/Makefile | 1 + > > > arch/arm/boot/dts/sun7i-a20-marsboard.dts | 183 ++++++++++++++++++++++ > > > 2 files changed, 184 insertions(+) > > > create mode 100644 arch/arm/boot/dts/sun7i-a20-marsboard.dts > > > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > > index 0de64f237cd8..4628a2617313 100644 > > > --- a/arch/arm/boot/dts/Makefile > > > +++ b/arch/arm/boot/dts/Makefile > > > @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > > > sun7i-a20-icnova-swac.dtb \ > > > sun7i-a20-lamobo-r1.dtb \ > > > sun7i-a20-linutronix-testbox-v2.dtb \ > > > + sun7i-a20-marsboard.dtb \ > > > sun7i-a20-m3.dtb \ > > > sun7i-a20-mk808c.dtb \ > > > sun7i-a20-olimex-som-evb.dtb \ > > > diff --git a/arch/arm/boot/dts/sun7i-a20-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > > > new file mode 100644 > > > index 000000000000..7ab6aa30fee6 > > > --- /dev/null > > > +++ b/arch/arm/boot/dts/sun7i-a20-marsboard.dts > > > @@ -0,0 +1,183 @@ > > > +// SPDX-License-Identifier: LGPL-2.1+ > > > > The license for DT files is usually a dual-license with GPL and MIT, > > which would be: > > > > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > You can't link to a DT, so GPL and LGPL should be equivalent here, and > > MIT is useful for other projects (like the *BSD) that reuse the DT. > > > > > +/* > > > + * Copyright 2021 Conley Lee > > > + * Conley Lee <conleylee@foxmail.com> > > > + */ > > > + > > > +/dts-v1/; > > > +#include "sun7i-a20.dtsi" > > > +#include "sunxi-common-regulators.dtsi" > > > + > > > +#include <dt-bindings/gpio/gpio.h> > > > +#include <dt-bindings/interrupt-controller/irq.h> > > > + > > > +/ { > > > + model = "HAOYU Electronics Marsboard A20"; > > > + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; > > > > Is there multiple boards called marsboard? > > > > If not, then the compatible should be haoyu,marsboard. > > > > The file name should be sun7i-a20-haoyu-marsboard too. > > > > > + aliases { > > > + serial0 = &uart0; > > > + }; > > > + > > > + chosen { > > > + stdout-path = "serial0:115200n8"; > > > + }; > > > + > > > + hdmi-connector { > > > + compatible = "hdmi-connector"; > > > + type = "a"; > > > + > > > + port { > > > + hdmi_con_in: endpoint { > > > + remote-endpoint = <&hdmi_out_con>; > > > + }; > > > + }; > > > + }; > > > +}; > > > + > > > +&ahci { > > > + target-supply = <®_ahci_5v>; > > > + status = "okay"; > > > +}; > > > + > > > +&codec { > > > + status = "okay"; > > > +}; > > > + > > > +&cpu0 { > > > + cpu-supply = <®_dcdc2>; > > > +}; > > > + > > > +&de { > > > + status = "okay"; > > > +}; > > > + > > > +&ehci0 { > > > + status = "okay"; > > > +}; > > > + > > > +&ehci1 { > > > + status = "okay"; > > > +}; > > > + > > > +&gmac_mii_pins { > > > + pins = "PA0", "PA1", "PA2", > > > + "PA3", "PA4", "PA5", "PA6", > > > + "PA7", "PA8", "PA9", "PA10", > > > + "PA11", "PA12", "PA13", "PA14", > > > + "PA15", "PA16", "PA17"; > > > +}; > > > > Why do you need that node? > > 1. There are two boards called marsboard, another one is based on > sun4i-a10. Ok > 2. About the gmac_mii_pins node: the pin PA17 is connected to PHY > as EXTERR signal on sun7i-a20-marsboard, it's different from > the definetion in dtsi. The A20-Olinuxino-Micro has the same thing then, please do it like they did. Maxime
On Wed, Jan 12, 2022 at 11:13:46AM +0800, Conley Lee wrote: > Add sun7i-a20-haoyu-marsboard.dts to support haoyu marsboard a20 SBC A description of the board would be nice > Signed-off-by: Conley Lee <conleylee@foxmail.com> > --- > arch/arm/boot/dts/Makefile | 1 + > .../boot/dts/sun7i-a20-haoyu-marsboard.dts | 183 ++++++++++++++++++ > 2 files changed, 184 insertions(+) > create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 0de64f237cd8..5f1602d62927 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-icnova-swac.dtb \ > sun7i-a20-lamobo-r1.dtb \ > sun7i-a20-linutronix-testbox-v2.dtb \ > + sun7i-a20-haoyu-marsboard.dtb \ This should be ordered alphabetically > sun7i-a20-m3.dtb \ > sun7i-a20-mk808c.dtb \ > sun7i-a20-olimex-som-evb.dtb \ > diff --git a/arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts > new file mode 100644 > index 000000000000..4c6c6ae0c459 > --- /dev/null > +++ b/arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts > @@ -0,0 +1,183 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright 2021 Conley Lee > + * Conley Lee <conleylee@foxmail.com> > + */ > + > +/dts-v1/; > +#include "sun7i-a20.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + model = "HAOYU Electronics Marsboard A20"; > + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_con_in: endpoint { > + remote-endpoint = <&hdmi_out_con>; > + }; > + }; > + }; > +}; > + > +&ahci { > + target-supply = <®_ahci_5v>; > + status = "okay"; > +}; > + > +&codec { > + status = "okay"; > +}; > + > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > +&de { > + status = "okay"; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&gmac_mii_pins { > + pins = "PA0", "PA1", "PA2", > + "PA3", "PA4", "PA5", "PA6", > + "PA7", "PA8", "PA9", "PA10", > + "PA11", "PA12", "PA13", "PA14", > + "PA15", "PA16", "PA17"; > +}; See my comment on v3 Maxime
On Wed, Jan 12, 2022 at 11:13:46AM +0800, Conley Lee wrote: > Add sun7i-a20-haoyu-marsboard.dts to support haoyu marsboard a20 SBC > > Signed-off-by: Conley Lee <conleylee@foxmail.com> Also, the commit title prefix must be ARM: dts: sun7i: Add A20-Marsboard Maxime
On Sat, 15 Jan 2022 00:31:47 +0800, Conley Lee wrote: > The Marsboard A20 is a A20 based SBC with 1G RAM, 8G Flash, micro SD > card slot , SATA socketm 10/100 ethernet, HDMI port, 4 USB2.0 ports, 2 > USB2.0 OTG, USB WIFI(RTL8188EU) with antenna. > > Applied to local tree (sunxi/dt-for-5.18). Thanks! Maxime
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml index 889128acf49a..4bd93ae26bd1 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.yaml +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml @@ -444,6 +444,11 @@ properties: - const: haoyu,a10-marsboard - const: allwinner,sun4i-a10 + - description: HAOYU Electronics Marsboard A20 + items: + - const: haoyu,a20-marsboard + - const: allwinner,sun7i-a20 + - description: MapleBoard MP130 items: - const: mapleboard,mp130 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0de64f237cd8..4628a2617313 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1219,6 +1219,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-icnova-swac.dtb \ sun7i-a20-lamobo-r1.dtb \ sun7i-a20-linutronix-testbox-v2.dtb \ + sun7i-a20-marsboard.dtb \ sun7i-a20-m3.dtb \ sun7i-a20-mk808c.dtb \ sun7i-a20-olimex-som-evb.dtb \ diff --git a/arch/arm/boot/dts/sun7i-a20-marsboard.dts b/arch/arm/boot/dts/sun7i-a20-marsboard.dts new file mode 100644 index 000000000000..159e69e148e7 --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-marsboard.dts @@ -0,0 +1,220 @@ +/* + * Copyright 2021 Conley Lee + * Conley Lee <conleylee@foxmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file 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. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "sun7i-a20.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + model = "HAOYU Electronics Marsboard A20"; + compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + hdmi-connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; +}; + +&ahci { + target-supply = <®_ahci_5v>; + status = "okay"; +}; + +&codec { + status = "okay"; +}; + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +&de { + status = "okay"; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&gmac_mii_pins { + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16", "PA17"; +}; + +&gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_mii_pins>; + phy-handle = <&phy0>; + phy-mode = "mii"; + status = "okay"; +}; + +&hdmi { + status = "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&i2c0 { + status = "okay"; + + axp209: pmic@34 { + reg = <0x34>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + }; +}; + +&mmc0 { + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ + status = "okay"; +}; + +&gmac_mdio { + phy0: ethernet-phy@0 { + reg = <0>; + }; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&otg_sram { + status = "okay"; +}; + +®_ahci_5v { + status = "okay"; +}; + +#include "axp209.dtsi" + +&ac_power_supply { + status = "okay"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-int-dll"; +}; + +®_ldo1 { + regulator-name = "vdd-rtc"; +}; + +®_ldo2 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + +®_usb1_vbus { + status = "okay"; +}; + +®_usb2_vbus { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usbphy { + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ + usb1_vbus-supply = <®_usb1_vbus>; + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +};