Re: [PATCH 1/5] ARM: dts: import Beelink GT-King/Pro DTs from Linux 5.10

18 Dec 2020

On 18/12/2020 09:45, Christian Hewitt wrote:
...
Import the Beelink GT-King/Pro and supporting meson-g12b-w400.dtsi file
from Linux 5.10.
Signed-off-by: Christian Hewitt christianshewitt@gmail.com
arch/arm/dts/Makefile                  |   2 +
 arch/arm/dts/meson-g12b-gtking-pro.dts | 125 ++++++++
 arch/arm/dts/meson-g12b-gtking.dts     | 145 +++++++++
 arch/arm/dts/meson-g12b-w400.dtsi      | 425 +++++++++++++++++++++++++
 4 files changed, 697 insertions(+)
 create mode 100644 arch/arm/dts/meson-g12b-gtking-pro.dts
 create mode 100644 arch/arm/dts/meson-g12b-gtking.dts
 create mode 100644 arch/arm/dts/meson-g12b-w400.dtsi

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 02dd6a832f..287ac63da4 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -170,6 +170,8 @@ dtb-$(CONFIG_ARCH_MESON) += \
   meson-axg-s400.dtb \
   meson-g12a-u200.dtb \
   meson-g12a-sei510.dtb \

meson-g12b-gtking.dtb \
meson-g12b-gtking-pro.dtb \
meson-g12b-odroid-n2.dtb \
meson-g12b-odroid-n2-plus.dtb \
meson-g12b-a311d-khadas-vim3.dtb \

diff --git a/arch/arm/dts/meson-g12b-gtking-pro.dts b/arch/arm/dts/meson-g12b-gtking-pro.dts
new file mode 100644
index 0000000000..f0c56a16af
--- /dev/null
+++ b/arch/arm/dts/meson-g12b-gtking-pro.dts
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*


Copyright (c) 2019 BayLibre, SAS



Author: Neil Armstrong narmstrong@baylibre.com



Copyright (c) 2019 Christian Hewitt christianshewitt@gmail.com


*/


+/dts-v1/;



+#include "meson-g12b-w400.dtsi"
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>



+/ {

compatible = "azw,gtking", "amlogic,g12b";
model = "Beelink GT-King Pro";

gpio-keys-polled {
compatible = "gpio-keys-polled";


#address-cells = <1>;


#size-cells = <0>;


poll-interval = <100>;



power-button {


	label = "power";


	linux,code = <KEY_POWER>;


	gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;


};


};

leds {
compatible = "gpio-leds";



white {


	label = "power:white";


	gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;


	default-state = "on";


};


};

sound {
compatible = "amlogic,axg-sound-card";


model = "G12B-GTKING-PRO";


audio-aux-devs = <&tdmout_b>;


audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",


		"TDMOUT_B IN 1", "FRDDR_B OUT 1",


		"TDMOUT_B IN 2", "FRDDR_C OUT 1",


		"TDM_B Playback", "TDMOUT_B OUT";



assigned-clocks = <&clkc CLKID_MPLL2>,


		  <&clkc CLKID_MPLL0>,


		  <&clkc CLKID_MPLL1>;


assigned-clock-parents = <0>, <0>, <0>;


assigned-clock-rates = <294912000>,


		       <270950400>,


		       <393216000>;


status = "okay";



dai-link-0 {


	sound-dai = <&frddr_a>;


};



dai-link-1 {


	sound-dai = <&frddr_b>;


};



dai-link-2 {


	sound-dai = <&frddr_c>;


};



/* 8ch hdmi interface */


dai-link-3 {


	sound-dai = <&tdmif_b>;


	dai-format = "i2s";


	dai-tdm-slot-tx-mask-0 = <1 1>;


	dai-tdm-slot-tx-mask-1 = <1 1>;


	dai-tdm-slot-tx-mask-2 = <1 1>;


	dai-tdm-slot-tx-mask-3 = <1 1>;


	mclk-fs = <256>;



	codec {


		sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;


	};


};



dai-link-4 {


	sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



	codec {


		sound-dai = <&hdmi_tx>;


	};


};


};

+};



+&arb {

status = "okay";

+};



+&clkc_audio {

status = "okay";

+};



+&frddr_a {

status = "okay";

+};



+&frddr_b {

status = "okay";

+};



+&frddr_c {

status = "okay";

+};



+&tdmif_b {

status = "okay";

+};



+&tdmout_b {

status = "okay";

+};



+&tohdmitx {

status = "okay";

+};
diff --git a/arch/arm/dts/meson-g12b-gtking.dts b/arch/arm/dts/meson-g12b-gtking.dts
new file mode 100644
index 0000000000..eeb7bc5539
--- /dev/null
+++ b/arch/arm/dts/meson-g12b-gtking.dts
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*


Copyright (c) 2019 BayLibre, SAS



Author: Neil Armstrong narmstrong@baylibre.com



Copyright (c) 2019 Christian Hewitt christianshewitt@gmail.com


*/


+/dts-v1/;



+#include "meson-g12b-w400.dtsi"
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>



+/ {

compatible = "azw,gtking", "amlogic,g12b";
model = "Beelink GT-King";

spdif_dit: audio-codec-1 {
#sound-dai-cells = <0>;


compatible = "linux,spdif-dit";


status = "okay";


sound-name-prefix = "DIT";


};

sound {
compatible = "amlogic,axg-sound-card";


model = "G12B-GTKING";


audio-aux-devs = <&tdmout_b>;


audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",


		"TDMOUT_B IN 1", "FRDDR_B OUT 1",


		"TDMOUT_B IN 2", "FRDDR_C OUT 1",


		"TDM_B Playback", "TDMOUT_B OUT",


		"SPDIFOUT IN 0", "FRDDR_A OUT 3",


		"SPDIFOUT IN 1", "FRDDR_B OUT 3",


		"SPDIFOUT IN 2", "FRDDR_C OUT 3";



assigned-clocks = <&clkc CLKID_MPLL2>,


		  <&clkc CLKID_MPLL0>,


		  <&clkc CLKID_MPLL1>;


assigned-clock-parents = <0>, <0>, <0>;


assigned-clock-rates = <294912000>,


		       <270950400>,


		       <393216000>;


status = "okay";



dai-link-0 {


	sound-dai = <&frddr_a>;


};



dai-link-1 {


	sound-dai = <&frddr_b>;


};



dai-link-2 {


	sound-dai = <&frddr_c>;


};



/* 8ch hdmi interface */


dai-link-3 {


	sound-dai = <&tdmif_b>;


	dai-format = "i2s";


	dai-tdm-slot-tx-mask-0 = <1 1>;


	dai-tdm-slot-tx-mask-1 = <1 1>;


	dai-tdm-slot-tx-mask-2 = <1 1>;


	dai-tdm-slot-tx-mask-3 = <1 1>;


	mclk-fs = <256>;



	codec {


		sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;


	};


};



/* spdif hdmi or toslink interface */


dai-link-4 {


	sound-dai = <&spdifout>;



	codec-0 {


		sound-dai = <&spdif_dit>;


	};



	codec-1 {


		sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_A>;


	};


};



/* spdif hdmi interface */


dai-link-5 {


	sound-dai = <&spdifout_b>;



	codec {


		sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_B>;


	};


};



/* hdmi glue */


dai-link-6 {


	sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



	codec {


		sound-dai = <&hdmi_tx>;


	};


};


};

+};



+&arb {

status = "okay";

+};



+&clkc_audio {

status = "okay";

+};



+&frddr_a {

status = "okay";

+};



+&frddr_b {

status = "okay";

+};



+&frddr_c {

status = "okay";

+};



+&spdifout {

pinctrl-0 = <&spdif_out_h_pins>;
pinctrl-names = "default";
status = "okay";

+};



+&spdifout_b {

status = "okay";

+};



+&tdmif_b {

status = "okay";

+};



+&tdmout_b {

status = "okay";

+};



+&tohdmitx {

status = "okay";

+};
diff --git a/arch/arm/dts/meson-g12b-w400.dtsi b/arch/arm/dts/meson-g12b-w400.dtsi
new file mode 100644
index 0000000000..2802ddbb83
--- /dev/null
+++ b/arch/arm/dts/meson-g12b-w400.dtsi
@@ -0,0 +1,425 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*


Copyright (c) 2019 BayLibre, SAS



Author: Neil Armstrong narmstrong@baylibre.com



Copyright (c) 2019 Christian Hewitt christianshewitt@gmail.com


*/


+/dts-v1/;



+#include "meson-g12b.dtsi"
+#include "meson-g12b-s922x.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/meson-g12a-gpio.h>



+/ {

aliases {
serial0 = &uart_AO;


ethernet0 = &ethmac;


};

chosen {
stdout-path = "serial0:115200n8";


};

memory@0 {
device_type = "memory";


reg = <0x0 0x0 0x0 0x40000000>;


};

emmc_pwrseq: emmc-pwrseq {
compatible = "mmc-pwrseq-emmc";


reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;


};

sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";


reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;


clocks = <&wifi32k>;


clock-names = "ext_clock";


};

flash_1v8: regulator-flash_1v8 {
compatible = "regulator-fixed";


regulator-name = "FLASH_1V8";


regulator-min-microvolt = <1800000>;


regulator-max-microvolt = <1800000>;


vin-supply = <&vcc_3v3>;


regulator-always-on;


};

main_12v: regulator-main_12v {
compatible = "regulator-fixed";


regulator-name = "12V";


regulator-min-microvolt = <12000000>;


regulator-max-microvolt = <12000000>;


regulator-always-on;


};

vcc_5v: regulator-vcc_5v {
compatible = "regulator-fixed";


regulator-name = "VCC_5V";


regulator-min-microvolt = <5000000>;


regulator-max-microvolt = <5000000>;


vin-supply = <&main_12v>;



gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;


enable-active-high;


};

vcc_1v8: regulator-vcc_1v8 {
compatible = "regulator-fixed";


regulator-name = "VCC_1V8";


regulator-min-microvolt = <1800000>;


regulator-max-microvolt = <1800000>;


vin-supply = <&vcc_3v3>;


regulator-always-on;


};

vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed";


regulator-name = "VCC_3V3";


regulator-min-microvolt = <3300000>;


regulator-max-microvolt = <3300000>;


vin-supply = <&vddao_3v3>;


regulator-always-on;


/* FIXME: actually controlled by VDDCPU_B_EN */


};

vddcpu_a: regulator-vddcpu-a {
/*


 * MP1653 Regulator.


 */


compatible = "pwm-regulator";



regulator-name = "VDDCPU_A";


regulator-min-microvolt = <721000>;


regulator-max-microvolt = <1022000>;



vin-supply = <&main_12v>;



pwms = <&pwm_ab 0 1250 0>;


pwm-dutycycle-range = <100 0>;



regulator-boot-on;


regulator-always-on;


};

vddcpu_b: regulator-vddcpu-b {
/*


 * MP1652 Regulator.


 */


compatible = "pwm-regulator";



regulator-name = "VDDCPU_B";


regulator-min-microvolt = <721000>;


regulator-max-microvolt = <1022000>;



vin-supply = <&main_12v>;



pwms = <&pwm_AO_cd 1 1250 0>;


pwm-dutycycle-range = <100 0>;



regulator-boot-on;


regulator-always-on;


};

usb1_pow: regulator-usb1-pow {
compatible = "regulator-fixed";


regulator-name = "USB1_POW";


regulator-min-microvolt = <5000000>;


regulator-max-microvolt = <5000000>;


vin-supply = <&vcc_5v>;



/* connected to SY6280A Power Switch */


gpio = <&gpio GPIOA_8 GPIO_ACTIVE_HIGH>;


enable-active-high;


};

usb_pwr_en: regulator-usb-pwr-en {
compatible = "regulator-fixed";


regulator-name = "USB_PWR_EN";


regulator-min-microvolt = <5000000>;


regulator-max-microvolt = <5000000>;


vin-supply = <&vcc_5v>;



/* Connected to USB3 Type-A Port power enable */


gpio = <&gpio GPIOAO_7 GPIO_ACTIVE_HIGH>;


enable-active-high;


};

vddao_1v8: regulator-vddao-1v8 {
compatible = "regulator-fixed";


regulator-name = "VDDAO_1V8";


regulator-min-microvolt = <1800000>;


regulator-max-microvolt = <1800000>;


vin-supply = <&vddao_3v3>;


regulator-always-on;


};

vddao_3v3: regulator-vddao-3v3 {
compatible = "regulator-fixed";


regulator-name = "VDDAO_3V3";


regulator-min-microvolt = <3300000>;


regulator-max-microvolt = <3300000>;


vin-supply = <&main_12v>;


regulator-always-on;


};

cvbs-connector {
compatible = "composite-video-connector";



port {


	cvbs_connector_in: endpoint {


		remote-endpoint = <&cvbs_vdac_out>;


	};


};


};

hdmi-connector {
compatible = "hdmi-connector";


type = "a";



port {


	hdmi_connector_in: endpoint {


		remote-endpoint = <&hdmi_tx_tmds_out>;


	};


};


};

wifi32k: wifi32k {
compatible = "pwm-clock";


#clock-cells = <0>;


clock-frequency = <32768>;


pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */


};

+};



+&cec_AO {

pinctrl-0 = <&cec_ao_a_h_pins>;
pinctrl-names = "default";
status = "disabled";
hdmi-phandle = <&hdmi_tx>;

+};



+&cecb_AO {

pinctrl-0 = <&cec_ao_b_h_pins>;
pinctrl-names = "default";
status = "okay";
hdmi-phandle = <&hdmi_tx>;

+};



+&cpu0 {

cpu-supply = <&vddcpu_b>;
operating-points-v2 = <&cpu_opp_table_0>;
clocks = <&clkc CLKID_CPU_CLK>;
clock-latency = <50000>;

+};



+&cpu1 {

cpu-supply = <&vddcpu_b>;
operating-points-v2 = <&cpu_opp_table_0>;
clocks = <&clkc CLKID_CPU_CLK>;
clock-latency = <50000>;

+};



+&cpu100 {

cpu-supply = <&vddcpu_a>;
operating-points-v2 = <&cpub_opp_table_1>;
clocks = <&clkc CLKID_CPUB_CLK>;
clock-latency = <50000>;

+};



+&cpu101 {

cpu-supply = <&vddcpu_a>;
operating-points-v2 = <&cpub_opp_table_1>;
clocks = <&clkc CLKID_CPUB_CLK>;
clock-latency = <50000>;

+};



+&cpu102 {

cpu-supply = <&vddcpu_a>;
operating-points-v2 = <&cpub_opp_table_1>;
clocks = <&clkc CLKID_CPUB_CLK>;
clock-latency = <50000>;

+};



+&cpu103 {

cpu-supply = <&vddcpu_a>;
operating-points-v2 = <&cpub_opp_table_1>;
clocks = <&clkc CLKID_CPUB_CLK>;
clock-latency = <50000>;

+};



+&cvbs_vdac_port {

cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;


};

+};



+&ext_mdio {

external_phy: ethernet-phy@0 {
/* Realtek RTL8211F (0x001cc916) */


reg = <0>;


max-speed = <1000>;



reset-assert-us = <10000>;


reset-deassert-us = <30000>;


reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;



interrupt-parent = <&gpio_intc>;


/* MAC_INTR on GPIOZ_14 */


interrupts = <26 IRQ_TYPE_LEVEL_LOW>;


};

+};



+&ethmac {

pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy-mode = "rgmii";
phy-handle = <&external_phy>;
amlogic,tx-delay-ns = <2>;

+};



+&hdmi_tx {

status = "okay";
pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
pinctrl-names = "default";
hdmi-supply = <&vcc_5v>;

+};



+&hdmi_tx_tmds_port {

hdmi_tx_tmds_out: endpoint {
remote-endpoint = <&hdmi_connector_in>;


};

+};



+&ir {

status = "okay";
pinctrl-0 = <&remote_input_ao_pins>;
pinctrl-names = "default";

+};



+&pwm_ab {

pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay";

+};



+&pwm_AO_cd {

pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay";

+};



+&pwm_ef {

pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay";

+};



+/* SDIO */
+&sd_emmc_a {

status = "okay";
pinctrl-0 = <&sdio_pins>;
pinctrl-1 = <&sdio_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";
#address-cells = <1>;
#size-cells = <0>;

bus-width = <4>;
cap-sd-highspeed;
max-frequency = <100000000>;

/* WiFi firmware requires power to be kept while in suspend */
keep-power-in-suspend;

non-removable;
disable-wp;

mmc-pwrseq = <&sdio_pwrseq>;

vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddao_1v8>;

brcmf: wifi@1 {
reg = <1>;


compatible = "brcm,bcm4329-fmac";


};

+};



+/* SD card */
+&sd_emmc_b {

status = "okay";
pinctrl-0 = <&sdcard_c_pins>;
pinctrl-1 = <&sdcard_clk_gate_c_pins>;
pinctrl-names = "default", "clk-gate";

bus-width = <4>;
cap-sd-highspeed;
max-frequency = <50000000>;
disable-wp;

cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddao_3v3>;

+};



+/* eMMC */
+&sd_emmc_c {

status = "okay";
pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";

bus-width = <8>;
cap-mmc-highspeed;
max-frequency = <100000000>;
disable-wp;

mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&flash_1v8>;

+};



+&uart_A {

status = "okay";
pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
pinctrl-names = "default";
uart-has-rtscts;

bluetooth {
compatible = "brcm,bcm43438-bt";


shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;


max-speed = <2000000>;


clocks = <&wifi32k>;


clock-names = "lpo";


};

+};



+&uart_AO {

status = "okay";
pinctrl-0 = <&uart_ao_a_pins>;
pinctrl-names = "default";

+};



+&usb {

status = "okay";
dr_mode = "host";
vbus-supply = <&usb_pwr_en>;

+};



+&usb2_phy0 {

phy-supply = <&usb1_pow>;

+};



+&usb2_phy1 {

phy-supply = <&usb1_pow>;

+};
Acked-by: Neil Armstrong narmstrong@baylibre.com

    