On Sun, 26 May 2019 at 08:42, Jernej Škrabec <jernej.skra...@gmail.com> wrote: > > Hi! > > Dne nedelja, 26. maj 2019 ob 08:28:41 CEST je codekip...@gmail.com napisal(a): > > From: Marcus Cooper <codekip...@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, an IR receiver, a > > dual colour LED and an optical S/PDIF connector. > > > > Signed-off-by: Marcus Cooper <codekip...@gmail.com> > > --- > > Changes in v4: > > - updated dts to reflex current linux kernel status > > > > Changes in v3: > > - Removed incorrect commit author > > - Included v1-v2 change info > > > > Changes in v2: > > - updated dts to reflex current linux kernel status > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/sun8i-h3-beelink-x2.dts | 216 +++++++++++++++++++++++++++ > > board/sunxi/MAINTAINERS | 5 + > > configs/beelink_x2_defconfig | 19 +++ > > 4 files changed, 241 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 83058c4452..716108dd2e 100644 > > --- a/arch/arm/dts/Makefile > > +++ b/arch/arm/dts/Makefile > > @@ -472,6 +472,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ > > sun8i-h2-plus-orangepi-r1.dtb \ > > 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-nanopi-m1.dtb \ > > sun8i-h3-nanopi-m1-plus.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..25540b7694 > > --- /dev/null > > +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts > > @@ -0,0 +1,216 @@ > > +/* > > + * Copyright (C) 2017 Marcus Cooper <codekip...@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 = &emac; > > + ethernet1 = &sdiowifi; > > + }; > > + > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > + > > + connector { > > + compatible = "hdmi-connector"; > > + type = "a"; > > + > > + port { > > + hdmi_con_in: endpoint { > > + remote-endpoint = <&hdmi_out_con>; > > + }; > > + }; > > + }; > > + > > + 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 */ > > + }; > > + > > + sound_spdif { > > + compatible = "simple-audio-card"; > > + simple-audio-card,name = "On-board SPDIF"; > > + > > + simple-audio-card,cpu { > > + sound-dai = <&spdif>; > > + }; > > + > > + simple-audio-card,codec { > > + sound-dai = <&spdif_out>; > > + }; > > + }; > > + > > + spdif_out: spdif-out { > > + #sound-dai-cells = <0>; > > + compatible = "linux,spdif-dit"; > > + }; > > +}; > > + > > +&de { > > + status = "okay"; > > +}; > > + > > +&ehci0 { > > + status = "okay"; > > +}; > > + > > +&ehci1 { > > + status = "okay"; > > +}; > > + > > +&emac { > > + phy-handle = <&int_mii_phy>; > > + phy-mode = "mii"; > > + allwinner,leds-active-low; > > + status = "okay"; > > +}; > > + > > +&hdmi { > > + status = "okay"; > > +}; > > + > > +&hdmi_out { > > + hdmi_out_con: endpoint { > > + remote-endpoint = <&hdmi_con_in>; > > + }; > > +}; > > + > > +&ir { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&ir_pins_a>; > > + status = "okay"; > > +}; > > + > > +&mmc0 { > > + vmmc-supply = <®_vcc3v3>; > > + bus-width = <4>; > > + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ > > + status = "okay"; > > +}; > > + > > +&mmc1 { > > + 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"; > > +}; > > + > > +&ohci0 { > > + status = "okay"; > > +}; > > + > > +&ohci1 { > > + status = "okay"; > > +}; > > + > > +®_usb0_vbus { > > + gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ > > + status = "okay"; > > +}; > > + > > +&spdif { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&spdif_tx_pins_a>; > > + status = "okay"; > > +}; > > + > > +&uart0 { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&uart0_pins_a>; > > + status = "okay"; > > +}; > > + > > +&usb_otg { > > + dr_mode = "otg"; > > + status = "okay"; > > +}; > > + > > +&usbphy { > > + /* USB VBUS is always on except for the OTG port */ > > + status = "okay"; > > + usb0_id_det-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA07 */ > > + usb0_vbus-supply = <®_usb0_vbus>; > > +}; > > diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS > > index bdd1854197..28f2bece40 100644 > > --- a/board/sunxi/MAINTAINERS > > +++ b/board/sunxi/MAINTAINERS > > @@ -172,6 +172,11 @@ S: Maintained > > F: configs/beelink_gs1_defconfig > > F: arch/arm/dts/sun50i-h6-beelink-gs1.dts > > > > +BEELINK X2 BOARD > > +M: Marcus Cooper <codekip...@gmail.com> > > +S: Maintained > > +F: configs/beelink_x2_defconfig > > + > > COLOMBUS BOARD > > M: Maxime Ripard <maxime.rip...@bootlin.com> > > S: Maintained > > diff --git a/configs/beelink_x2_defconfig b/configs/beelink_x2_defconfig > > new file mode 100644 > > index 0000000000..6508e470a0 > > --- /dev/null > > +++ b/configs/beelink_x2_defconfig > > @@ -0,0 +1,19 @@ > > +CONFIG_ARM=y > > +CONFIG_ARCH_SUNXI=y > > +CONFIG_SPL=y > > +CONFIG_MACH_SUN8I_H3=y > > +CONFIG_DRAM_CLK=624 > > Android on my Beelink X2 box sets DRAM clock to 576 MHz, did you check yours? > > > +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_I2C_SUPPORT=y > > +# CONFIG_CMD_FLASH is not set > > +# CONFIG_SPL_DOS_PARTITION is not set > > +# CONFIG_SPL_EFI_PARTITION is not set > > +CONFIG_SUN8I_EMAC=y > > +CONFIG_SY8106A_POWER=y > > I'm pretty sure that my Beelink X2 doesn't have SY8106A regulator. In fact, it > doesn't have any regulator for CPU voltage (it's fixed). I think you should > drop this and CONFIG_SPL_I2C_SUPPORT line from defconfig. > > I know there are at least two models of Beelink X2 (different wifi), but I > think > both are missing CPU regulator. > > Best regards, > Jernej
ACK thanks, CK > > > +CONFIG_USB_EHCI_HCD=y > > +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > > > > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot