Skip to contentSkip to conversation

arm64: allwinner: h6: orangepi: Add PIO regulators

PATCH In review Clément Péron 3 participants 13 messages Apr 5, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 arm64: allwinner: h6: orangepi: Add PIO regulators

OrangePi One Plus and OrangePi Lite2 use the same PIO regulators.

Add this in the common device tree.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +11 -0
index b2526dac2fcf..fd2af5095425 100644
@@ -72,6 +72,12 @@
 	status = "okay";
 };
 
+&pio {
+        vcc-pc-supply = <&reg_bldo2>;
+        vcc-pd-supply = <&reg_cldo1>;
+        vcc-pg-supply = <&reg_bldo3>;
+};
+
 &r_i2c {
 	status = "okay";
 
@@ -191,6 +197,11 @@
 	};
 };
 
+&r_pio {
+        vcc-pl-supply = <&reg_aldo1>;
+        vcc-pm-supply = <&reg_bldo3>;
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_ph_pins>;
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 3/5 arm64: dts: allwinner: h6: move MMC pinctrl to dtsi

There is only one pinmuxing available for each MMC controller.

Move the pinctrl to the SOC

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 --
 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts  | 4 ----
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi          | 4 ++++
 3 files changed, 4 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +0 -2
index fd2af5095425..88b3a13f2360 100644
@@ -56,8 +56,6 @@
 };
 
 &mmc0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 	bus-width = <4>;
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +0 -4
index 8b0b7675a53c..d8b0138be3d6 100644
@@ -104,8 +104,6 @@
 };
 
 &mmc0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 	bus-width = <4>;
@@ -113,8 +111,6 @@
 };
 
 &mmc2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc2_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	vqmmc-supply = <&reg_bldo2>;
 	non-removable;
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +4 -0
index 91fecab58836..93ad756c0c95 100644
@@ -273,6 +273,8 @@
 			resets = <&ccu RST_BUS_MMC0>;
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+		        pinctrl-names = "default";
+			pinctrl-0 = <&mmc0_pins>;
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -301,6 +303,8 @@
 			resets = <&ccu RST_BUS_MMC2>;
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc0_pins>;
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 4/5 dt-bindings: vendor-prefixes: add AZW

In reply to Clément Péron

Shenzhen AZW Technology Co. Ltd. is a manufacturer specialized in Android smart TV boxes, Intel mini PCs and home cloud TV boxes with NAS.

Add the vendor prefix for AZW.

---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 8b4ae37629b2..8313edbaf52e 100644
@@ -54,6 +54,7 @@ avic	Shanghai AVIC Optoelectronics Co., Ltd.
 avnet	Avnet, Inc.
 axentia	Axentia Technologies AB
 axis	Axis Communications AB
+azw     Shenzhen AZW Technology Co., Ltd.
 bananapi BIPAI KEJI LIMITED
 bhf	Beckhoff Automation GmbH & Co. KG
 bitmain	Bitmain Technologies
Signature · 1 line
2.17.1
#5 lore raw

PATCH v2 5/5 ARM: dts: sun50i: h6: Introduce Beelink GS1 board

In reply to Clément Péron

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
- AXP805 PMIC
- 1Gbps GMAC via RTL8211E
- FN-Link 6222B-SRB Wifi/BT
- 1x USB 2.0 Host and 1x USB 3.0 Host
- HDMI port
- S/PDIF Tx
- IR receiver
- 5V/2A DC power supply

---

Thanks to Jagan and Icenowy, most of this devicetree is taken from their works on the OrangePi One Plus and Pine H64.

Changes in v2 (Thanks to Maxime Ripard):
- move MMC pinctrl to SOC dtsi
- add board to Sunxi YAML file
- add PIO/R_PIO regulators
- remove always_on from SDIO regulators

 .../devicetree/bindings/arm/sunxi.yaml        |   5 +
 arch/arm64/boot/dts/allwinner/Makefile        |   1 +
 .../dts/allwinner/sun50i-h6-beelink-gs1.dts   | 256 ++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index 11563d3f7c65..9ab9b266881d 100644
@@ -136,6 +136,11 @@ properties:
           - const: lemaker,bananapro
           - const: allwinner,sun7i-a20
 
+      - description: Beelink GS1
+        items:
+          - const: azw,beelink-gs1
+          - const: allwinner,sun50i-h6
+
       - description: Beelink X2
         items:
           - const: roofull,beelink-x2
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index e4dce2f6fa3a..2dd806a3d5c9 100644
@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-beelink-gs1.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts new file +256 -0

256 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/5 arm64: dts: allwinner: h6: pine64: Add PIO regulators

In reply to Clément Péron

Add PIO regulators for Pine64 board.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +11 -0
index bdb8470fc8dc..8b0b7675a53c 100644
@@ -131,6 +131,12 @@
 	status = "okay";
 };
 
+&pio {
+	vcc-pc-supply = <&reg_bldo2>;
+	vcc-pd-supply = <&reg_cldo1>;
+	vcc-pg-supply = <&reg_bldo2>;
+};
+
 &r_i2c {
 	status = "okay";
 
@@ -251,6 +257,11 @@
 	};
 };
 
+&r_pio {
+	vcc-pl-supply = <&reg_aldo1>;
+	vcc-pm-supply = <&reg_bldo2>;
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_ph_pins>;
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v2 4/5
#4 lore raw

Re: [PATCH v2 4/5] dt-bindings: vendor-prefixes: add AZW

In reply to Clément Péron
Quoted 4 lines · Clément Péron

Shenzhen AZW Technology Co. Ltd. is a manufacturer specialized in Android smart TV boxes, Intel mini PCs and home cloud TV boxes with NAS.

Add the vendor prefix for AZW.

Yay, I've been hacking on a Beelink A1 so this will be one less patch to worry about if I ever get it finished enough to upstream :)

(I had picked "beelink" as a prefix, but I guess "azw" does seem more appropriate to cover their OEM stuff as well, so there's no good reason to treat the in-house brand specially)

Quoted 18 lines
---
  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
  1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 8b4ae37629b2..8313edbaf52e 100644
@@ -54,6 +54,7 @@ avic	Shanghai AVIC Optoelectronics Co., Ltd.
  avnet	Avnet, Inc.
  axentia	Axentia Technologies AB
  axis	Axis Communications AB
+azw     Shenzhen AZW Technology Co., Ltd.
  bananapi BIPAI KEJI LIMITED
  bhf	Beckhoff Automation GmbH & Co. KG
  bitmain	Bitmain Technologies
#6 lore raw

Re: [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board

In reply to Clément Péron

Hi,

Adding this r_pio regulators make a new error in the bootlog :

[    0.346843] sun50i-h6-r-pinctrl 7022000.pinctrl: Couldn't get bank
PL regulator
[    0.346853] sun50i-h6-r-pinctrl 7022000.pinctrl: request() failed for pin 352
[    0.346862] sun50i-h6-r-pinctrl 7022000.pinctrl: pin-352
(7081400.i2c) status -517
[    0.346871] sun50i-h6-r-pinctrl 7022000.pinctrl: could not request
pin 352 (PL0) from group PL0  on device 7022000.pinctrl
[    0.346878] mv64xxx_i2c 7081400.i2c: Error applying setting,

reverse things back

PL0 and PL1 are SCK/SDA for the PMIC :(

Clement

Quoted 327 lines · Clément Péron

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
- AXP805 PMIC
- 1Gbps GMAC via RTL8211E
- FN-Link 6222B-SRB Wifi/BT
- 1x USB 2.0 Host and 1x USB 3.0 Host
- HDMI port
- S/PDIF Tx
- IR receiver
- 5V/2A DC power supply

---

Thanks to Jagan and Icenowy, most of this devicetree is taken from their works on the OrangePi One Plus and Pine H64.

Changes in v2 (Thanks to Maxime Ripard):
- move MMC pinctrl to SOC dtsi
- add board to Sunxi YAML file
- add PIO/R_PIO regulators
- remove always_on from SDIO regulators

 .../devicetree/bindings/arm/sunxi.yaml        |   5 +
 arch/arm64/boot/dts/allwinner/Makefile        |   1 +
 .../dts/allwinner/sun50i-h6-beelink-gs1.dts   | 256 ++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index 11563d3f7c65..9ab9b266881d 100644
@@ -136,6 +136,11 @@ properties:
           - const: lemaker,bananapro
           - const: allwinner,sun7i-a20
 
+      - description: Beelink GS1
+        items:
+          - const: azw,beelink-gs1
+          - const: allwinner,sun50i-h6
+
       - description: Beelink X2
         items:
           - const: roofull,beelink-x2
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index e4dce2f6fa3a..2dd806a3d5c9 100644
@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-beelink-gs1.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts new file +256 -1
new file mode 100644
index 000000000000..d820a138522b
@@ -0,0 +1,256 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Clément Péron <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+       model = "Beelink GS1";
+       compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
+
+       aliases {
+               ethernet0 = &emac;
+               serial0 = &uart0;
+       };
+
+       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";
+
+               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;
+       };
+};
+
+&de {
+       status = "okay";
+};
+
+&ehci0 {
+       status = "okay";
+};
+
+&emac {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ext_rgmii_pins>;
+       phy-mode = "rgmii";
+       phy-handle = <&ext_rgmii_phy>;
+       phy-supply = <&reg_aldo2>;
+       allwinner,rx-delay-ps = <0>;
+       allwinner,tx-delay-ps = <0>;
+       status = "okay";
+};
+
+&hdmi {
+       status = "okay";
+};
+
+&hdmi_out {
+       hdmi_out_con: endpoint {
+               remote-endpoint = <&hdmi_con_in>;
+       };
+};
+
+&mdio {
+       ext_rgmii_phy: ethernet-phy@1 {
+               compatible = "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+       };
+};
+
+&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";
+};
+
+&ohci0 {
+       status = "okay";
+};
+
+&pio {
+       vcc-pd-supply = <&reg_cldo1>;
+       vcc-pg-supply = <&reg_aldo1>;
+};
+
+&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 */
+                       };
+               };
+       };
+};
+
+&r_pio {
+       vcc-pl-supply = <&reg_aldo1>;
+       vcc-pm-supply = <&reg_aldo1>;
+};
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart0_ph_pins>;
+       status = "okay";
+};
+
+&usb2otg {
+       dr_mode = "host";
+       status = "okay";
+};
+
+&usb2phy {
+       usb0_vbus-supply = <&reg_vcc5v>;
+       status = "okay";
+};
--

2.17.1

#7 lore raw

Re: [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board

Probing PMIC, Probe the PL0/1 Pins which Probe PL Bank power which Probe PMIC

Quoted 347 lines · Clément Péron

Hi,

Adding this r_pio regulators make a new error in the bootlog :

[    0.346843] sun50i-h6-r-pinctrl 7022000.pinctrl: Couldn't get bank
PL regulator
[    0.346853] sun50i-h6-r-pinctrl 7022000.pinctrl: request() failed for pin 352
[    0.346862] sun50i-h6-r-pinctrl 7022000.pinctrl: pin-352
(7081400.i2c) status -517
[    0.346871] sun50i-h6-r-pinctrl 7022000.pinctrl: could not request
pin 352 (PL0) from group PL0  on device 7022000.pinctrl
[    0.346878] mv64xxx_i2c 7081400.i2c: Error applying setting,

reverse things back

PL0 and PL1 are SCK/SDA for the PMIC :(

Clement

Quoted 327 lines · Clément Péron

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
- AXP805 PMIC
- 1Gbps GMAC via RTL8211E
- FN-Link 6222B-SRB Wifi/BT
- 1x USB 2.0 Host and 1x USB 3.0 Host
- HDMI port
- S/PDIF Tx
- IR receiver
- 5V/2A DC power supply

---

Thanks to Jagan and Icenowy, most of this devicetree is taken from their works on the OrangePi One Plus and Pine H64.

Changes in v2 (Thanks to Maxime Ripard):
- move MMC pinctrl to SOC dtsi
- add board to Sunxi YAML file
- add PIO/R_PIO regulators
- remove always_on from SDIO regulators

 .../devicetree/bindings/arm/sunxi.yaml        |   5 +
 arch/arm64/boot/dts/allwinner/Makefile        |   1 +
 .../dts/allwinner/sun50i-h6-beelink-gs1.dts   | 256 ++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index 11563d3f7c65..9ab9b266881d 100644
@@ -136,6 +136,11 @@ properties:
           - const: lemaker,bananapro
           - const: allwinner,sun7i-a20
 
+      - description: Beelink GS1
+        items:
+          - const: azw,beelink-gs1
+          - const: allwinner,sun50i-h6
+
       - description: Beelink X2
         items:
           - const: roofull,beelink-x2
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index e4dce2f6fa3a..2dd806a3d5c9 100644
@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-beelink-gs1.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts new file +256 -1
new file mode 100644
index 000000000000..d820a138522b
@@ -0,0 +1,256 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Clément Péron <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+       model = "Beelink GS1";
+       compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
+
+       aliases {
+               ethernet0 = &emac;
+               serial0 = &uart0;
+       };
+
+       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";
+
+               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;
+       };
+};
+
+&de {
+       status = "okay";
+};
+
+&ehci0 {
+       status = "okay";
+};
+
+&emac {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ext_rgmii_pins>;
+       phy-mode = "rgmii";
+       phy-handle = <&ext_rgmii_phy>;
+       phy-supply = <&reg_aldo2>;
+       allwinner,rx-delay-ps = <0>;
+       allwinner,tx-delay-ps = <0>;
+       status = "okay";
+};
+
+&hdmi {
+       status = "okay";
+};
+
+&hdmi_out {
+       hdmi_out_con: endpoint {
+               remote-endpoint = <&hdmi_con_in>;
+       };
+};
+
+&mdio {
+       ext_rgmii_phy: ethernet-phy@1 {
+               compatible = "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+       };
+};
+
+&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";
+};
+
+&ohci0 {
+       status = "okay";
+};
+
+&pio {
+       vcc-pd-supply = <&reg_cldo1>;
+       vcc-pg-supply = <&reg_aldo1>;
+};
+
+&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 */
+                       };
+               };
+       };
+};
+
+&r_pio {
+       vcc-pl-supply = <&reg_aldo1>;
+       vcc-pm-supply = <&reg_aldo1>;
+};
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart0_ph_pins>;
+       status = "okay";
+};
+
+&usb2otg {
+       dr_mode = "host";
+       status = "okay";
+};
+
+&usb2phy {
+       usb0_vbus-supply = <&reg_vcc5v>;
+       status = "okay";
+};
--

2.17.1

#11 lore raw
In reply to Clément Péron
Quoted 27 lines · Clément Péron

OrangePi One Plus and OrangePi Lite2 use the same PIO regulators.

Add this in the common device tree.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +6 -0
index b2526dac2fcf..fd2af5095425 100644
@@ -72,6 +72,12 @@
 	status = "okay";
 };
 
+&pio {
+        vcc-pc-supply = <&reg_bldo2>;
+        vcc-pd-supply = <&reg_cldo1>;
+        vcc-pg-supply = <&reg_bldo3>;
+};
+
 &r_i2c {
 	status = "okay";
 

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi line 204

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +5 -0
@@ -191,6 +197,11 @@
 	};
 };
 
+&r_pio {
+        vcc-pl-supply = <&reg_aldo1>;
+        vcc-pm-supply = <&reg_bldo3>;
+};
+

How was this tested?

Please run checkpatch on your patches as well.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#10 lore raw

Re: [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board

In reply to Clément Péron
Quoted 38 lines · Clément Péron

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
- AXP805 PMIC
- 1Gbps GMAC via RTL8211E
- FN-Link 6222B-SRB Wifi/BT
- 1x USB 2.0 Host and 1x USB 3.0 Host
- HDMI port
- S/PDIF Tx
- IR receiver
- 5V/2A DC power supply

---

Thanks to Jagan and Icenowy, most of this devicetree is taken from their works on the OrangePi One Plus and Pine H64.

Changes in v2 (Thanks to Maxime Ripard):
- move MMC pinctrl to SOC dtsi
- add board to Sunxi YAML file
- add PIO/R_PIO regulators
- remove always_on from SDIO regulators

 .../devicetree/bindings/arm/sunxi.yaml        |   5 +
 arch/arm64/boot/dts/allwinner/Makefile        |   1 +
 .../dts/allwinner/sun50i-h6-beelink-gs1.dts   | 256 ++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +0 -0
index 11563d3f7c65..9ab9b266881d 100644

Documentation/devicetree/bindings/arm/sunxi.yaml properties: · line 143

Quoted 8 lines
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
@@ -136,6 +136,11 @@ properties:
           - const: lemaker,bananapro
           - const: allwinner,sun7i-a20
 
+      - description: Beelink GS1
+        items:
+          - const: azw,beelink-gs1
+          - const: allwinner,sun50i-h6
+

Can you make that a separate patch?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected]
For more options, visit https://groups.google.com/d/optout.
#8 lore raw

Re: [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board

In reply to Clément Péron
Quoted 12 lines · Clément Péron

Hi,

Adding this r_pio regulators make a new error in the bootlog :

[    0.346843] sun50i-h6-r-pinctrl 7022000.pinctrl: Couldn't get bank
PL regulator
[    0.346853] sun50i-h6-r-pinctrl 7022000.pinctrl: request() failed for pin 352
[    0.346862] sun50i-h6-r-pinctrl 7022000.pinctrl: pin-352
(7081400.i2c) status -517
[    0.346871] sun50i-h6-r-pinctrl 7022000.pinctrl: could not request
pin 352 (PL0) from group PL0  on device 7022000.pinctrl
[    0.346878] mv64xxx_i2c 7081400.i2c: Error applying setting,
Quoted 3 lines

reverse things back

PL0 and PL1 are SCK/SDA for the PMIC :(

How was this DT tested then?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected]
For more options, visit https://groups.google.com/d/optout.
#9 lore raw

Re: [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board

Hi,

Quoted 16 lines · Maxime Ripard
Quoted 14 lines · Clément Péron

Hi,

Adding this r_pio regulators make a new error in the bootlog :

[    0.346843] sun50i-h6-r-pinctrl 7022000.pinctrl: Couldn't get bank
PL regulator
[    0.346853] sun50i-h6-r-pinctrl 7022000.pinctrl: request() failed for pin 352
[    0.346862] sun50i-h6-r-pinctrl 7022000.pinctrl: pin-352
(7081400.i2c) status -517
[    0.346871] sun50i-h6-r-pinctrl 7022000.pinctrl: could not request
pin 352 (PL0) from group PL0  on device 7022000.pinctrl
[    0.346878] mv64xxx_i2c 7081400.i2c: Error applying setting,

reverse things back

Quoted 3 lines
Quoted 1 line

PL0 and PL1 are SCK/SDA for the PMIC :(

How was this DT tested then?

There was a mistake when I tested the patch v2 and only saw this after posting the patch.

Can I submit a V3 without pio / r_pio regulators ? (+ the yaml patch separated)

Thanks,

Quoted 7 lines

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#12 lore raw
In reply to Maxime Ripard

Hi,

Quoted 32 lines · Maxime Ripard
Quoted 30 lines · Clément Péron

OrangePi One Plus and OrangePi Lite2 use the same PIO regulators.

Add this in the common device tree.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +6 -0
index b2526dac2fcf..fd2af5095425 100644
@@ -72,6 +72,12 @@
      status = "okay";
 };
 
+&pio {
+        vcc-pc-supply = <&reg_bldo2>;
+        vcc-pd-supply = <&reg_cldo1>;
+        vcc-pg-supply = <&reg_bldo3>;
+};
+
 &r_i2c {
      status = "okay";
 
@@ -191,6 +197,11 @@
      };
 };
 
Quoted 7 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi line 204

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +5 -0
+&r_pio {
+        vcc-pl-supply = <&reg_aldo1>;
+        vcc-pm-supply = <&reg_bldo3>;
+};
+

How was this tested?

Sorry maybe I should mention that but I don't own an OrangePi or a Pine H64.

But this should have the same issue than the Beelink GS1.

Quoted 2 lines

Please run checkpatch on your patches as well.

Thanks for the advice,
Clement

Quoted 7 lines

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com