Skip to contentSkip to conversation

sunxi: Add support for the Beelink-x2 STB

PATCH New codekipper at gmail.com 2 participants 4 messages Jan 21, 2018 – Jan 22, 2018

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

codekipper at gmail.com

author
#0 lore raw

PATCH 1/1 sunxi: Add support for the Beelink-x2 STB

From: Marcus Cooper <[email protected]>

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 <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 9540ba4313..f899cef7ac 100644
@@ -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 \
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +155 -0

155 lines not on this page · raw message

board/sunxi/MAINTAINERS +5 -0
index 362edffc42..1ec7edef13 100644
@@ -143,6 +143,11 @@ M:	Jagan Teki <[email protected]>
 S:	Maintained
 F:	configs/bananapi_m64_defconfig
 
+BEELINK X2 BOARD
+M:	Marcus Cooper <[email protected]>
+S:	Maintained
+F:	configs/beelink_x2_defconfig
+
 COLOMBUS BOARD
 M:	Maxime Ripard <[email protected]>
 S:	Maintained
configs/beelink_x2_defconfig new file +18 -0
new file mode 100644
index 0000000000..0b9386609e
@@ -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
Signature · 1 line
2.16.0
#1 lore raw

PATCH 1/1 sunxi: Add support for the Beelink-x2 STB

Hi,

Quoted 180 lines · codekipper at gmail.com

From: Marcus Cooper <[email protected]>

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 <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 9540ba4313..f899cef7ac 100644
@@ -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 \
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +145 -0
new file mode 100644
index 0000000000..43f67eb8db
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 Marcus Cooper <[email protected]>
+ *
+ * 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 at 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 = <&reg_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 = <&reg_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 at 1 {
+		reg = <1>;
+	};
+};
+
+&mmc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_8bit_pins>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <8>;
+	non-removable;
+	cap-mmc-hw-reset;
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};

arch/arm/dts/sun8i-h3-beelink-x2.dts line 155

Quoted 10 lines
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +10 -0
+
+&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

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180122/3201c012/attachment.sig>
author
#2 lore raw

PATCH 1/1 sunxi: Add support for the Beelink-x2 STB

Quoted 187 lines · Maxime Ripard

Hi,

Quoted 184 lines · codekipper at gmail.com

From: Marcus Cooper <[email protected]>

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 <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 9540ba4313..f899cef7ac 100644
@@ -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 \
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +149 -0
new file mode 100644
index 0000000000..43f67eb8db
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 Marcus Cooper <[email protected]>
+ *
+ * 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 at 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 = <&reg_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 = <&reg_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 at 1 {
+             reg = <1>;
+     };
+};
+
+&mmc2 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&mmc2_8bit_pins>;
+     vmmc-supply = <&reg_vcc3v3>;
+     bus-width = <8>;
+     non-removable;
+     cap-mmc-hw-reset;
+     status = "okay";
+};
+
+&ohci1 {
+     status = "okay";
+};
+
+&uart0 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&uart0_pins_a>;
Quoted 8 lines

arch/arm/dts/sun8i-h3-beelink-x2.dts line 155

Quoted 6 lines
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +6 -0
+     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

Quoted 9 lines

Looks good otherwise!
Thanks!
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

#3 lore raw

PATCH 1/1 sunxi: Add support for the Beelink-x2 STB

Quoted 197 lines · Code Kipper
Quoted 187 lines · Maxime Ripard

Hi,

Quoted 184 lines · codekipper at gmail.com

From: Marcus Cooper <[email protected]>

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 <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 9540ba4313..f899cef7ac 100644
@@ -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 \
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +149 -0
new file mode 100644
index 0000000000..43f67eb8db
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 Marcus Cooper <[email protected]>
+ *
+ * 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 at 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 = <&reg_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 = <&reg_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 at 1 {
+             reg = <1>;
+     };
+};
+
+&mmc2 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&mmc2_8bit_pins>;
+     vmmc-supply = <&reg_vcc3v3>;
+     bus-width = <8>;
+     non-removable;
+     cap-mmc-hw-reset;
+     status = "okay";
+};
+
+&ohci1 {
+     status = "okay";
+};
+
+&uart0 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&uart0_pins_a>;
Quoted 8 lines

arch/arm/dts/sun8i-h3-beelink-x2.dts line 155

Quoted 6 lines
arch/arm/dts/sun8i-h3-beelink-x2.dts new file +6 -0
+     status = "okay";
+};
+
+&usbphy {
+     status = "okay";
+};

Where is that DT coming from? The one in Linux looks different.

Quoted 4 lines

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

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180122/63d85314/attachment.sig>