diff mbox series

[U-Boot,v2,2/3] arm: dts: h6: Add Beelink GS1 initial support

Message ID 20190412141527.6049-3-peron.clem@gmail.com
State Changes Requested
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series Add Beelink GS1 Board | expand

Commit Message

Clément Péron April 12, 2019, 2:15 p.m. UTC 
Beelink GS1 is an Allwinner H6 based TV box,
which support:
- Allwinner H6 Quad-core 64-bit ARM Cortex-A53
- GPU Mali-T720
- 2GB LPDDR3 RAM
- 16GB eMMC
- AXP805 PMIC
- 1Gbps GMAC via RTL8211E
- USB 2.0 and 3.0 Host
- HDMI port
- S/PDIF port
- 5V/2A DC power supply
- Wi-Fi/BT via Fn-Link 6222B-SRB (RTL8222BS)

Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm/dts/Makefile                  |   1 +
 arch/arm/dts/sun50i-h6-beelink-gs1.dts | 184 +++++++++++++++++++++++++
 configs/beelink_gs1_defconfig          |  15 ++
 3 files changed, 200 insertions(+)
 create mode 100644 arch/arm/dts/sun50i-h6-beelink-gs1.dts
 create mode 100644 configs/beelink_gs1_defconfig

Comments

Jagan Teki April 14, 2019, 5:29 p.m. UTC | #1 
On Fri, Apr 12, 2019 at 7:45 PM Clément Péron <peron.clem@gmail.com> wrote:
>
> Beelink GS1 is an Allwinner H6 based TV box,
> which support:
> - Allwinner H6 Quad-core 64-bit ARM Cortex-A53
> - GPU Mali-T720
> - 2GB LPDDR3 RAM
> - 16GB eMMC
> - AXP805 PMIC
> - 1Gbps GMAC via RTL8211E
> - USB 2.0 and 3.0 Host
> - HDMI port
> - S/PDIF port
> - 5V/2A DC power supply
> - Wi-Fi/BT via Fn-Link 6222B-SRB (RTL8222BS)

Please dts sync commit details here.

>
> Signed-off-by: Clément Péron <peron.clem@gmail.com>
> ---
>  arch/arm/dts/Makefile                  |   1 +
>  arch/arm/dts/sun50i-h6-beelink-gs1.dts | 184 +++++++++++++++++++++++++

Seems like this has part of required nodes, sync the complete dts.

>  configs/beelink_gs1_defconfig          |  15 ++

Add entry on board/sunxi/MAINTAINERS

>  3 files changed, 200 insertions(+)
>  create mode 100644 arch/arm/dts/sun50i-h6-beelink-gs1.dts
>  create mode 100644 configs/beelink_gs1_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 86a01c2c70..61e7156284 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -467,6 +467,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
>         sun50i-h5-orangepi-prime.dtb \
>         sun50i-h5-orangepi-zero-plus2.dtb
>  dtb-$(CONFIG_MACH_SUN50I_H6) += \
> +       sun50i-h6-beelink-gs1.dtb \
>         sun50i-h6-orangepi-lite2.dtb \
>         sun50i-h6-orangepi-one-plus.dtb \
>         sun50i-h6-pine-h64.dtb
> diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> new file mode 100644
> index 0000000000..54b0882bed
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> @@ -0,0 +1,184 @@
> +// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +/*
> + * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com>
> + */
> +
> +/dts-v1/;
> +
> +#include "sun50i-h6.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> +       model = "Beelink GS1";
> +       compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
> +
> +       aliases {
> +               serial0 = &uart0;
> +       };
> +
> +       chosen {
> +               stdout-path = "serial0:115200n8";
> +       };
> +
> +       leds {
> +               compatible = "gpio-leds";
> +
> +               power {
> +                       label = "beelink:white:power";
> +                       gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
> +                       default-state = "on";
> +               };
> +       };
> +
> +       reg_vcc5v: vcc5v {
> +               /* board wide 5V supply directly from the DC jack */
> +               compatible = "regulator-fixed";
> +               regulator-name = "vcc-5v";
> +               regulator-min-microvolt = <5000000>;
> +               regulator-max-microvolt = <5000000>;
> +               regulator-always-on;
> +       };
> +};
> +
> +&mmc0 {
> +       vmmc-supply = <&reg_cldo1>;
> +       cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
> +       bus-width = <4>;
> +       status = "okay";
> +};
> +
> +&mmc2 {
> +       vmmc-supply = <&reg_cldo1>;
> +       vqmmc-supply = <&reg_bldo2>;
> +       non-removable;
> +       cap-mmc-hw-reset;
> +       bus-width = <8>;
> +       status = "okay";
> +};
> +
> +&r_i2c {
> +       status = "okay";
> +
> +       axp805: pmic@36 {
> +               compatible = "x-powers,axp805", "x-powers,axp806";
> +               reg = <0x36>;
> +               interrupt-parent = <&r_intc>;
> +               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +               interrupt-controller;
> +               #interrupt-cells = <1>;
> +               x-powers,self-working-mode;
> +               vina-supply = <&reg_vcc5v>;
> +               vinb-supply = <&reg_vcc5v>;
> +               vinc-supply = <&reg_vcc5v>;
> +               vind-supply = <&reg_vcc5v>;
> +               vine-supply = <&reg_vcc5v>;
> +               aldoin-supply = <&reg_vcc5v>;
> +               bldoin-supply = <&reg_vcc5v>;
> +               cldoin-supply = <&reg_vcc5v>;
> +
> +               regulators {
> +                       reg_aldo1: aldo1 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc-pl";
> +                       };
> +
> +                       reg_aldo2: aldo2 {
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc-ac200";
> +                               regulator-enable-ramp-delay = <100000>;
> +                       };
> +
> +                       reg_aldo3: aldo3 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc25-dram";
> +                       };
> +
> +                       reg_bldo1: bldo1 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <1800000>;
> +                               regulator-max-microvolt = <1800000>;
> +                               regulator-name = "vcc-bias-pll";
> +                       };
> +
> +                       reg_bldo2: bldo2 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <1800000>;
> +                               regulator-max-microvolt = <1800000>;
> +                               regulator-name = "vcc-efuse-pcie-hdmi-io";
> +                       };
> +
> +                       reg_bldo3: bldo3 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <1800000>;
> +                               regulator-max-microvolt = <1800000>;
> +                               regulator-name = "vcc-dcxoio";
> +                       };
> +
> +                       bldo4 {
> +                               /* unused */
> +                       };
> +
> +                       reg_cldo1: cldo1 {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc-3v3";
> +                       };
> +
> +                       reg_cldo2: cldo2 {
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc-wifi-1";
> +                       };
> +
> +                       reg_cldo3: cldo3 {
> +                               regulator-min-microvolt = <3300000>;
> +                               regulator-max-microvolt = <3300000>;
> +                               regulator-name = "vcc-wifi-2";
> +                       };
> +
> +                       reg_dcdca: dcdca {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <810000>;
> +                               regulator-max-microvolt = <1080000>;
> +                               regulator-name = "vdd-cpu";
> +                       };
> +
> +                       reg_dcdcc: dcdcc {
> +                               regulator-min-microvolt = <810000>;
> +                               regulator-max-microvolt = <1080000>;
> +                               regulator-name = "vdd-gpu";
> +                       };
> +
> +                       reg_dcdcd: dcdcd {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <960000>;
> +                               regulator-max-microvolt = <960000>;
> +                               regulator-name = "vdd-sys";
> +                       };
> +
> +                       reg_dcdce: dcdce {
> +                               regulator-always-on;
> +                               regulator-min-microvolt = <1200000>;
> +                               regulator-max-microvolt = <1200000>;
> +                               regulator-name = "vcc-dram";
> +                       };
> +
> +                       sw {
> +                               /* unused */
> +                       };
> +               };
> +       };
> +};
> +
> +&uart0 {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&uart0_ph_pins>;
> +       status = "okay";
> +};
> diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
> new file mode 100644
> index 0000000000..ef4dd29549
> --- /dev/null
> +++ b/configs/beelink_gs1_defconfig
> @@ -0,0 +1,15 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_SPL=y
> +CONFIG_MACH_SUN50I_H6=y
> +CONFIG_MMC0_CD_PIN="PF6"
> +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> +# CONFIG_PSCI_RESET is not set
> +CONFIG_NR_DRAM_BANKS=1
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +# CONFIG_CMD_FLASH is not set
> +# CONFIG_SPL_DOS_PARTITION is not set
> +# CONFIG_SPL_EFI_PARTITION is not set
> +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1"
> +CONFIG_LED=y
> +CONFIG_LED_GPIO=y

Seems like most of Allwinner gpio's are gpio-leds. so select LED
(since it's dm led core) in arch/arm/Kconfig if LED_GPIO. I'm thinking
this could be proper assignment.
Clément Péron April 14, 2019, 9:27 p.m. UTC | #2 
Hi,

On Sun, 14 Apr 2019 at 19:29, Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Fri, Apr 12, 2019 at 7:45 PM Clément Péron <peron.clem@gmail.com> wrote:
> >
> > Beelink GS1 is an Allwinner H6 based TV box,
> > which support:
> > - Allwinner H6 Quad-core 64-bit ARM Cortex-A53
> > - GPU Mali-T720
> > - 2GB LPDDR3 RAM
> > - 16GB eMMC
> > - AXP805 PMIC
> > - 1Gbps GMAC via RTL8211E
> > - USB 2.0 and 3.0 Host
> > - HDMI port
> > - S/PDIF port
> > - 5V/2A DC power supply
> > - Wi-Fi/BT via Fn-Link 6222B-SRB (RTL8222BS)
>
> Please dts sync commit details here.
>
> >
> > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> > ---
> >  arch/arm/dts/Makefile                  |   1 +
> >  arch/arm/dts/sun50i-h6-beelink-gs1.dts | 184 +++++++++++++++++++++++++
>
> Seems like this has part of required nodes, sync the complete dts.

Ok so you want to add the complete dts from linux.

I think only IP used in U-boot are needed.

I will do that in v3

>
> >  configs/beelink_gs1_defconfig          |  15 ++
>
> Add entry on board/sunxi/MAINTAINERS

Ok

>
> >  3 files changed, 200 insertions(+)
> >  create mode 100644 arch/arm/dts/sun50i-h6-beelink-gs1.dts
> >  create mode 100644 configs/beelink_gs1_defconfig
> >
> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > index 86a01c2c70..61e7156284 100644
> > --- a/arch/arm/dts/Makefile
> > +++ b/arch/arm/dts/Makefile
> > @@ -467,6 +467,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
> >         sun50i-h5-orangepi-prime.dtb \
> >         sun50i-h5-orangepi-zero-plus2.dtb
> >  dtb-$(CONFIG_MACH_SUN50I_H6) += \
> > +       sun50i-h6-beelink-gs1.dtb \
> >         sun50i-h6-orangepi-lite2.dtb \
> >         sun50i-h6-orangepi-one-plus.dtb \
> >         sun50i-h6-pine-h64.dtb
> > diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> > new file mode 100644
> > index 0000000000..54b0882bed
> > --- /dev/null
> > +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> > @@ -0,0 +1,184 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> > +/*
> > + * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com>
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "sun50i-h6.dtsi"
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > +       model = "Beelink GS1";
> > +       compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
> > +
> > +       aliases {
> > +               serial0 = &uart0;
> > +       };
> > +
> > +       chosen {
> > +               stdout-path = "serial0:115200n8";
> > +       };
> > +
> > +       leds {
> > +               compatible = "gpio-leds";
> > +
> > +               power {
> > +                       label = "beelink:white:power";
> > +                       gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
> > +                       default-state = "on";
> > +               };
> > +       };
> > +
> > +       reg_vcc5v: vcc5v {
> > +               /* board wide 5V supply directly from the DC jack */
> > +               compatible = "regulator-fixed";
> > +               regulator-name = "vcc-5v";
> > +               regulator-min-microvolt = <5000000>;
> > +               regulator-max-microvolt = <5000000>;
> > +               regulator-always-on;
> > +       };
> > +};
> > +
> > +&mmc0 {
> > +       vmmc-supply = <&reg_cldo1>;
> > +       cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
> > +       bus-width = <4>;
> > +       status = "okay";
> > +};
> > +
> > +&mmc2 {
> > +       vmmc-supply = <&reg_cldo1>;
> > +       vqmmc-supply = <&reg_bldo2>;
> > +       non-removable;
> > +       cap-mmc-hw-reset;
> > +       bus-width = <8>;
> > +       status = "okay";
> > +};
> > +
> > +&r_i2c {
> > +       status = "okay";
> > +
> > +       axp805: pmic@36 {
> > +               compatible = "x-powers,axp805", "x-powers,axp806";
> > +               reg = <0x36>;
> > +               interrupt-parent = <&r_intc>;
> > +               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> > +               interrupt-controller;
> > +               #interrupt-cells = <1>;
> > +               x-powers,self-working-mode;
> > +               vina-supply = <&reg_vcc5v>;
> > +               vinb-supply = <&reg_vcc5v>;
> > +               vinc-supply = <&reg_vcc5v>;
> > +               vind-supply = <&reg_vcc5v>;
> > +               vine-supply = <&reg_vcc5v>;
> > +               aldoin-supply = <&reg_vcc5v>;
> > +               bldoin-supply = <&reg_vcc5v>;
> > +               cldoin-supply = <&reg_vcc5v>;
> > +
> > +               regulators {
> > +                       reg_aldo1: aldo1 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc-pl";
> > +                       };
> > +
> > +                       reg_aldo2: aldo2 {
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc-ac200";
> > +                               regulator-enable-ramp-delay = <100000>;
> > +                       };
> > +
> > +                       reg_aldo3: aldo3 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc25-dram";
> > +                       };
> > +
> > +                       reg_bldo1: bldo1 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <1800000>;
> > +                               regulator-max-microvolt = <1800000>;
> > +                               regulator-name = "vcc-bias-pll";
> > +                       };
> > +
> > +                       reg_bldo2: bldo2 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <1800000>;
> > +                               regulator-max-microvolt = <1800000>;
> > +                               regulator-name = "vcc-efuse-pcie-hdmi-io";
> > +                       };
> > +
> > +                       reg_bldo3: bldo3 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <1800000>;
> > +                               regulator-max-microvolt = <1800000>;
> > +                               regulator-name = "vcc-dcxoio";
> > +                       };
> > +
> > +                       bldo4 {
> > +                               /* unused */
> > +                       };
> > +
> > +                       reg_cldo1: cldo1 {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc-3v3";
> > +                       };
> > +
> > +                       reg_cldo2: cldo2 {
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc-wifi-1";
> > +                       };
> > +
> > +                       reg_cldo3: cldo3 {
> > +                               regulator-min-microvolt = <3300000>;
> > +                               regulator-max-microvolt = <3300000>;
> > +                               regulator-name = "vcc-wifi-2";
> > +                       };
> > +
> > +                       reg_dcdca: dcdca {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <810000>;
> > +                               regulator-max-microvolt = <1080000>;
> > +                               regulator-name = "vdd-cpu";
> > +                       };
> > +
> > +                       reg_dcdcc: dcdcc {
> > +                               regulator-min-microvolt = <810000>;
> > +                               regulator-max-microvolt = <1080000>;
> > +                               regulator-name = "vdd-gpu";
> > +                       };
> > +
> > +                       reg_dcdcd: dcdcd {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <960000>;
> > +                               regulator-max-microvolt = <960000>;
> > +                               regulator-name = "vdd-sys";
> > +                       };
> > +
> > +                       reg_dcdce: dcdce {
> > +                               regulator-always-on;
> > +                               regulator-min-microvolt = <1200000>;
> > +                               regulator-max-microvolt = <1200000>;
> > +                               regulator-name = "vcc-dram";
> > +                       };
> > +
> > +                       sw {
> > +                               /* unused */
> > +                       };
> > +               };
> > +       };
> > +};
> > +
> > +&uart0 {
> > +       pinctrl-names = "default";
> > +       pinctrl-0 = <&uart0_ph_pins>;
> > +       status = "okay";
> > +};
> > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
> > new file mode 100644
> > index 0000000000..ef4dd29549
> > --- /dev/null
> > +++ b/configs/beelink_gs1_defconfig
> > @@ -0,0 +1,15 @@
> > +CONFIG_ARM=y
> > +CONFIG_ARCH_SUNXI=y
> > +CONFIG_SPL=y
> > +CONFIG_MACH_SUN50I_H6=y
> > +CONFIG_MMC0_CD_PIN="PF6"
> > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> > +# CONFIG_PSCI_RESET is not set
> > +CONFIG_NR_DRAM_BANKS=1
> > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> > +# CONFIG_CMD_FLASH is not set
> > +# CONFIG_SPL_DOS_PARTITION is not set
> > +# CONFIG_SPL_EFI_PARTITION is not set
> > +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1"
> > +CONFIG_LED=y
> > +CONFIG_LED_GPIO=y
>
> Seems like most of Allwinner gpio's are gpio-leds. so select LED
> (since it's dm led core) in arch/arm/Kconfig if LED_GPIO. I'm thinking
> this could be proper assignment.

We can't do that as LED_GPIO depends on LED.
Jagan Teki April 15, 2019, 5:33 a.m. UTC | #3 
On Mon, Apr 15, 2019 at 2:58 AM Clément Péron <peron.clem@gmail.com> wrote:
>
> Hi,
>
> On Sun, 14 Apr 2019 at 19:29, Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > On Fri, Apr 12, 2019 at 7:45 PM Clément Péron <peron.clem@gmail.com> wrote:
> > >
> > > Beelink GS1 is an Allwinner H6 based TV box,
> > > which support:
> > > - Allwinner H6 Quad-core 64-bit ARM Cortex-A53
> > > - GPU Mali-T720
> > > - 2GB LPDDR3 RAM
> > > - 16GB eMMC
> > > - AXP805 PMIC
> > > - 1Gbps GMAC via RTL8211E
> > > - USB 2.0 and 3.0 Host
> > > - HDMI port
> > > - S/PDIF port
> > > - 5V/2A DC power supply
> > > - Wi-Fi/BT via Fn-Link 6222B-SRB (RTL8222BS)
> >
> > Please dts sync commit details here.
> >
> > >
> > > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> > > ---
> > >  arch/arm/dts/Makefile                  |   1 +
> > >  arch/arm/dts/sun50i-h6-beelink-gs1.dts | 184 +++++++++++++++++++++++++
> >
> > Seems like this has part of required nodes, sync the complete dts.
>
> Ok so you want to add the complete dts from linux.
>
> I think only IP used in U-boot are needed.
>
> I will do that in v3
>
> >
> > >  configs/beelink_gs1_defconfig          |  15 ++
> >
> > Add entry on board/sunxi/MAINTAINERS
>
> Ok
>
> >
> > >  3 files changed, 200 insertions(+)
> > >  create mode 100644 arch/arm/dts/sun50i-h6-beelink-gs1.dts
> > >  create mode 100644 configs/beelink_gs1_defconfig
> > >
> > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > index 86a01c2c70..61e7156284 100644
> > > --- a/arch/arm/dts/Makefile
> > > +++ b/arch/arm/dts/Makefile
> > > @@ -467,6 +467,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > >         sun50i-h5-orangepi-prime.dtb \
> > >         sun50i-h5-orangepi-zero-plus2.dtb
> > >  dtb-$(CONFIG_MACH_SUN50I_H6) += \
> > > +       sun50i-h6-beelink-gs1.dtb \
> > >         sun50i-h6-orangepi-lite2.dtb \
> > >         sun50i-h6-orangepi-one-plus.dtb \
> > >         sun50i-h6-pine-h64.dtb
> > > diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> > > new file mode 100644
> > > index 0000000000..54b0882bed
> > > --- /dev/null
> > > +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
> > > @@ -0,0 +1,184 @@
> > > +// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> > > +/*
> > > + * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com>
> > > + */
> > > +
> > > +/dts-v1/;
> > > +
> > > +#include "sun50i-h6.dtsi"
> > > +
> > > +#include <dt-bindings/gpio/gpio.h>
> > > +
> > > +/ {
> > > +       model = "Beelink GS1";
> > > +       compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
> > > +
> > > +       aliases {
> > > +               serial0 = &uart0;
> > > +       };
> > > +
> > > +       chosen {
> > > +               stdout-path = "serial0:115200n8";
> > > +       };
> > > +
> > > +       leds {
> > > +               compatible = "gpio-leds";
> > > +
> > > +               power {
> > > +                       label = "beelink:white:power";
> > > +                       gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
> > > +                       default-state = "on";
> > > +               };
> > > +       };
> > > +
> > > +       reg_vcc5v: vcc5v {
> > > +               /* board wide 5V supply directly from the DC jack */
> > > +               compatible = "regulator-fixed";
> > > +               regulator-name = "vcc-5v";
> > > +               regulator-min-microvolt = <5000000>;
> > > +               regulator-max-microvolt = <5000000>;
> > > +               regulator-always-on;
> > > +       };
> > > +};
> > > +
> > > +&mmc0 {
> > > +       vmmc-supply = <&reg_cldo1>;
> > > +       cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
> > > +       bus-width = <4>;
> > > +       status = "okay";
> > > +};
> > > +
> > > +&mmc2 {
> > > +       vmmc-supply = <&reg_cldo1>;
> > > +       vqmmc-supply = <&reg_bldo2>;
> > > +       non-removable;
> > > +       cap-mmc-hw-reset;
> > > +       bus-width = <8>;
> > > +       status = "okay";
> > > +};
> > > +
> > > +&r_i2c {
> > > +       status = "okay";
> > > +
> > > +       axp805: pmic@36 {
> > > +               compatible = "x-powers,axp805", "x-powers,axp806";
> > > +               reg = <0x36>;
> > > +               interrupt-parent = <&r_intc>;
> > > +               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> > > +               interrupt-controller;
> > > +               #interrupt-cells = <1>;
> > > +               x-powers,self-working-mode;
> > > +               vina-supply = <&reg_vcc5v>;
> > > +               vinb-supply = <&reg_vcc5v>;
> > > +               vinc-supply = <&reg_vcc5v>;
> > > +               vind-supply = <&reg_vcc5v>;
> > > +               vine-supply = <&reg_vcc5v>;
> > > +               aldoin-supply = <&reg_vcc5v>;
> > > +               bldoin-supply = <&reg_vcc5v>;
> > > +               cldoin-supply = <&reg_vcc5v>;
> > > +
> > > +               regulators {
> > > +                       reg_aldo1: aldo1 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc-pl";
> > > +                       };
> > > +
> > > +                       reg_aldo2: aldo2 {
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc-ac200";
> > > +                               regulator-enable-ramp-delay = <100000>;
> > > +                       };
> > > +
> > > +                       reg_aldo3: aldo3 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc25-dram";
> > > +                       };
> > > +
> > > +                       reg_bldo1: bldo1 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <1800000>;
> > > +                               regulator-max-microvolt = <1800000>;
> > > +                               regulator-name = "vcc-bias-pll";
> > > +                       };
> > > +
> > > +                       reg_bldo2: bldo2 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <1800000>;
> > > +                               regulator-max-microvolt = <1800000>;
> > > +                               regulator-name = "vcc-efuse-pcie-hdmi-io";
> > > +                       };
> > > +
> > > +                       reg_bldo3: bldo3 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <1800000>;
> > > +                               regulator-max-microvolt = <1800000>;
> > > +                               regulator-name = "vcc-dcxoio";
> > > +                       };
> > > +
> > > +                       bldo4 {
> > > +                               /* unused */
> > > +                       };
> > > +
> > > +                       reg_cldo1: cldo1 {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc-3v3";
> > > +                       };
> > > +
> > > +                       reg_cldo2: cldo2 {
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc-wifi-1";
> > > +                       };
> > > +
> > > +                       reg_cldo3: cldo3 {
> > > +                               regulator-min-microvolt = <3300000>;
> > > +                               regulator-max-microvolt = <3300000>;
> > > +                               regulator-name = "vcc-wifi-2";
> > > +                       };
> > > +
> > > +                       reg_dcdca: dcdca {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <810000>;
> > > +                               regulator-max-microvolt = <1080000>;
> > > +                               regulator-name = "vdd-cpu";
> > > +                       };
> > > +
> > > +                       reg_dcdcc: dcdcc {
> > > +                               regulator-min-microvolt = <810000>;
> > > +                               regulator-max-microvolt = <1080000>;
> > > +                               regulator-name = "vdd-gpu";
> > > +                       };
> > > +
> > > +                       reg_dcdcd: dcdcd {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <960000>;
> > > +                               regulator-max-microvolt = <960000>;
> > > +                               regulator-name = "vdd-sys";
> > > +                       };
> > > +
> > > +                       reg_dcdce: dcdce {
> > > +                               regulator-always-on;
> > > +                               regulator-min-microvolt = <1200000>;
> > > +                               regulator-max-microvolt = <1200000>;
> > > +                               regulator-name = "vcc-dram";
> > > +                       };
> > > +
> > > +                       sw {
> > > +                               /* unused */
> > > +                       };
> > > +               };
> > > +       };
> > > +};
> > > +
> > > +&uart0 {
> > > +       pinctrl-names = "default";
> > > +       pinctrl-0 = <&uart0_ph_pins>;
> > > +       status = "okay";
> > > +};
> > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
> > > new file mode 100644
> > > index 0000000000..ef4dd29549
> > > --- /dev/null
> > > +++ b/configs/beelink_gs1_defconfig
> > > @@ -0,0 +1,15 @@
> > > +CONFIG_ARM=y
> > > +CONFIG_ARCH_SUNXI=y
> > > +CONFIG_SPL=y
> > > +CONFIG_MACH_SUN50I_H6=y
> > > +CONFIG_MMC0_CD_PIN="PF6"
> > > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> > > +# CONFIG_PSCI_RESET is not set
> > > +CONFIG_NR_DRAM_BANKS=1
> > > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> > > +# CONFIG_CMD_FLASH is not set
> > > +# CONFIG_SPL_DOS_PARTITION is not set
> > > +# CONFIG_SPL_EFI_PARTITION is not set
> > > +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1"
> > > +CONFIG_LED=y
> > > +CONFIG_LED_GPIO=y
> >
> > Seems like most of Allwinner gpio's are gpio-leds. so select LED
> > (since it's dm led core) in arch/arm/Kconfig if LED_GPIO. I'm thinking
> > this could be proper assignment.
>
> We can't do that as LED_GPIO depends on LED.

True.
diff mbox series

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 86a01c2c70..61e7156284 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -467,6 +467,7 @@  dtb-$(CONFIG_MACH_SUN50I_H5) += \
 	sun50i-h5-orangepi-prime.dtb \
 	sun50i-h5-orangepi-zero-plus2.dtb
 dtb-$(CONFIG_MACH_SUN50I_H6) += \
+	sun50i-h6-beelink-gs1.dtb \
 	sun50i-h6-orangepi-lite2.dtb \
 	sun50i-h6-orangepi-one-plus.dtb \
 	sun50i-h6-pine-h64.dtb
diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
new file mode 100644
index 0000000000..54b0882bed
--- /dev/null
+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
@@ -0,0 +1,184 @@ 
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Beelink GS1";
+	compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		power {
+			label = "beelink:white:power";
+			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
+			default-state = "on";
+		};
+	};
+
+	reg_vcc5v: vcc5v {
+		/* board wide 5V supply directly from the DC jack */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
+};
+
+&mmc0 {
+	vmmc-supply = <&reg_cldo1>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	bus-width = <4>;
+	status = "okay";
+};
+
+&mmc2 {
+	vmmc-supply = <&reg_cldo1>;
+	vqmmc-supply = <&reg_bldo2>;
+	non-removable;
+	cap-mmc-hw-reset;
+	bus-width = <8>;
+	status = "okay";
+};
+
+&r_i2c {
+	status = "okay";
+
+	axp805: pmic@36 {
+		compatible = "x-powers,axp805", "x-powers,axp806";
+		reg = <0x36>;
+		interrupt-parent = <&r_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		x-powers,self-working-mode;
+		vina-supply = <&reg_vcc5v>;
+		vinb-supply = <&reg_vcc5v>;
+		vinc-supply = <&reg_vcc5v>;
+		vind-supply = <&reg_vcc5v>;
+		vine-supply = <&reg_vcc5v>;
+		aldoin-supply = <&reg_vcc5v>;
+		bldoin-supply = <&reg_vcc5v>;
+		cldoin-supply = <&reg_vcc5v>;
+
+		regulators {
+			reg_aldo1: aldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-pl";
+			};
+
+			reg_aldo2: aldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-ac200";
+				regulator-enable-ramp-delay = <100000>;
+			};
+
+			reg_aldo3: aldo3 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc25-dram";
+			};
+
+			reg_bldo1: bldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-bias-pll";
+			};
+
+			reg_bldo2: bldo2 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-efuse-pcie-hdmi-io";
+			};
+
+			reg_bldo3: bldo3 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-dcxoio";
+			};
+
+			bldo4 {
+				/* unused */
+			};
+
+			reg_cldo1: cldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-3v3";
+			};
+
+			reg_cldo2: cldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-wifi-1";
+			};
+
+			reg_cldo3: cldo3 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-wifi-2";
+			};
+
+			reg_dcdca: dcdca {
+				regulator-always-on;
+				regulator-min-microvolt = <810000>;
+				regulator-max-microvolt = <1080000>;
+				regulator-name = "vdd-cpu";
+			};
+
+			reg_dcdcc: dcdcc {
+				regulator-min-microvolt = <810000>;
+				regulator-max-microvolt = <1080000>;
+				regulator-name = "vdd-gpu";
+			};
+
+			reg_dcdcd: dcdcd {
+				regulator-always-on;
+				regulator-min-microvolt = <960000>;
+				regulator-max-microvolt = <960000>;
+				regulator-name = "vdd-sys";
+			};
+
+			reg_dcdce: dcdce {
+				regulator-always-on;
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-name = "vcc-dram";
+			};
+
+			sw {
+				/* unused */
+			};
+		};
+	};
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_ph_pins>;
+	status = "okay";
+};
diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
new file mode 100644
index 0000000000..ef4dd29549
--- /dev/null
+++ b/configs/beelink_gs1_defconfig
@@ -0,0 +1,15 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
+CONFIG_MACH_SUN50I_H6=y
+CONFIG_MMC0_CD_PIN="PF6"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+# CONFIG_PSCI_RESET is not set
+CONFIG_NR_DRAM_BANKS=1
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1"
+CONFIG_LED=y
+CONFIG_LED_GPIO=y