| Message ID | 20180121180649.5145-1-codekipper@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | [U-Boot] sunxi: Add support for the Beelink-x2 STB | expand |
Hi, On Sun, Jan 21, 2018 at 07:06:49PM +0100, codekipper@gmail.com wrote: > From: Marcus Cooper <codekipper@gmail.com> > > The Beelink X2 is an STB based on the Allwinner H3 SoC with a uSD slot, > 2 USB ports( 1 * USB-2 Host, 1 USB OTG), a 10/100M ethernet port using > the SoC's integrated PHY, Wifi via an sdio wifi chip, HDMI, a dual > colour LED, an IR receiver and an optical S/PDIF connector. > > Signed-off-by: Marcus Cooper <codekipper@gmail.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun8i-h3-beelink-x2.dts | 155 +++++++++++++++++++++++++++++++++++ > board/sunxi/MAINTAINERS | 5 ++ > configs/beelink_x2_defconfig | 18 ++++ > 4 files changed, 179 insertions(+) > create mode 100644 arch/arm/dts/sun8i-h3-beelink-x2.dts > create mode 100644 configs/beelink_x2_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 9540ba4313..f899cef7ac 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ > dtb-$(CONFIG_MACH_SUN8I_H3) += \ > sun8i-h2-plus-orangepi-zero.dtb \ > sun8i-h3-bananapi-m2-plus.dtb \ > + sun8i-h3-beelink-x2.dtb \ > sun8i-h3-libretech-all-h3-cc.dtb \ > sun8i-h3-orangepi-2.dtb \ > sun8i-h3-orangepi-lite.dtb \ > diff --git a/arch/arm/dts/sun8i-h3-beelink-x2.dts b/arch/arm/dts/sun8i-h3-beelink-x2.dts > new file mode 100644 > index 0000000000..43f67eb8db > --- /dev/null > +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts > @@ -0,0 +1,155 @@ > +/* > + * Copyright (C) 2017 Marcus Cooper <codekipper@gmail.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 "sun8i-h3.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > + > +/ { > + model = "Beelink X2"; > + compatible = "roofull,beelink-x2", "allwinner,sun8i-h3"; > + > + aliases { > + serial0 = &uart0; > + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ > + ethernet1 = &sdiowifi; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + blue { > + label = "beelink-x2:blue:pwr"; > + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ > + default-state = "on"; > + }; > + > + red { > + label = "beelink-x2:red:standby"; > + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ > + }; > + }; > + > + wifi_pwrseq: wifi_pwrseq { > + compatible = "mmc-pwrseq-simple"; > + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ > + }; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&emac { > + phy = <&phy1>; > + phy-mode = "mii"; > + allwinner,use-internal-phy; > + allwinner,leds-active-low; > + status = "okay"; > + phy1: ethernet-phy@1 { > + reg = <1>; > + }; > +}; > + > +&ir { > + pinctrl-names = "default"; > + pinctrl-0 = <&ir_pins_a>; > + status = "okay"; > +}; > + > +&mmc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; > + vmmc-supply = <®_vcc3v3>; > + bus-width = <4>; > + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ > + cd-inverted; > + status = "okay"; > +}; > + > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins_a>; > + vmmc-supply = <®_vcc3v3>; > + bus-width = <4>; > + non-removable; > + status = "okay"; > + > + /* > + * Explicitly define the sdio device, so that we can add an ethernet > + * alias for it (which e.g. makes u-boot set a mac-address). > + */ > + sdiowifi: sdio_wifi@1 { > + reg = <1>; > + }; > +}; > + > +&mmc2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc2_8bit_pins>; > + vmmc-supply = <®_vcc3v3>; > + bus-width = <8>; > + non-removable; > + cap-mmc-hw-reset; > + status = "okay"; > +}; > + > +&ohci1 { > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_a>; > + status = "okay"; > +}; > + > +&usbphy { > + status = "okay"; > +}; Where is that DT coming from? The one in Linux looks different. Looks good otherwise! Thanks! Maxime
On 22 January 2018 at 09:04, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Hi, > > On Sun, Jan 21, 2018 at 07:06:49PM +0100, codekipper@gmail.com wrote: >> From: Marcus Cooper <codekipper@gmail.com> >> >> The Beelink X2 is an STB based on the Allwinner H3 SoC with a uSD slot, >> 2 USB ports( 1 * USB-2 Host, 1 USB OTG), a 10/100M ethernet port using >> the SoC's integrated PHY, Wifi via an sdio wifi chip, HDMI, a dual >> colour LED, an IR receiver and an optical S/PDIF connector. >> >> Signed-off-by: Marcus Cooper <codekipper@gmail.com> >> --- >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/sun8i-h3-beelink-x2.dts | 155 +++++++++++++++++++++++++++++++++++ >> board/sunxi/MAINTAINERS | 5 ++ >> configs/beelink_x2_defconfig | 18 ++++ >> 4 files changed, 179 insertions(+) >> create mode 100644 arch/arm/dts/sun8i-h3-beelink-x2.dts >> create mode 100644 configs/beelink_x2_defconfig >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index 9540ba4313..f899cef7ac 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ >> dtb-$(CONFIG_MACH_SUN8I_H3) += \ >> sun8i-h2-plus-orangepi-zero.dtb \ >> sun8i-h3-bananapi-m2-plus.dtb \ >> + sun8i-h3-beelink-x2.dtb \ >> sun8i-h3-libretech-all-h3-cc.dtb \ >> sun8i-h3-orangepi-2.dtb \ >> sun8i-h3-orangepi-lite.dtb \ >> diff --git a/arch/arm/dts/sun8i-h3-beelink-x2.dts b/arch/arm/dts/sun8i-h3-beelink-x2.dts >> new file mode 100644 >> index 0000000000..43f67eb8db >> --- /dev/null >> +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts >> @@ -0,0 +1,155 @@ >> +/* >> + * Copyright (C) 2017 Marcus Cooper <codekipper@gmail.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 "sun8i-h3.dtsi" >> +#include "sunxi-common-regulators.dtsi" >> + >> +#include <dt-bindings/gpio/gpio.h> >> +#include <dt-bindings/input/input.h> >> + >> +/ { >> + model = "Beelink X2"; >> + compatible = "roofull,beelink-x2", "allwinner,sun8i-h3"; >> + >> + aliases { >> + serial0 = &uart0; >> + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ >> + ethernet1 = &sdiowifi; >> + }; >> + >> + chosen { >> + stdout-path = "serial0:115200n8"; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + >> + blue { >> + label = "beelink-x2:blue:pwr"; >> + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ >> + default-state = "on"; >> + }; >> + >> + red { >> + label = "beelink-x2:red:standby"; >> + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ >> + }; >> + }; >> + >> + wifi_pwrseq: wifi_pwrseq { >> + compatible = "mmc-pwrseq-simple"; >> + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ >> + }; >> +}; >> + >> +&ehci1 { >> + status = "okay"; >> +}; >> + >> +&emac { >> + phy = <&phy1>; >> + phy-mode = "mii"; >> + allwinner,use-internal-phy; >> + allwinner,leds-active-low; >> + status = "okay"; >> + phy1: ethernet-phy@1 { >> + reg = <1>; >> + }; >> +}; >> + >> +&ir { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&ir_pins_a>; >> + status = "okay"; >> +}; >> + >> +&mmc0 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; >> + vmmc-supply = <®_vcc3v3>; >> + bus-width = <4>; >> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ >> + cd-inverted; >> + status = "okay"; >> +}; >> + >> +&mmc1 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&mmc1_pins_a>; >> + vmmc-supply = <®_vcc3v3>; >> + bus-width = <4>; >> + non-removable; >> + status = "okay"; >> + >> + /* >> + * Explicitly define the sdio device, so that we can add an ethernet >> + * alias for it (which e.g. makes u-boot set a mac-address). >> + */ >> + sdiowifi: sdio_wifi@1 { >> + reg = <1>; >> + }; >> +}; >> + >> +&mmc2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&mmc2_8bit_pins>; >> + vmmc-supply = <®_vcc3v3>; >> + bus-width = <8>; >> + non-removable; >> + cap-mmc-hw-reset; >> + status = "okay"; >> +}; >> + >> +&ohci1 { >> + status = "okay"; >> +}; >> + >> +&uart0 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&uart0_pins_a>; >> + status = "okay"; >> +}; >> + >> +&usbphy { >> + status = "okay"; >> +}; > > Where is that DT coming from? The one in Linux looks different. Hi Maxime, I stripped out the bits which haven't been included in uboot's sun8i-h3.dtsi(usb-otg, spdif). Maybe it's worth bumping all the sunxi dt's up to the latest revision. BR, CK > > Looks good otherwise! > Thanks! > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com
On Mon, Jan 22, 2018 at 09:20:06AM +0100, Code Kipper wrote: > On 22 January 2018 at 09:04, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Hi, > > > > On Sun, Jan 21, 2018 at 07:06:49PM +0100, codekipper@gmail.com wrote: > >> From: Marcus Cooper <codekipper@gmail.com> > >> > >> The Beelink X2 is an STB based on the Allwinner H3 SoC with a uSD slot, > >> 2 USB ports( 1 * USB-2 Host, 1 USB OTG), a 10/100M ethernet port using > >> the SoC's integrated PHY, Wifi via an sdio wifi chip, HDMI, a dual > >> colour LED, an IR receiver and an optical S/PDIF connector. > >> > >> Signed-off-by: Marcus Cooper <codekipper@gmail.com> > >> --- > >> arch/arm/dts/Makefile | 1 + > >> arch/arm/dts/sun8i-h3-beelink-x2.dts | 155 +++++++++++++++++++++++++++++++++++ > >> board/sunxi/MAINTAINERS | 5 ++ > >> configs/beelink_x2_defconfig | 18 ++++ > >> 4 files changed, 179 insertions(+) > >> create mode 100644 arch/arm/dts/sun8i-h3-beelink-x2.dts > >> create mode 100644 configs/beelink_x2_defconfig > >> > >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > >> index 9540ba4313..f899cef7ac 100644 > >> --- a/arch/arm/dts/Makefile > >> +++ b/arch/arm/dts/Makefile > >> @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ > >> dtb-$(CONFIG_MACH_SUN8I_H3) += \ > >> sun8i-h2-plus-orangepi-zero.dtb \ > >> sun8i-h3-bananapi-m2-plus.dtb \ > >> + sun8i-h3-beelink-x2.dtb \ > >> sun8i-h3-libretech-all-h3-cc.dtb \ > >> sun8i-h3-orangepi-2.dtb \ > >> sun8i-h3-orangepi-lite.dtb \ > >> diff --git a/arch/arm/dts/sun8i-h3-beelink-x2.dts b/arch/arm/dts/sun8i-h3-beelink-x2.dts > >> new file mode 100644 > >> index 0000000000..43f67eb8db > >> --- /dev/null > >> +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts > >> @@ -0,0 +1,155 @@ > >> +/* > >> + * Copyright (C) 2017 Marcus Cooper <codekipper@gmail.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 "sun8i-h3.dtsi" > >> +#include "sunxi-common-regulators.dtsi" > >> + > >> +#include <dt-bindings/gpio/gpio.h> > >> +#include <dt-bindings/input/input.h> > >> + > >> +/ { > >> + model = "Beelink X2"; > >> + compatible = "roofull,beelink-x2", "allwinner,sun8i-h3"; > >> + > >> + aliases { > >> + serial0 = &uart0; > >> + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ > >> + ethernet1 = &sdiowifi; > >> + }; > >> + > >> + chosen { > >> + stdout-path = "serial0:115200n8"; > >> + }; > >> + > >> + leds { > >> + compatible = "gpio-leds"; > >> + > >> + blue { > >> + label = "beelink-x2:blue:pwr"; > >> + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ > >> + default-state = "on"; > >> + }; > >> + > >> + red { > >> + label = "beelink-x2:red:standby"; > >> + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ > >> + }; > >> + }; > >> + > >> + wifi_pwrseq: wifi_pwrseq { > >> + compatible = "mmc-pwrseq-simple"; > >> + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ > >> + }; > >> +}; > >> + > >> +&ehci1 { > >> + status = "okay"; > >> +}; > >> + > >> +&emac { > >> + phy = <&phy1>; > >> + phy-mode = "mii"; > >> + allwinner,use-internal-phy; > >> + allwinner,leds-active-low; > >> + status = "okay"; > >> + phy1: ethernet-phy@1 { > >> + reg = <1>; > >> + }; > >> +}; > >> + > >> +&ir { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&ir_pins_a>; > >> + status = "okay"; > >> +}; > >> + > >> +&mmc0 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; > >> + vmmc-supply = <®_vcc3v3>; > >> + bus-width = <4>; > >> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ > >> + cd-inverted; > >> + status = "okay"; > >> +}; > >> + > >> +&mmc1 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&mmc1_pins_a>; > >> + vmmc-supply = <®_vcc3v3>; > >> + bus-width = <4>; > >> + non-removable; > >> + status = "okay"; > >> + > >> + /* > >> + * Explicitly define the sdio device, so that we can add an ethernet > >> + * alias for it (which e.g. makes u-boot set a mac-address). > >> + */ > >> + sdiowifi: sdio_wifi@1 { > >> + reg = <1>; > >> + }; > >> +}; > >> + > >> +&mmc2 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&mmc2_8bit_pins>; > >> + vmmc-supply = <®_vcc3v3>; > >> + bus-width = <8>; > >> + non-removable; > >> + cap-mmc-hw-reset; > >> + status = "okay"; > >> +}; > >> + > >> +&ohci1 { > >> + status = "okay"; > >> +}; > >> + > >> +&uart0 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&uart0_pins_a>; > >> + status = "okay"; > >> +}; > >> + > >> +&usbphy { > >> + status = "okay"; > >> +}; > > > > Where is that DT coming from? The one in Linux looks different. > Hi Maxime, > I stripped out the bits which haven't been included in uboot's > sun8i-h3.dtsi(usb-otg, spdif). Maybe it's worth bumping all the sunxi > dt's up to the latest revision. The way we deal with it is just to sync what's needed when needed. In this case, sun8i-h3.dtsi. The rest of the DT don't really need to be updated. Maxime
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9540ba4313..f899cef7ac 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ + sun8i-h3-beelink-x2.dtb \ sun8i-h3-libretech-all-h3-cc.dtb \ sun8i-h3-orangepi-2.dtb \ sun8i-h3-orangepi-lite.dtb \ diff --git a/arch/arm/dts/sun8i-h3-beelink-x2.dts b/arch/arm/dts/sun8i-h3-beelink-x2.dts new file mode 100644 index 0000000000..43f67eb8db --- /dev/null +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2017 Marcus Cooper <codekipper@gmail.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 "sun8i-h3.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Beelink X2"; + compatible = "roofull,beelink-x2", "allwinner,sun8i-h3"; + + aliases { + serial0 = &uart0; + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet1 = &sdiowifi; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + blue { + label = "beelink-x2:blue:pwr"; + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ + default-state = "on"; + }; + + red { + label = "beelink-x2:red:standby"; + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ + }; + }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + }; +}; + +&ehci1 { + status = "okay"; +}; + +&emac { + phy = <&phy1>; + phy-mode = "mii"; + allwinner,use-internal-phy; + allwinner,leds-active-low; + status = "okay"; + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + +&ir { + pinctrl-names = "default"; + pinctrl-0 = <&ir_pins_a>; + status = "okay"; +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ + cd-inverted; + status = "okay"; +}; + +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + non-removable; + status = "okay"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet + * alias for it (which e.g. makes u-boot set a mac-address). + */ + sdiowifi: sdio_wifi@1 { + reg = <1>; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 362edffc42..1ec7edef13 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -143,6 +143,11 @@ M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained F: configs/bananapi_m64_defconfig +BEELINK X2 BOARD +M: Marcus Cooper <codekipper@gmail.com> +S: Maintained +F: configs/beelink_x2_defconfig + COLOMBUS BOARD M: Maxime Ripard <maxime.ripard@free-electrons.com> S: Maintained diff --git a/configs/beelink_x2_defconfig b/configs/beelink_x2_defconfig new file mode 100644 index 0000000000..0b9386609e --- /dev/null +++ b/configs/beelink_x2_defconfig @@ -0,0 +1,18 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=624 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_CONSOLE_MUX=y +CONFIG_SPL=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_SUN8I_EMAC=y +CONFIG_SY8106A_POWER=y +CONFIG_USB_EHCI_HCD=y