ARM64: dts: meson-gxbb-wetek: add a wetek specific dtsi to cleanup hub and play2

This patch adds a specific wetek dtsi to handle the specific Hub and Play2
boards by no more depending on the p20x dtsi.
This simplifies the hub and play2 dts and will avoid breaking these
boards when adding p200 and p201 specific changes.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

3 files changed, 262 insertions, 120 deletions

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
index ce80d5d0982c..2bfe69902552 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
@@ -6,50 +6,9 @@
 
 /dts-v1/;
 
-#include "meson-gxbb-p20x.dtsi"
+#include "meson-gxbb-wetek.dtsi"
 
 / {
         compatible = "wetek,hub", "amlogic,meson-gxbb";
         model = "WeTek Hub";
-
-        leds {
-                compatible = "gpio-leds";
-
-                system {
-                        label = "wetek-play:system-status";
-                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
-                        default-state = "on";
-                        panic-indicator;
-                };
-        };
-};
-
-&cvbs_connector {
-        status = "disabled";
-};
-
-&ethmac {
-        status = "okay";
-        pinctrl-0 = <&eth_rgmii_pins>;
-        pinctrl-names = "default";
-
-        phy-handle = <&eth_phy0>;
-        phy-mode = "rgmii";
-
-        amlogic,tx-delay-ns = <2>;
-
-        snps,reset-gpio = <&gpio GPIOZ_14 0>;
-        snps,reset-delays-us = <0 10000 1000000>;
-        snps,reset-active-low;
-
-        mdio {
-                compatible = "snps,dwmac-mdio";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                eth_phy0: ethernet-phy@0 {
-                        /* Realtek RTL8211F (0x001cc916) */
-                        reg = <0>;
-                };
-        };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
index 0d1f080cbb3e..0038522315de 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include "meson-gxbb-p20x.dtsi"
+#include "meson-gxbb-wetek.dtsi"
 #include <dt-bindings/input/input.h>
 
 / {
@@ -14,15 +14,6 @@
         model = "WeTek Play 2";
 
         leds {
-                compatible = "gpio-leds";
-
-                system {
-                        label = "wetek-play:system-status";
-                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
-                        default-state = "on";
-                        panic-indicator;
-                };
-
                 wifi {
                         label = "wetek-play:wifi-status";
                         gpios = <&gpio GPIODV_26 GPIO_ACTIVE_HIGH>;
@@ -48,82 +39,18 @@
                         gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
                 };
         };
-
-        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>;
-                        };
-                };
-        };
-};
-
-&cec_AO {
-        status = "okay";
-        pinctrl-0 = <&ao_cec_pins>;
-        pinctrl-names = "default";
-        hdmi-phandle = <&hdmi_tx>;
-};
-
-&cvbs_vdac_port {
-        cvbs_vdac_out: endpoint {
-                remote-endpoint = <&cvbs_connector_in>;
-        };
 };
 
-&ethmac {
+&i2c_A {
         status = "okay";
-        pinctrl-0 = <&eth_rgmii_pins>;
+        pinctrl-0 = <&i2c_a_pins>;
         pinctrl-names = "default";
-
-        phy-handle = <&eth_phy0>;
-        phy-mode = "rgmii";
-
-        amlogic,tx-delay-ns = <2>;
-
-        snps,reset-gpio = <&gpio GPIOZ_14 0>;
-        snps,reset-delays-us = <0 10000 1000000>;
-        snps,reset-active-low;
-
-        mdio {
-                compatible = "snps,dwmac-mdio";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                eth_phy0: ethernet-phy@0 {
-                        /* Realtek RTL8211F (0x001cc916) */
-                        reg = <0>;
-                };
-        };
 };
 
-&hdmi_tx {
+&usb1_phy {
         status = "okay";
-        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
-        pinctrl-names = "default";
 };
 
-&hdmi_tx_tmds_port {
-        hdmi_tx_tmds_out: endpoint {
-                remote-endpoint = <&hdmi_connector_in>;
-        };
-};
-
-&i2c_A {
+&usb1 {
         status = "okay";
-        pinctrl-0 = <&i2c_a_pins>;
-        pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
new file mode 100644
index 000000000000..70325b273bd2
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -0,0 +1,256 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2016 Andreas Färber
+ * Copyright (c) 2016 BayLibre, Inc.
+ * Author: Kevin Hilman <khilman@kernel.org>
+ */
+
+#include "meson-gxbb.dtsi"
+
+/ {
+        aliases {
+                serial0 = &uart_AO;
+                ethernet0 = &ethmac;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x40000000>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                system {
+                        label = "wetek-play:system-status";
+                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                        panic-indicator;
+                };
+        };
+
+        usb_pwr: regulator-usb-pwrs {
+                compatible = "regulator-fixed";
+
+                regulator-name = "USB_PWR";
+
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        vddio_boot: regulator-vddio_boot {
+                compatible = "regulator-fixed";
+                regulator-name = "VDDIO_BOOT";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+        };
+
+        vddao_3v3: regulator-vddao_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "VDDAO_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        vcc_3v3: regulator-vcc_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "VCC_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        emmc_pwrseq: emmc-pwrseq {
+                compatible = "mmc-pwrseq-emmc";
+                reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
+        };
+
+        wifi32k: wifi32k {
+                compatible = "pwm-clock";
+                #clock-cells = <0>;
+                clock-frequency = <32768>;
+                pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
+        };
+
+        sdio_pwrseq: sdio-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
+                clocks = <&wifi32k>;
+                clock-names = "ext_clock";
+        };
+
+        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>;
+                        };
+                };
+        };
+};
+
+&cec_AO {
+        status = "okay";
+        pinctrl-0 = <&ao_cec_pins>;
+        pinctrl-names = "default";
+        hdmi-phandle = <&hdmi_tx>;
+};
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
+
+&ethmac {
+        status = "okay";
+        pinctrl-0 = <&eth_rgmii_pins>;
+        pinctrl-names = "default";
+
+        phy-handle = <&eth_phy0>;
+        phy-mode = "rgmii";
+
+        amlogic,tx-delay-ns = <2>;
+
+        snps,reset-gpio = <&gpio GPIOZ_14 0>;
+        snps,reset-delays-us = <0 10000 1000000>;
+        snps,reset-active-low;
+
+        mdio {
+                compatible = "snps,dwmac-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                eth_phy0: ethernet-phy@0 {
+                        /* Realtek RTL8211F (0x001cc916) */
+                        reg = <0>;
+                        eee-broken-1000t;
+                };
+        };
+};
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&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_ef {
+        status = "okay";
+        pinctrl-0 = <&pwm_e_pins>;
+        pinctrl-names = "default";
+        clocks = <&clkc CLKID_FCLK_DIV4>;
+        clock-names = "clkin0";
+};
+
+/* Wireless SDIO Module */
+&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>;
+
+        non-removable;
+        disable-wp;
+
+        mmc-pwrseq = <&sdio_pwrseq>;
+
+        vmmc-supply = <&vddao_3v3>;
+        vqmmc-supply = <&vddio_boot>;
+
+        brcmf: wifi@1 {
+                reg = <1>;
+                compatible = "brcm,bcm4329-fmac";
+        };
+};
+
+/* SD card */
+&sd_emmc_b {
+        status = "okay";
+        pinctrl-0 = <&sdcard_pins>;
+        pinctrl-1 = <&sdcard_clk_gate_pins>;
+        pinctrl-names = "default", "clk-gate";
+
+        bus-width = <4>;
+        cap-sd-highspeed;
+        max-frequency = <100000000>;
+        disable-wp;
+
+        cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+
+        vmmc-supply = <&vddao_3v3>;
+        vqmmc-supply = <&vcc_3v3>;
+};
+
+/* eMMC */
+&sd_emmc_c {
+        status = "okay";
+        pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+        pinctrl-1 = <&emmc_clk_gate_pins>;
+        pinctrl-names = "default", "clk-gate";
+
+        bus-width = <8>;
+        cap-mmc-highspeed;
+        max-frequency = <200000000>;
+        non-removable;
+        disable-wp;
+        mmc-ddr-1_8v;
+        mmc-hs200-1_8v;
+
+        mmc-pwrseq = <&emmc_pwrseq>;
+        vmmc-supply = <&vcc_3v3>;
+        vqmmc-supply = <&vddio_boot>;
+};
+
+/* This UART is brought out to the DB9 connector */
+&uart_AO {
+        status = "okay";
+        pinctrl-0 = <&uart_ao_a_pins>;
+        pinctrl-names = "default";
+};
+
+&usb0_phy {
+        status = "okay";
+        phy-supply = <&usb_pwr>;
+};
+
+&usb0 {
+        status = "okay";
+};