[PATCH 0/2] arm64: dts: allwinner: Add X96Q Pro support

[codek...@gmail.com]

From: Marcus Cooper <codek...@gmail.com>

Hi All,
The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
a blue LED display, an audio video connector and an digital S/PDIF
connector.
Further information can be found on the sunxi wiki
https://linux-sunxi.org/X96QPro and the vendors site
https://x96mini.com/products/android-10-x96q-pro-smart-tv-box

Thanks in advance for the reviews,
CK

Marcus Cooper (2):
dt-bindings: arm: sunxi: Add the X96Q Pro board name
arm64: dts: allwinner: Add initial support for the X96Q-Pro STB

.../devicetree/bindings/arm/sunxi.yaml | 5 +
arch/arm64/boot/dts/allwinner/Makefile | 1 +
.../dts/allwinner/sun50i-h313-x96q-pro.dts | 176 ++++++++++++++++++
3 files changed, 182 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h313-x96q-pro.dts

--
2.47.0

[codek...@gmail.com]

From: Marcus Cooper <codek...@gmail.com>

The X96Q-Pro TV box is a Chinese Android TV box, using the
Allwinner H313 SoC. It is sold under the X96mini brand which
is a subsidiary of the Shenzhen Amedia Technology Co., Ltd

Add the board/SoC compatible string pair to the list of known
boards. Since the H313 does not look different from a software
point of view, we keep the H616 compatible string.

Signed-off-by: Marcus Cooper <codek...@gmail.com>
---
Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 046536d02706f..8905e51deb0e6 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -51,6 +51,11 @@ properties:
- const: allwinner,parrot
- const: allwinner,sun8i-a33

+ - description: Amediatech X96Q Pro
+ items:
+ - const: amediatech,x96q-pro
+ - const: allwinner,sun50i-h616
+
- description: Anbernic RG-Nano
items:
- const: anbernic,rg-nano
--
2.47.0

[codek...@gmail.com]

From: Marcus Cooper <codek...@gmail.com>

The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
a blue LED display, an audio video connector and an digital S/PDIF
connector.

Add the devicetree file describing the currently supported features,
namely IR, LEDs, SD card, PMIC, audio codec, SPDIF and USB.

Signed-off-by: Marcus Cooper <codek...@gmail.com>
---

arch/arm64/boot/dts/allwinner/Makefile | 1 +
.../dts/allwinner/sun50i-h313-x96q-pro.dts | 176 ++++++++++++++++++

2 files changed, 177 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h313-x96q-pro.dts

diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 00bed412ee31c..e0bcea1840c1f 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h64-remix-mini-pc.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a100-allwinner-perf1.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h313-x96q-pro.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus-v1.2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-emlid-neutis-n5-devboard.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h313-x96q-pro.dts b/arch/arm64/boot/dts/allwinner/sun50i-h313-x96q-pro.dts
new file mode 100644
index 0000000000000..4427545ea143c
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h313-x96q-pro.dts
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ */
+
+/dts-v1/;
+
+#include "sun50i-h616.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ model = "X96Q Pro";
+ compatible = "amediatech,x96q-pro", "allwinner,sun50i-h616";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc5v: vcc5v {
+ /* board wide 5V supply directly from the DC input */
+ compatible = "regulator-fixed";
+ regulator-name = "vcc-5v";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ };
+
+ sound-spdif {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "sun50i-h616-spdif";
+
+ simple-audio-card,cpu {
+ sound-dai = <&spdif>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&spdif_out>;
+ };
+ };
+
+ spdif_out: spdif-out {
+ #sound-dai-cells = <0>;
+ compatible = "linux,spdif-dit";
+ };
+};
+
+&codec {
+ allwinner,audio-routing = "Line Out", "LINEOUT";
+ status = "okay";
+};
+
+&ehci0 {
+ status = "okay";
+};
+
+&ehci3 {
+ status = "okay";
+};
+
+&ir {
+ status = "okay";
+};
+
+&mmc0 {
+ vmmc-supply = <&reg_dldo1>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+ bus-width = <4>;
+ status = "okay";
+};
+
+&mmc2 {
+ vmmc-supply = <&reg_dldo1>;
+ vqmmc-supply = <&reg_aldo1>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ mmc-ddr-1_8v;
+ mmc-hs200-1_8v;
+ status = "okay";
+};
+
+&ohci0 {
+ status = "okay";
+};
+
+&ohci3 {
+ status = "okay";
+};
+
+&pio {
+ vcc-pc-supply = <&reg_dldo1>;
+ vcc-pf-supply = <&reg_dldo1>;
+ vcc-pg-supply = <&reg_aldo1>;
+ vcc-ph-supply = <&reg_dldo1>;
+ vcc-pi-supply = <&reg_dldo1>;
+};
+
+&r_i2c {
+ status = "okay";
+
+ axp313: pmic@36 {
+ compatible = "x-powers,axp313a";
+ reg = <0x36>;
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ interrupt-parent = <&pio>;
+ interrupts = <2 9 IRQ_TYPE_LEVEL_LOW>; /* PC9 */
+
+ vin1-supply = <&reg_vcc5v>;
+ vin2-supply = <&reg_vcc5v>;
+ vin3-supply = <&reg_vcc5v>;
+
+ regulators {
+ /* Supplies VCC-PLL, so needs to be always on. */
+ reg_aldo1: aldo1 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-name = "vcc1v8";
+ };
+
+ /* Supplies VCC-IO, so needs to be always on. */
+ reg_dldo1: dldo1 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc3v3";
+ };
+
+ reg_dcdc1: dcdc1 {
+ regulator-always-on;
+ regulator-min-microvolt = <810000>;
+ regulator-max-microvolt = <990000>;
+ regulator-name = "vdd-gpu-sys";
+ };
+
+ reg_dcdc2: dcdc2 {
+ regulator-always-on;
+ regulator-min-microvolt = <810000>;
+ regulator-max-microvolt = <1100000>;
+ regulator-name = "vdd-cpu";
+ };
+
+ reg_dcdc3: dcdc3 {
+ regulator-always-on;
+ regulator-min-microvolt = <1100000>;
+ regulator-max-microvolt = <1100000>;
+ regulator-name = "vdd-dram";
+ };
+ };
+ };
+};
+
+&spdif {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_ph_pins>;
+ status = "okay";
+};
+
+&usbotg {
+ dr_mode = "host"; /* USB A type receptable */
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
--
2.47.0

[Andre Przywara]

On Mon, 11 Nov 2024 17:25:06 +0100
codek...@gmail.com wrote:

Hi Marcus,

many thanks for sending this!

> From: Marcus Cooper <codek...@gmail.com>
>
> The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
> slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
> integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
> a blue LED display, an audio video connector and an digital S/PDIF
> connector.
>
> Add the devicetree file describing the currently supported features,
> namely IR, LEDs, SD card, PMIC, audio codec, SPDIF and USB.

This looks good on a first glance, but seems to miss the DVFS bits? So you
would need to #include "sun50i-h616-cpu-opp.dtsi" and specify the cpu0
power supply rail, otherwise you will be stuck at 1GHz.

Or is there any issue preventing you doing this?

Two more things below:

Is this missing some copyright notice here?

Would it make sense to add the mmc1 node here, even if there is no driver
in Linux atm for the WiFi chip? Thanks to SDIO we wouldn't need a
compatible string, I think. This would also then allow us to describe the
connected GPIOs.

And does the box have Bluetooth?

Cheers,
Andre

d

[Code Kipper]

On Mon, 11 Nov 2024 at 18:27, Andre Przywara <andre.p...@arm.com> wrote:
>
> On Mon, 11 Nov 2024 17:25:06 +0100
> codek...@gmail.com wrote:
>
> Hi Marcus,
>
> many thanks for sending this!
>
> > From: Marcus Cooper <codek...@gmail.com>
> >
> > The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
> > slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
> > integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
> > a blue LED display, an audio video connector and an digital S/PDIF
> > connector.
> >
> > Add the devicetree file describing the currently supported features,
> > namely IR, LEDs, SD card, PMIC, audio codec, SPDIF and USB.
>
> This looks good on a first glance, but seems to miss the DVFS bits? So you
> would need to #include "sun50i-h616-cpu-opp.dtsi" and specify the cpu0
> power supply rail, otherwise you will be stuck at 1GHz.

Hi Andre,
thanks for the speedy review. I'll add the cpu0 rail but I can't get
the device to clock more than 1GHz. Isn't that the case with the H313
chipset?, your Tanix TX1 device doesn't reference the opp.dtsi,
although I do see from the wiki that it's clocked at 1.3GHz

Ack

Ack

>
> And does the box have Bluetooth?

No it doesn't just the XR819 for wifi.
I'll spin a V2 after a few days,
BR,
CK

[Andre Przywara]

On Tue, 12 Nov 2024 11:42:17 +0100
Code Kipper <codek...@gmail.com> wrote:

Hi,

> On Mon, 11 Nov 2024 at 18:27, Andre Przywara <andre.p...@arm.com> wrote:
> >
> > On Mon, 11 Nov 2024 17:25:06 +0100
> > codek...@gmail.com wrote:
> >
> > Hi Marcus,
> >
> > many thanks for sending this!
> >
> > > From: Marcus Cooper <codek...@gmail.com>
> > >
> > > The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
> > > slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
> > > integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
> > > a blue LED display, an audio video connector and an digital S/PDIF
> > > connector.
> > >
> > > Add the devicetree file describing the currently supported features,
> > > namely IR, LEDs, SD card, PMIC, audio codec, SPDIF and USB.
> >
> > This looks good on a first glance, but seems to miss the DVFS bits? So you
> > would need to #include "sun50i-h616-cpu-opp.dtsi" and specify the cpu0
> > power supply rail, otherwise you will be stuck at 1GHz.
> Hi Andre,
> thanks for the speedy review. I'll add the cpu0 rail but I can't get
> the device to clock more than 1GHz. Isn't that the case with the H313
> chipset?,
> your Tanix TX1 device doesn't reference the opp.dtsi,
> although I do see from the wiki that it's clocked at 1.3GHz

It's "do as I say, not do as I do" :-D
Just kidding, actually many thanks for the heads up: you are right, it's
missing there! I think it was just the case of both being merged at the
same time, and the -cpu-opp.dtsi not being in the branch where I based the
.dts on. Will test and fix it!

Regarding the OPPs: If you look at the table in
sun50i_h616_efuse_xlate()[1], and then compare this to those SID numbers collected
in our wiki[2], you will see that the "bins" are actually the packages:
All H616s we have seen use 0x5000 (that's the low 16 bits of the first SID
register value), the H618s uses 0x2000, and presumably all H313s use
0x5c00, and so on. I think BSP code confirms that.
So the H313 uses a separate set of OPPs already (set 4), which is indeed
the worst of them all: is requires higher voltages, and only provides up
to 1.3GHz. So I *think* we should be covered. But please test this and
report back if you have any issues.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/cpufreq/sun50i-cpufreq-nvmem.c#n67
[2] https://linux-sunxi.org/SID_Register_Guide#Currently_known_SID.27s

Ah, right, bummer, same with the TX1, which is a bit annoying, because
having BT would make this a bit more useful.

> I'll spin a V2 after a few days,

Thanks!

Cheers,
Andre

[Andre Przywara]

On Mon, 11 Nov 2024 17:25:04 +0100
codek...@gmail.com wrote:

Hi Marcus,

> From: Marcus Cooper <codek...@gmail.com>
>
> Hi All,
> The X96Q-Pro is an STB based on the Allwinner H313 SoC with a SD
> slot, 2 USB-2 ports, a 10/100M ethernet port using the SoC's
> integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver,
> a blue LED display, an audio video connector and an digital S/PDIF
> connector.
> Further information can be found on the sunxi wiki
> https://linux-sunxi.org/X96QPro and the vendors site
> https://x96mini.com/products/android-10-x96q-pro-smart-tv-box

You hinted at sending a v2 some day, will you get the chance to do this
still this month? Then the DT would have a good chance of getting merged
into v6.14, I think.

Cheers,
Andre