]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dts: meson: Drop redundant G12A, G12B & SM1 devicetree files
authorNeil Armstrong <neil.armstrong@linaro.org>
Fri, 29 Mar 2024 17:51:52 +0000 (18:51 +0100)
committerNeil Armstrong <neil.armstrong@linaro.org>
Thu, 4 Apr 2024 16:48:46 +0000 (18:48 +0200)
Since meson G12A, G12B & SM1 based boards switched to using upstream DT,
so drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.

Cc: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Viacheslav Bocharov <adeep@lexina.in>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # khadas-vim3_android
Link: https://lore.kernel.org/r/20240329-u-boot-of-upstream-v2-5-2512ad3eb63d@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
46 files changed:
arch/arm/dts/Makefile
arch/arm/dts/meson-g12-common.dtsi [deleted file]
arch/arm/dts/meson-g12.dtsi [deleted file]
arch/arm/dts/meson-g12a-radxa-zero.dts [deleted file]
arch/arm/dts/meson-g12a-sei510.dts [deleted file]
arch/arm/dts/meson-g12a-u200.dts [deleted file]
arch/arm/dts/meson-g12a.dtsi [deleted file]
arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts [deleted file]
arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts [deleted file]
arch/arm/dts/meson-g12b-a311d.dtsi [deleted file]
arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts [deleted file]
arch/arm/dts/meson-g12b-bananapi-cm4.dtsi [deleted file]
arch/arm/dts/meson-g12b-bananapi.dtsi [deleted file]
arch/arm/dts/meson-g12b-gsking-x.dts [deleted file]
arch/arm/dts/meson-g12b-gtking-pro.dts [deleted file]
arch/arm/dts/meson-g12b-gtking.dts [deleted file]
arch/arm/dts/meson-g12b-khadas-vim3.dtsi [deleted file]
arch/arm/dts/meson-g12b-odroid-go-ultra.dts [deleted file]
arch/arm/dts/meson-g12b-odroid-n2-plus.dts [deleted file]
arch/arm/dts/meson-g12b-odroid-n2.dts [deleted file]
arch/arm/dts/meson-g12b-odroid-n2.dtsi [deleted file]
arch/arm/dts/meson-g12b-odroid-n2l.dts [deleted file]
arch/arm/dts/meson-g12b-odroid.dtsi [deleted file]
arch/arm/dts/meson-g12b-radxa-zero2.dts [deleted file]
arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts [deleted file]
arch/arm/dts/meson-g12b-s922x.dtsi [deleted file]
arch/arm/dts/meson-g12b-w400.dtsi [deleted file]
arch/arm/dts/meson-g12b.dtsi [deleted file]
arch/arm/dts/meson-khadas-vim3.dtsi [deleted file]
arch/arm/dts/meson-sm1-bananapi-m2-pro.dts [deleted file]
arch/arm/dts/meson-sm1-bananapi-m5.dts [deleted file]
arch/arm/dts/meson-sm1-bananapi.dtsi [deleted file]
arch/arm/dts/meson-sm1-khadas-vim3l.dts [deleted file]
arch/arm/dts/meson-sm1-odroid-c4.dts [deleted file]
arch/arm/dts/meson-sm1-odroid-hc4.dts [deleted file]
arch/arm/dts/meson-sm1-odroid.dtsi [deleted file]
arch/arm/dts/meson-sm1-sei610.dts [deleted file]
arch/arm/dts/meson-sm1.dtsi [deleted file]
include/dt-bindings/gpio/meson-g12a-gpio.h [deleted file]
include/dt-bindings/power/meson-g12a-power.h [deleted file]
include/dt-bindings/power/meson-sm1-power.h [deleted file]
include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h [deleted file]
include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h [deleted file]
include/dt-bindings/reset/amlogic,meson-g12a-reset.h [deleted file]
include/dt-bindings/sound/meson-g12a-toacodec.h [deleted file]
include/dt-bindings/sound/meson-g12a-tohdmitx.h [deleted file]

index cfed865b1989b82be1c081f0710912b86e05834e..da56c7012894884b20c7c604160a121e1cbe6156 100644 (file)
@@ -219,27 +219,8 @@ dtb-$(CONFIG_ARCH_S5P4418) += \
        s5p4418-nanopi2.dtb
 
 dtb-$(CONFIG_ARCH_MESON) += \
-       meson-a1-ad401.dtb \
-       meson-g12a-radxa-zero.dtb \
-       meson-g12a-sei510.dtb \
-       meson-g12a-u200.dtb \
-       meson-g12b-a311d-bananapi-m2s.dtb \
-       meson-g12b-a311d-khadas-vim3.dtb \
-       meson-g12b-bananapi-cm4-cm4io.dtb \
-       meson-g12b-gsking-x.dtb \
-       meson-g12b-gtking.dtb \
-       meson-g12b-gtking-pro.dtb \
-       meson-g12b-odroid-go-ultra.dtb \
-       meson-g12b-odroid-n2.dtb \
-       meson-g12b-odroid-n2l.dtb \
-       meson-g12b-odroid-n2-plus.dtb \
-       meson-g12b-radxa-zero2.dtb \
-       meson-sm1-bananapi-m2-pro.dtb \
-       meson-sm1-bananapi-m5.dtb \
-       meson-sm1-khadas-vim3l.dtb \
-       meson-sm1-odroid-c4.dtb \
-       meson-sm1-odroid-hc4.dtb \
-       meson-sm1-sei610.dtb
+       meson-a1-ad401.dtb
+
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
diff --git a/arch/arm/dts/meson-g12-common.dtsi b/arch/arm/dts/meson-g12-common.dtsi
deleted file mode 100644 (file)
index 9dbd508..0000000
+++ /dev/null
@@ -1,2493 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
- */
-
-#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clock/g12a-clkc.h>
-#include <dt-bindings/clock/g12a-aoclkc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
-#include <dt-bindings/thermal/thermal.h>
-
-/ {
-       interrupt-parent = <&gic>;
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       aliases {
-               mmc0 = &sd_emmc_b; /* SD card */
-               mmc1 = &sd_emmc_c; /* eMMC */
-               mmc2 = &sd_emmc_a; /* SDIO */
-       };
-
-       chosen {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               simplefb_cvbs: framebuffer-cvbs {
-                       compatible = "amlogic,simple-framebuffer",
-                                    "simple-framebuffer";
-                       amlogic,pipeline = "vpu-cvbs";
-                       clocks = <&clkc CLKID_HDMI>,
-                                <&clkc CLKID_HTX_PCLK>,
-                                <&clkc CLKID_VPU_INTR>;
-                       status = "disabled";
-               };
-
-               simplefb_hdmi: framebuffer-hdmi {
-                       compatible = "amlogic,simple-framebuffer",
-                                   "simple-framebuffer";
-                       amlogic,pipeline = "vpu-hdmi";
-                       clocks = <&clkc CLKID_HDMI>,
-                                <&clkc CLKID_HTX_PCLK>,
-                                <&clkc CLKID_VPU_INTR>;
-                       status = "disabled";
-               };
-       };
-
-       efuse: efuse {
-               compatible = "amlogic,meson-gxbb-efuse";
-               clocks = <&clkc CLKID_EFUSE>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               read-only;
-               secure-monitor = <&sm>;
-       };
-
-       gpu_opp_table: opp-table-gpu {
-               compatible = "operating-points-v2";
-
-               opp-124999998 {
-                       opp-hz = /bits/ 64 <124999998>;
-                       opp-microvolt = <800000>;
-               };
-               opp-249999996 {
-                       opp-hz = /bits/ 64 <249999996>;
-                       opp-microvolt = <800000>;
-               };
-               opp-285714281 {
-                       opp-hz = /bits/ 64 <285714281>;
-                       opp-microvolt = <800000>;
-               };
-               opp-399999994 {
-                       opp-hz = /bits/ 64 <399999994>;
-                       opp-microvolt = <800000>;
-               };
-               opp-499999992 {
-                       opp-hz = /bits/ 64 <499999992>;
-                       opp-microvolt = <800000>;
-               };
-               opp-666666656 {
-                       opp-hz = /bits/ 64 <666666656>;
-                       opp-microvolt = <800000>;
-               };
-               opp-799999987 {
-                       opp-hz = /bits/ 64 <799999987>;
-                       opp-microvolt = <800000>;
-               };
-       };
-
-       psci {
-               compatible = "arm,psci-1.0";
-               method = "smc";
-       };
-
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               /* 3 MiB reserved for ARM Trusted Firmware (BL31) */
-               secmon_reserved: secmon@5000000 {
-                       reg = <0x0 0x05000000 0x0 0x300000>;
-                       no-map;
-               };
-
-               /* 32 MiB reserved for ARM Trusted Firmware (BL32) */
-               secmon_reserved_bl32: secmon@5300000 {
-                       reg = <0x0 0x05300000 0x0 0x2000000>;
-                       no-map;
-               };
-
-               linux,cma {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x10000000>;
-                       alignment = <0x0 0x400000>;
-                       linux,cma-default;
-               };
-       };
-
-       sm: secure-monitor {
-               compatible = "amlogic,meson-gxbb-sm";
-       };
-
-       soc {
-               compatible = "simple-bus";
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               pcie: pcie@fc000000 {
-                       compatible = "amlogic,g12a-pcie", "snps,dw-pcie";
-                       reg = <0x0 0xfc000000 0x0 0x400000>,
-                             <0x0 0xff648000 0x0 0x2000>,
-                             <0x0 0xfc400000 0x0 0x200000>;
-                       reg-names = "elbi", "cfg", "config";
-                       interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
-                       bus-range = <0x0 0xff>;
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       device_type = "pci";
-                       ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000>,
-                                <0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
-
-                       clocks = <&clkc CLKID_PCIE_PHY
-                                 &clkc CLKID_PCIE_COMB
-                                 &clkc CLKID_PCIE_PLL>;
-                       clock-names = "general",
-                                     "pclk",
-                                     "port";
-                       resets = <&reset RESET_PCIE_CTRL_A>,
-                                <&reset RESET_PCIE_APB>;
-                       reset-names = "port",
-                                     "apb";
-                       num-lanes = <1>;
-                       phys = <&usb3_pcie_phy PHY_TYPE_PCIE>;
-                       phy-names = "pcie";
-                       status = "disabled";
-               };
-
-               ethmac: ethernet@ff3f0000 {
-                       compatible = "amlogic,meson-g12a-dwmac",
-                                    "snps,dwmac-3.70a",
-                                    "snps,dwmac";
-                       reg = <0x0 0xff3f0000 0x0 0x10000>,
-                             <0x0 0xff634540 0x0 0x8>;
-                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "macirq";
-                       clocks = <&clkc CLKID_ETH>,
-                                <&clkc CLKID_FCLK_DIV2>,
-                                <&clkc CLKID_MPLL2>,
-                                <&clkc CLKID_FCLK_DIV2>;
-                       clock-names = "stmmaceth", "clkin0", "clkin1",
-                                     "timing-adjustment";
-                       rx-fifo-depth = <4096>;
-                       tx-fifo-depth = <2048>;
-                       status = "disabled";
-
-                       mdio0: mdio {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "snps,dwmac-mdio";
-                       };
-               };
-
-               apb: bus@ff600000 {
-                       compatible = "simple-bus";
-                       reg = <0x0 0xff600000 0x0 0x200000>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges = <0x0 0x0 0x0 0xff600000 0x0 0x200000>;
-
-                       hdmi_tx: hdmi-tx@0 {
-                               compatible = "amlogic,meson-g12a-dw-hdmi";
-                               reg = <0x0 0x0 0x0 0x10000>;
-                               interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
-                               resets = <&reset RESET_HDMITX_CAPB3>,
-                                        <&reset RESET_HDMITX_PHY>,
-                                        <&reset RESET_HDMITX>;
-                               reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
-                               clocks = <&clkc CLKID_HDMI>,
-                                        <&clkc CLKID_HTX_PCLK>,
-                                        <&clkc CLKID_VPU_INTR>;
-                               clock-names = "isfr", "iahb", "venci";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               #sound-dai-cells = <0>;
-                               status = "disabled";
-
-                               /* VPU VENC Input */
-                               hdmi_tx_venc_port: port@0 {
-                                       reg = <0>;
-
-                                       hdmi_tx_in: endpoint {
-                                               remote-endpoint = <&hdmi_tx_out>;
-                                       };
-                               };
-
-                               /* TMDS Output */
-                               hdmi_tx_tmds_port: port@1 {
-                                       reg = <1>;
-                               };
-                       };
-
-                       apb_efuse: bus@30000 {
-                               compatible = "simple-bus";
-                               reg = <0x0 0x30000 0x0 0x2000>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x30000 0x0 0x2000>;
-
-                               hwrng: rng@218 {
-                                       compatible = "amlogic,meson-rng";
-                                       reg = <0x0 0x218 0x0 0x4>;
-                                       clocks = <&clkc CLKID_RNG0>;
-                                       clock-names = "core";
-                               };
-                       };
-
-                       acodec: audio-controller@32000 {
-                               compatible = "amlogic,t9015";
-                               reg = <0x0 0x32000 0x0 0x14>;
-                               #sound-dai-cells = <0>;
-                               sound-name-prefix = "ACODEC";
-                               clocks = <&clkc CLKID_AUDIO_CODEC>;
-                               clock-names = "pclk";
-                               resets = <&reset RESET_AUDIO_CODEC>;
-                               status = "disabled";
-                       };
-
-                       periphs: bus@34400 {
-                               compatible = "simple-bus";
-                               reg = <0x0 0x34400 0x0 0x400>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x34400 0x0 0x400>;
-
-                               periphs_pinctrl: pinctrl@40 {
-                                       compatible = "amlogic,meson-g12a-periphs-pinctrl";
-                                       #address-cells = <2>;
-                                       #size-cells = <2>;
-                                       ranges;
-
-                                       gpio: bank@40 {
-                                               reg = <0x0 0x40  0x0 0x4c>,
-                                                     <0x0 0xe8  0x0 0x18>,
-                                                     <0x0 0x120 0x0 0x18>,
-                                                     <0x0 0x2c0 0x0 0x40>,
-                                                     <0x0 0x340 0x0 0x1c>;
-                                               reg-names = "gpio",
-                                                           "pull",
-                                                           "pull-enable",
-                                                           "mux",
-                                                           "ds";
-                                               gpio-controller;
-                                               #gpio-cells = <2>;
-                                               gpio-ranges = <&periphs_pinctrl 0 0 86>;
-                                       };
-
-                                       cec_ao_a_h_pins: cec_ao_a_h {
-                                               mux {
-                                                       groups = "cec_ao_a_h";
-                                                       function = "cec_ao_a_h";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       cec_ao_b_h_pins: cec_ao_b_h {
-                                               mux {
-                                                       groups = "cec_ao_b_h";
-                                                       function = "cec_ao_b_h";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       emmc_ctrl_pins: emmc-ctrl {
-                                               mux-0 {
-                                                       groups = "emmc_cmd";
-                                                       function = "emmc";
-                                                       bias-pull-up;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-
-                                               mux-1 {
-                                                       groups = "emmc_clk";
-                                                       function = "emmc";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       emmc_data_4b_pins: emmc-data-4b {
-                                               mux-0 {
-                                                       groups = "emmc_nand_d0",
-                                                                "emmc_nand_d1",
-                                                                "emmc_nand_d2",
-                                                                "emmc_nand_d3";
-                                                       function = "emmc";
-                                                       bias-pull-up;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       emmc_data_8b_pins: emmc-data-8b {
-                                               mux-0 {
-                                                       groups = "emmc_nand_d0",
-                                                                "emmc_nand_d1",
-                                                                "emmc_nand_d2",
-                                                                "emmc_nand_d3",
-                                                                "emmc_nand_d4",
-                                                                "emmc_nand_d5",
-                                                                "emmc_nand_d6",
-                                                                "emmc_nand_d7";
-                                                       function = "emmc";
-                                                       bias-pull-up;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       emmc_ds_pins: emmc-ds {
-                                               mux {
-                                                       groups = "emmc_nand_ds";
-                                                       function = "emmc";
-                                                       bias-pull-down;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       emmc_clk_gate_pins: emmc_clk_gate {
-                                               mux {
-                                                       groups = "BOOT_8";
-                                                       function = "gpio_periphs";
-                                                       bias-pull-down;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       hdmitx_ddc_pins: hdmitx_ddc {
-                                               mux {
-                                                       groups = "hdmitx_sda",
-                                                                "hdmitx_sck";
-                                                       function = "hdmitx";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       hdmitx_hpd_pins: hdmitx_hpd {
-                                               mux {
-                                                       groups = "hdmitx_hpd_in";
-                                                       function = "hdmitx";
-                                                       bias-disable;
-                                               };
-                                       };
-
-
-                                       i2c0_sda_c_pins: i2c0-sda-c {
-                                               mux {
-                                                       groups = "i2c0_sda_c";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-
-                                               };
-                                       };
-
-                                       i2c0_sck_c_pins: i2c0-sck-c {
-                                               mux {
-                                                       groups = "i2c0_sck_c";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c0_sda_z0_pins: i2c0-sda-z0 {
-                                               mux {
-                                                       groups = "i2c0_sda_z0";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c0_sck_z1_pins: i2c0-sck-z1 {
-                                               mux {
-                                                       groups = "i2c0_sck_z1";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c0_sda_z7_pins: i2c0-sda-z7 {
-                                               mux {
-                                                       groups = "i2c0_sda_z7";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c0_sda_z8_pins: i2c0-sda-z8 {
-                                               mux {
-                                                       groups = "i2c0_sda_z8";
-                                                       function = "i2c0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sda_x_pins: i2c1-sda-x {
-                                               mux {
-                                                       groups = "i2c1_sda_x";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sck_x_pins: i2c1-sck-x {
-                                               mux {
-                                                       groups = "i2c1_sck_x";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sda_h2_pins: i2c1-sda-h2 {
-                                               mux {
-                                                       groups = "i2c1_sda_h2";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sck_h3_pins: i2c1-sck-h3 {
-                                               mux {
-                                                       groups = "i2c1_sck_h3";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sda_h6_pins: i2c1-sda-h6 {
-                                               mux {
-                                                       groups = "i2c1_sda_h6";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c1_sck_h7_pins: i2c1-sck-h7 {
-                                               mux {
-                                                       groups = "i2c1_sck_h7";
-                                                       function = "i2c1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c2_sda_x_pins: i2c2-sda-x {
-                                               mux {
-                                                       groups = "i2c2_sda_x";
-                                                       function = "i2c2";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c2_sck_x_pins: i2c2-sck-x {
-                                               mux {
-                                                       groups = "i2c2_sck_x";
-                                                       function = "i2c2";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c2_sda_z_pins: i2c2-sda-z {
-                                               mux {
-                                                       groups = "i2c2_sda_z";
-                                                       function = "i2c2";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c2_sck_z_pins: i2c2-sck-z {
-                                               mux {
-                                                       groups = "i2c2_sck_z";
-                                                       function = "i2c2";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c3_sda_h_pins: i2c3-sda-h {
-                                               mux {
-                                                       groups = "i2c3_sda_h";
-                                                       function = "i2c3";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c3_sck_h_pins: i2c3-sck-h {
-                                               mux {
-                                                       groups = "i2c3_sck_h";
-                                                       function = "i2c3";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c3_sda_a_pins: i2c3-sda-a {
-                                               mux {
-                                                       groups = "i2c3_sda_a";
-                                                       function = "i2c3";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c3_sck_a_pins: i2c3-sck-a {
-                                               mux {
-                                                       groups = "i2c3_sck_a";
-                                                       function = "i2c3";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk0_a_pins: mclk0-a {
-                                               mux {
-                                                       groups = "mclk0_a";
-                                                       function = "mclk0";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk1_a_pins: mclk1-a {
-                                               mux {
-                                                       groups = "mclk1_a";
-                                                       function = "mclk1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk1_x_pins: mclk1-x {
-                                               mux {
-                                                       groups = "mclk1_x";
-                                                       function = "mclk1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk1_z_pins: mclk1-z {
-                                               mux {
-                                                       groups = "mclk1_z";
-                                                       function = "mclk1";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       nor_pins: nor {
-                                               mux {
-                                                       groups = "nor_d",
-                                                              "nor_q",
-                                                              "nor_c",
-                                                              "nor_cs";
-                                                       function = "nor";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din0_a_pins: pdm-din0-a {
-                                               mux {
-                                                       groups = "pdm_din0_a";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din0_c_pins: pdm-din0-c {
-                                               mux {
-                                                       groups = "pdm_din0_c";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din0_x_pins: pdm-din0-x {
-                                               mux {
-                                                       groups = "pdm_din0_x";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din0_z_pins: pdm-din0-z {
-                                               mux {
-                                                       groups = "pdm_din0_z";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din1_a_pins: pdm-din1-a {
-                                               mux {
-                                                       groups = "pdm_din1_a";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din1_c_pins: pdm-din1-c {
-                                               mux {
-                                                       groups = "pdm_din1_c";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din1_x_pins: pdm-din1-x {
-                                               mux {
-                                                       groups = "pdm_din1_x";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din1_z_pins: pdm-din1-z {
-                                               mux {
-                                                       groups = "pdm_din1_z";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din2_a_pins: pdm-din2-a {
-                                               mux {
-                                                       groups = "pdm_din2_a";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din2_c_pins: pdm-din2-c {
-                                               mux {
-                                                       groups = "pdm_din2_c";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din2_x_pins: pdm-din2-x {
-                                               mux {
-                                                       groups = "pdm_din2_x";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din2_z_pins: pdm-din2-z {
-                                               mux {
-                                                       groups = "pdm_din2_z";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din3_a_pins: pdm-din3-a {
-                                               mux {
-                                                       groups = "pdm_din3_a";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din3_c_pins: pdm-din3-c {
-                                               mux {
-                                                       groups = "pdm_din3_c";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din3_x_pins: pdm-din3-x {
-                                               mux {
-                                                       groups = "pdm_din3_x";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_din3_z_pins: pdm-din3-z {
-                                               mux {
-                                                       groups = "pdm_din3_z";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pdm_dclk_a_pins: pdm-dclk-a {
-                                               mux {
-                                                       groups = "pdm_dclk_a";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <500>;
-                                               };
-                                       };
-
-                                       pdm_dclk_c_pins: pdm-dclk-c {
-                                               mux {
-                                                       groups = "pdm_dclk_c";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <500>;
-                                               };
-                                       };
-
-                                       pdm_dclk_x_pins: pdm-dclk-x {
-                                               mux {
-                                                       groups = "pdm_dclk_x";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <500>;
-                                               };
-                                       };
-
-                                       pdm_dclk_z_pins: pdm-dclk-z {
-                                               mux {
-                                                       groups = "pdm_dclk_z";
-                                                       function = "pdm";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <500>;
-                                               };
-                                       };
-
-                                       pwm_a_pins: pwm-a {
-                                               mux {
-                                                       groups = "pwm_a";
-                                                       function = "pwm_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_b_x7_pins: pwm-b-x7 {
-                                               mux {
-                                                       groups = "pwm_b_x7";
-                                                       function = "pwm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_b_x19_pins: pwm-b-x19 {
-                                               mux {
-                                                       groups = "pwm_b_x19";
-                                                       function = "pwm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_c_c_pins: pwm-c-c {
-                                               mux {
-                                                       groups = "pwm_c_c";
-                                                       function = "pwm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_c_x5_pins: pwm-c-x5 {
-                                               mux {
-                                                       groups = "pwm_c_x5";
-                                                       function = "pwm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_c_x8_pins: pwm-c-x8 {
-                                               mux {
-                                                       groups = "pwm_c_x8";
-                                                       function = "pwm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_d_x3_pins: pwm-d-x3 {
-                                               mux {
-                                                       groups = "pwm_d_x3";
-                                                       function = "pwm_d";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_d_x6_pins: pwm-d-x6 {
-                                               mux {
-                                                       groups = "pwm_d_x6";
-                                                       function = "pwm_d";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_e_pins: pwm-e {
-                                               mux {
-                                                       groups = "pwm_e";
-                                                       function = "pwm_e";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_f_z_pins: pwm-f-z {
-                                               mux {
-                                                       groups = "pwm_f_z";
-                                                       function = "pwm_f";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_f_a_pins: pwm-f-a {
-                                               mux {
-                                                       groups = "pwm_f_a";
-                                                       function = "pwm_f";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_f_x_pins: pwm-f-x {
-                                               mux {
-                                                       groups = "pwm_f_x";
-                                                       function = "pwm_f";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_f_h_pins: pwm-f-h {
-                                               mux {
-                                                       groups = "pwm_f_h";
-                                                       function = "pwm_f";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       sdcard_c_pins: sdcard_c {
-                                               mux-0 {
-                                                       groups = "sdcard_d0_c",
-                                                                "sdcard_d1_c",
-                                                                "sdcard_d2_c",
-                                                                "sdcard_d3_c",
-                                                                "sdcard_cmd_c";
-                                                       function = "sdcard";
-                                                       bias-pull-up;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-
-                                               mux-1 {
-                                                       groups = "sdcard_clk_c";
-                                                       function = "sdcard";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       sdcard_clk_gate_c_pins: sdcard_clk_gate_c {
-                                               mux {
-                                                       groups = "GPIOC_4";
-                                                       function = "gpio_periphs";
-                                                       bias-pull-down;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       sdcard_z_pins: sdcard_z {
-                                               mux-0 {
-                                                       groups = "sdcard_d0_z",
-                                                                "sdcard_d1_z",
-                                                                "sdcard_d2_z",
-                                                                "sdcard_d3_z",
-                                                                "sdcard_cmd_z";
-                                                       function = "sdcard";
-                                                       bias-pull-up;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-
-                                               mux-1 {
-                                                       groups = "sdcard_clk_z";
-                                                       function = "sdcard";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       sdcard_clk_gate_z_pins: sdcard_clk_gate_z {
-                                               mux {
-                                                       groups = "GPIOZ_6";
-                                                       function = "gpio_periphs";
-                                                       bias-pull-down;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       sdio_pins: sdio {
-                                               mux {
-                                                       groups = "sdio_d0",
-                                                                "sdio_d1",
-                                                                "sdio_d2",
-                                                                "sdio_d3",
-                                                                "sdio_clk",
-                                                                "sdio_cmd";
-                                                       function = "sdio";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       sdio_clk_gate_pins: sdio_clk_gate {
-                                               mux {
-                                                       groups = "GPIOX_4";
-                                                       function = "gpio_periphs";
-                                                       bias-pull-down;
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       spdif_in_a10_pins: spdif-in-a10 {
-                                               mux {
-                                                       groups = "spdif_in_a10";
-                                                       function = "spdif_in";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_in_a12_pins: spdif-in-a12 {
-                                               mux {
-                                                       groups = "spdif_in_a12";
-                                                       function = "spdif_in";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_in_h_pins: spdif-in-h {
-                                               mux {
-                                                       groups = "spdif_in_h";
-                                                       function = "spdif_in";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_out_h_pins: spdif-out-h {
-                                               mux {
-                                                       groups = "spdif_out_h";
-                                                       function = "spdif_out";
-                                                       drive-strength-microamp = <500>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_out_a11_pins: spdif-out-a11 {
-                                               mux {
-                                                       groups = "spdif_out_a11";
-                                                       function = "spdif_out";
-                                                       drive-strength-microamp = <500>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_out_a13_pins: spdif-out-a13 {
-                                               mux {
-                                                       groups = "spdif_out_a13";
-                                                       function = "spdif_out";
-                                                       drive-strength-microamp = <500>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spicc0_x_pins: spicc0-x {
-                                               mux {
-                                                       groups = "spi0_mosi_x",
-                                                              "spi0_miso_x",
-                                                              "spi0_clk_x";
-                                                       function = "spi0";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spicc0_ss0_x_pins: spicc0-ss0-x {
-                                               mux {
-                                                       groups = "spi0_ss0_x";
-                                                       function = "spi0";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spicc0_c_pins: spicc0-c {
-                                               mux {
-                                                       groups = "spi0_mosi_c",
-                                                              "spi0_miso_c",
-                                                              "spi0_ss0_c",
-                                                              "spi0_clk_c";
-                                                       function = "spi0";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spicc1_pins: spicc1 {
-                                               mux {
-                                                       groups = "spi1_mosi",
-                                                              "spi1_miso",
-                                                              "spi1_clk";
-                                                       function = "spi1";
-                                                       drive-strength-microamp = <4000>;
-                                               };
-                                       };
-
-                                       spicc1_ss0_pins: spicc1-ss0 {
-                                               mux {
-                                                       groups = "spi1_ss0";
-                                                       function = "spi1";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_a_din0_pins: tdm-a-din0 {
-                                               mux {
-                                                       groups = "tdm_a_din0";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-
-                                       tdm_a_din1_pins: tdm-a-din1 {
-                                               mux {
-                                                       groups = "tdm_a_din1";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_a_dout0_pins: tdm-a-dout0 {
-                                               mux {
-                                                       groups = "tdm_a_dout0";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_a_dout1_pins: tdm-a-dout1 {
-                                               mux {
-                                                       groups = "tdm_a_dout1";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_a_fs_pins: tdm-a-fs {
-                                               mux {
-                                                       groups = "tdm_a_fs";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_a_sclk_pins: tdm-a-sclk {
-                                               mux {
-                                                       groups = "tdm_a_sclk";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_a_slv_fs_pins: tdm-a-slv-fs {
-                                               mux {
-                                                       groups = "tdm_a_slv_fs";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-
-                                       tdm_a_slv_sclk_pins: tdm-a-slv-sclk {
-                                               mux {
-                                                       groups = "tdm_a_slv_sclk";
-                                                       function = "tdm_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_din0_pins: tdm-b-din0 {
-                                               mux {
-                                                       groups = "tdm_b_din0";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_din1_pins: tdm-b-din1 {
-                                               mux {
-                                                       groups = "tdm_b_din1";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_din2_pins: tdm-b-din2 {
-                                               mux {
-                                                       groups = "tdm_b_din2";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_din3_a_pins: tdm-b-din3-a {
-                                               mux {
-                                                       groups = "tdm_b_din3_a";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_din3_h_pins: tdm-b-din3-h {
-                                               mux {
-                                                       groups = "tdm_b_din3_h";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_dout0_pins: tdm-b-dout0 {
-                                               mux {
-                                                       groups = "tdm_b_dout0";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_dout1_pins: tdm-b-dout1 {
-                                               mux {
-                                                       groups = "tdm_b_dout1";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_dout2_pins: tdm-b-dout2 {
-                                               mux {
-                                                       groups = "tdm_b_dout2";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_dout3_a_pins: tdm-b-dout3-a {
-                                               mux {
-                                                       groups = "tdm_b_dout3_a";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_dout3_h_pins: tdm-b-dout3-h {
-                                               mux {
-                                                       groups = "tdm_b_dout3_h";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_fs_pins: tdm-b-fs {
-                                               mux {
-                                                       groups = "tdm_b_fs";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_sclk_pins: tdm-b-sclk {
-                                               mux {
-                                                       groups = "tdm_b_sclk";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_b_slv_fs_pins: tdm-b-slv-fs {
-                                               mux {
-                                                       groups = "tdm_b_slv_fs";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_b_slv_sclk_pins: tdm-b-slv-sclk {
-                                               mux {
-                                                       groups = "tdm_b_slv_sclk";
-                                                       function = "tdm_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din0_a_pins: tdm-c-din0-a {
-                                               mux {
-                                                       groups = "tdm_c_din0_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din0_z_pins: tdm-c-din0-z {
-                                               mux {
-                                                       groups = "tdm_c_din0_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din1_a_pins: tdm-c-din1-a {
-                                               mux {
-                                                       groups = "tdm_c_din1_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din1_z_pins: tdm-c-din1-z {
-                                               mux {
-                                                       groups = "tdm_c_din1_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din2_a_pins: tdm-c-din2-a {
-                                               mux {
-                                                       groups = "tdm_c_din2_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       eth_leds_pins: eth-leds {
-                                               mux {
-                                                       groups = "eth_link_led",
-                                                                "eth_act_led";
-                                                       function = "eth";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       eth_pins: eth {
-                                               mux {
-                                                       groups = "eth_mdio",
-                                                                "eth_mdc",
-                                                                "eth_rgmii_rx_clk",
-                                                                "eth_rx_dv",
-                                                                "eth_rxd0",
-                                                                "eth_rxd1",
-                                                                "eth_txen",
-                                                                "eth_txd0",
-                                                                "eth_txd1";
-                                                       function = "eth";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       eth_rgmii_pins: eth-rgmii {
-                                               mux {
-                                                       groups = "eth_rxd2_rgmii",
-                                                                "eth_rxd3_rgmii",
-                                                                "eth_rgmii_tx_clk",
-                                                                "eth_txd2_rgmii",
-                                                                "eth_txd3_rgmii";
-                                                       function = "eth";
-                                                       drive-strength-microamp = <4000>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din2_z_pins: tdm-c-din2-z {
-                                               mux {
-                                                       groups = "tdm_c_din2_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din3_a_pins: tdm-c-din3-a {
-                                               mux {
-                                                       groups = "tdm_c_din3_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_din3_z_pins: tdm-c-din3-z {
-                                               mux {
-                                                       groups = "tdm_c_din3_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_dout0_a_pins: tdm-c-dout0-a {
-                                               mux {
-                                                       groups = "tdm_c_dout0_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout0_z_pins: tdm-c-dout0-z {
-                                               mux {
-                                                       groups = "tdm_c_dout0_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout1_a_pins: tdm-c-dout1-a {
-                                               mux {
-                                                       groups = "tdm_c_dout1_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout1_z_pins: tdm-c-dout1-z {
-                                               mux {
-                                                       groups = "tdm_c_dout1_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout2_a_pins: tdm-c-dout2-a {
-                                               mux {
-                                                       groups = "tdm_c_dout2_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout2_z_pins: tdm-c-dout2-z {
-                                               mux {
-                                                       groups = "tdm_c_dout2_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout3_a_pins: tdm-c-dout3-a {
-                                               mux {
-                                                       groups = "tdm_c_dout3_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_dout3_z_pins: tdm-c-dout3-z {
-                                               mux {
-                                                       groups = "tdm_c_dout3_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_fs_a_pins: tdm-c-fs-a {
-                                               mux {
-                                                       groups = "tdm_c_fs_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_fs_z_pins: tdm-c-fs-z {
-                                               mux {
-                                                       groups = "tdm_c_fs_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_sclk_a_pins: tdm-c-sclk-a {
-                                               mux {
-                                                       groups = "tdm_c_sclk_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_sclk_z_pins: tdm-c-sclk-z {
-                                               mux {
-                                                       groups = "tdm_c_sclk_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_c_slv_fs_a_pins: tdm-c-slv-fs-a {
-                                               mux {
-                                                       groups = "tdm_c_slv_fs_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_slv_fs_z_pins: tdm-c-slv-fs-z {
-                                               mux {
-                                                       groups = "tdm_c_slv_fs_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_slv_sclk_a_pins: tdm-c-slv-sclk-a {
-                                               mux {
-                                                       groups = "tdm_c_slv_sclk_a";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_c_slv_sclk_z_pins: tdm-c-slv-sclk-z {
-                                               mux {
-                                                       groups = "tdm_c_slv_sclk_z";
-                                                       function = "tdm_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_a_pins: uart-a {
-                                               mux {
-                                                       groups = "uart_a_tx",
-                                                                "uart_a_rx";
-                                                       function = "uart_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_a_cts_rts_pins: uart-a-cts-rts {
-                                               mux {
-                                                       groups = "uart_a_cts",
-                                                                "uart_a_rts";
-                                                       function = "uart_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_b_pins: uart-b {
-                                               mux {
-                                                       groups = "uart_b_tx",
-                                                                "uart_b_rx";
-                                                       function = "uart_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_c_pins: uart-c {
-                                               mux {
-                                                       groups = "uart_c_tx",
-                                                                "uart_c_rx";
-                                                       function = "uart_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_c_cts_rts_pins: uart-c-cts-rts {
-                                               mux {
-                                                       groups = "uart_c_cts",
-                                                                "uart_c_rts";
-                                                       function = "uart_c";
-                                                       bias-disable;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cpu_temp: temperature-sensor@34800 {
-                               compatible = "amlogic,g12a-cpu-thermal",
-                                            "amlogic,g12a-thermal";
-                               reg = <0x0 0x34800 0x0 0x50>;
-                               interrupts = <GIC_SPI 35 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&clkc CLKID_TS>;
-                               #thermal-sensor-cells = <0>;
-                               amlogic,ao-secure = <&sec_AO>;
-                       };
-
-                       ddr_temp: temperature-sensor@34c00 {
-                               compatible = "amlogic,g12a-ddr-thermal",
-                                            "amlogic,g12a-thermal";
-                               reg = <0x0 0x34c00 0x0 0x50>;
-                               interrupts = <GIC_SPI 36 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&clkc CLKID_TS>;
-                               #thermal-sensor-cells = <0>;
-                               amlogic,ao-secure = <&sec_AO>;
-                       };
-
-                       usb2_phy0: phy@36000 {
-                               compatible = "amlogic,g12a-usb2-phy";
-                               reg = <0x0 0x36000 0x0 0x2000>;
-                               clocks = <&xtal>;
-                               clock-names = "xtal";
-                               resets = <&reset RESET_USB_PHY20>;
-                               reset-names = "phy";
-                               #phy-cells = <0>;
-                       };
-
-                       dmc: bus@38000 {
-                               compatible = "simple-bus";
-                               reg = <0x0 0x38000 0x0 0x400>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;
-
-                               canvas: video-lut@48 {
-                                       compatible = "amlogic,canvas";
-                                       reg = <0x0 0x48 0x0 0x14>;
-                               };
-                       };
-
-                       usb2_phy1: phy@3a000 {
-                               compatible = "amlogic,g12a-usb2-phy";
-                               reg = <0x0 0x3a000 0x0 0x2000>;
-                               clocks = <&xtal>;
-                               clock-names = "xtal";
-                               resets = <&reset RESET_USB_PHY21>;
-                               reset-names = "phy";
-                               #phy-cells = <0>;
-                       };
-
-                       hiu: bus@3c000 {
-                               compatible = "simple-bus";
-                               reg = <0x0 0x3c000 0x0 0x1400>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x3c000 0x0 0x1400>;
-
-                               hhi: system-controller@0 {
-                                       compatible = "amlogic,meson-gx-hhi-sysctrl",
-                                                    "simple-mfd", "syscon";
-                                       reg = <0 0 0 0x400>;
-
-                                       clkc: clock-controller {
-                                               compatible = "amlogic,g12a-clkc";
-                                               #clock-cells = <1>;
-                                               clocks = <&xtal>;
-                                               clock-names = "xtal";
-                                       };
-
-                                       pwrc: power-controller {
-                                               compatible = "amlogic,meson-g12a-pwrc";
-                                               #power-domain-cells = <1>;
-                                               amlogic,ao-sysctrl = <&rti>;
-                                               resets = <&reset RESET_VIU>,
-                                                        <&reset RESET_VENC>,
-                                                        <&reset RESET_VCBUS>,
-                                                        <&reset RESET_BT656>,
-                                                        <&reset RESET_RDMA>,
-                                                        <&reset RESET_VENCI>,
-                                                        <&reset RESET_VENCP>,
-                                                        <&reset RESET_VDAC>,
-                                                        <&reset RESET_VDI6>,
-                                                        <&reset RESET_VENCL>,
-                                                        <&reset RESET_VID_LOCK>;
-                                               reset-names = "viu", "venc", "vcbus", "bt656",
-                                                             "rdma", "venci", "vencp", "vdac",
-                                                             "vdi6", "vencl", "vid_lock";
-                                               clocks = <&clkc CLKID_VPU>,
-                                                        <&clkc CLKID_VAPB>;
-                                               clock-names = "vpu", "vapb";
-                                               /*
-                                                * VPU clocking is provided by two identical clock paths
-                                                * VPU_0 and VPU_1 muxed to a single clock by a glitch
-                                                * free mux to safely change frequency while running.
-                                                * Same for VAPB but with a final gate after the glitch free mux.
-                                                */
-                                               assigned-clocks = <&clkc CLKID_VPU_0_SEL>,
-                                                                 <&clkc CLKID_VPU_0>,
-                                                                 <&clkc CLKID_VPU>, /* Glitch free mux */
-                                                                 <&clkc CLKID_VAPB_0_SEL>,
-                                                                 <&clkc CLKID_VAPB_0>,
-                                                                 <&clkc CLKID_VAPB_SEL>; /* Glitch free mux */
-                                               assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
-                                                                        <0>, /* Do Nothing */
-                                                                        <&clkc CLKID_VPU_0>,
-                                                                        <&clkc CLKID_FCLK_DIV4>,
-                                                                        <0>, /* Do Nothing */
-                                                                        <&clkc CLKID_VAPB_0>;
-                                               assigned-clock-rates = <0>, /* Do Nothing */
-                                                                      <666666666>,
-                                                                      <0>, /* Do Nothing */
-                                                                      <0>, /* Do Nothing */
-                                                                      <250000000>,
-                                                                      <0>; /* Do Nothing */
-                                       };
-                               };
-                       };
-
-                       usb3_pcie_phy: phy@46000 {
-                               compatible = "amlogic,g12a-usb3-pcie-phy";
-                               reg = <0x0 0x46000 0x0 0x2000>;
-                               clocks = <&clkc CLKID_PCIE_PLL>;
-                               clock-names = "ref_clk";
-                               resets = <&reset RESET_PCIE_PHY>;
-                               reset-names = "phy";
-                               assigned-clocks = <&clkc CLKID_PCIE_PLL>;
-                               assigned-clock-rates = <100000000>;
-                               #phy-cells = <1>;
-                       };
-
-                       eth_phy: mdio-multiplexer@4c000 {
-                               compatible = "amlogic,g12a-mdio-mux";
-                               reg = <0x0 0x4c000 0x0 0xa4>;
-                               clocks = <&clkc CLKID_ETH_PHY>,
-                                        <&xtal>,
-                                        <&clkc CLKID_MPLL_50M>;
-                               clock-names = "pclk", "clkin0", "clkin1";
-                               mdio-parent-bus = <&mdio0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               ext_mdio: mdio@0 {
-                                       reg = <0>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                               };
-
-                               int_mdio: mdio@1 {
-                                       reg = <1>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       internal_ephy: ethernet_phy@8 {
-                                               compatible = "ethernet-phy-id0180.3301",
-                                                            "ethernet-phy-ieee802.3-c22";
-                                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                                               reg = <8>;
-                                               max-speed = <100>;
-                                       };
-                               };
-                       };
-               };
-
-               pmu: pmu@ff638000 {
-                       reg = <0x0 0xff638000 0x0 0x100>,
-                             <0x0 0xff638c00 0x0 0x100>;
-                       interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               aobus: bus@ff800000 {
-                       compatible = "simple-bus";
-                       reg = <0x0 0xff800000 0x0 0x100000>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>;
-
-                       rti: sys-ctrl@0 {
-                               compatible = "amlogic,meson-gx-ao-sysctrl",
-                                            "simple-mfd", "syscon";
-                               reg = <0x0 0x0 0x0 0x100>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x0 0x0 0x100>;
-
-                               clkc_AO: clock-controller {
-                                       compatible = "amlogic,meson-g12a-aoclkc";
-                                       #clock-cells = <1>;
-                                       #reset-cells = <1>;
-                                       clocks = <&xtal>, <&clkc CLKID_CLK81>;
-                                       clock-names = "xtal", "mpeg-clk";
-                               };
-
-                               ao_pinctrl: pinctrl@14 {
-                                       compatible = "amlogic,meson-g12a-aobus-pinctrl";
-                                       #address-cells = <2>;
-                                       #size-cells = <2>;
-                                       ranges;
-
-                                       gpio_ao: bank@14 {
-                                               reg = <0x0 0x14 0x0 0x8>,
-                                                     <0x0 0x1c 0x0 0x8>,
-                                                     <0x0 0x24 0x0 0x14>;
-                                               reg-names = "mux",
-                                                           "ds",
-                                                           "gpio";
-                                               gpio-controller;
-                                               #gpio-cells = <2>;
-                                               gpio-ranges = <&ao_pinctrl 0 0 15>;
-                                       };
-
-                                       i2c_ao_sck_pins: i2c_ao_sck_pins {
-                                               mux {
-                                                       groups = "i2c_ao_sck";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c_ao_sda_pins: i2c_ao_sda {
-                                               mux {
-                                                       groups = "i2c_ao_sda";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c_ao_sck_e_pins: i2c_ao_sck_e {
-                                               mux {
-                                                       groups = "i2c_ao_sck_e";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       i2c_ao_sda_e_pins: i2c_ao_sda_e {
-                                               mux {
-                                                       groups = "i2c_ao_sda_e";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk0_ao_pins: mclk0-ao {
-                                               mux {
-                                                       groups = "mclk0_ao";
-                                                       function = "mclk0_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_din0_pins: tdm-ao-b-din0 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din0";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       spdif_ao_out_pins: spdif-ao-out {
-                                               mux {
-                                                       groups = "spdif_ao_out";
-                                                       function = "spdif_ao_out";
-                                                       drive-strength-microamp = <500>;
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_ao_b_din1_pins: tdm-ao-b-din1 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din1";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_ao_b_din2_pins: tdm-ao-b-din2 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din2";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_ao_b_dout0_pins: tdm-ao-b-dout0 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout0";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_dout1_pins: tdm-ao-b-dout1 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout1";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_dout2_pins: tdm-ao-b-dout2 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout2";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_fs_pins: tdm-ao-b-fs {
-                                               mux {
-                                                       groups = "tdm_ao_b_fs";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_sclk_pins: tdm-ao-b-sclk {
-                                               mux {
-                                                       groups = "tdm_ao_b_sclk";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs {
-                                               mux {
-                                                       groups = "tdm_ao_b_slv_fs";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk {
-                                               mux {
-                                                       groups = "tdm_ao_b_slv_sclk";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_ao_a_pins: uart-a-ao {
-                                               mux {
-                                                       groups = "uart_ao_a_tx",
-                                                                "uart_ao_a_rx";
-                                                       function = "uart_ao_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts {
-                                               mux {
-                                                       groups = "uart_ao_a_cts",
-                                                                "uart_ao_a_rts";
-                                                       function = "uart_ao_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_ao_b_2_3_pins: uart-ao-b-2-3 {
-                                               mux {
-                                                       groups = "uart_ao_b_tx_2",
-                                                                "uart_ao_b_rx_3";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_ao_b_8_9_pins: uart-ao-b-8-9 {
-                                               mux {
-                                                       groups = "uart_ao_b_tx_8",
-                                                                "uart_ao_b_rx_9";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
-                                               mux {
-                                                       groups = "uart_ao_b_cts",
-                                                                "uart_ao_b_rts";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_a_e_pins: pwm-a-e {
-                                               mux {
-                                                       groups = "pwm_a_e";
-                                                       function = "pwm_a_e";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_a_pins: pwm-ao-a {
-                                               mux {
-                                                       groups = "pwm_ao_a";
-                                                       function = "pwm_ao_a";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_b_pins: pwm-ao-b {
-                                               mux {
-                                                       groups = "pwm_ao_b";
-                                                       function = "pwm_ao_b";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_c_4_pins: pwm-ao-c-4 {
-                                               mux {
-                                                       groups = "pwm_ao_c_4";
-                                                       function = "pwm_ao_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_c_6_pins: pwm-ao-c-6 {
-                                               mux {
-                                                       groups = "pwm_ao_c_6";
-                                                       function = "pwm_ao_c";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_d_5_pins: pwm-ao-d-5 {
-                                               mux {
-                                                       groups = "pwm_ao_d_5";
-                                                       function = "pwm_ao_d";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_d_10_pins: pwm-ao-d-10 {
-                                               mux {
-                                                       groups = "pwm_ao_d_10";
-                                                       function = "pwm_ao_d";
-                                                       bias-disable;
-                                               };
-                                       };
-
-                                       pwm_ao_d_e_pins: pwm-ao-d-e {
-                                               mux {
-                                                       groups = "pwm_ao_d_e";
-                                                       function = "pwm_ao_d";
-                                               };
-                                       };
-
-                                       remote_input_ao_pins: remote-input-ao {
-                                               mux {
-                                                       groups = "remote_ao_input";
-                                                       function = "remote_ao_input";
-                                                       bias-disable;
-                                               };
-                                       };
-                               };
-                       };
-
-                       vrtc: rtc@a8 {
-                               compatible = "amlogic,meson-vrtc";
-                               reg = <0x0 0x000a8 0x0 0x4>;
-                       };
-
-                       cec_AO: cec@100 {
-                               compatible = "amlogic,meson-gx-ao-cec";
-                               reg = <0x0 0x00100 0x0 0x14>;
-                               interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&clkc_AO CLKID_AO_CEC>;
-                               clock-names = "core";
-                               status = "disabled";
-                       };
-
-                       sec_AO: ao-secure@140 {
-                               compatible = "amlogic,meson-gx-ao-secure", "syscon";
-                               reg = <0x0 0x140 0x0 0x140>;
-                               amlogic,has-chip-id;
-                       };
-
-                       cecb_AO: cec@280 {
-                               compatible = "amlogic,meson-g12a-ao-cec";
-                               reg = <0x0 0x00280 0x0 0x1c>;
-                               interrupts = <GIC_SPI 203 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&clkc_AO CLKID_AO_CTS_OSCIN>;
-                               clock-names = "oscin";
-                               status = "disabled";
-                       };
-
-                       pwm_AO_cd: pwm@2000 {
-                               compatible = "amlogic,meson-g12a-ao-pwm-cd";
-                               reg = <0x0 0x2000 0x0 0x20>;
-                               #pwm-cells = <3>;
-                               status = "disabled";
-                       };
-
-                       uart_AO: serial@3000 {
-                               compatible = "amlogic,meson-gx-uart",
-                                            "amlogic,meson-ao-uart";
-                               reg = <0x0 0x3000 0x0 0x18>;
-                               interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>, <&clkc_AO CLKID_AO_UART>, <&xtal>;
-                               clock-names = "xtal", "pclk", "baud";
-                               status = "disabled";
-                       };
-
-                       uart_AO_B: serial@4000 {
-                               compatible = "amlogic,meson-gx-uart",
-                                            "amlogic,meson-ao-uart";
-                               reg = <0x0 0x4000 0x0 0x18>;
-                               interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>, <&clkc_AO CLKID_AO_UART2>, <&xtal>;
-                               clock-names = "xtal", "pclk", "baud";
-                               status = "disabled";
-                       };
-
-                       i2c_AO: i2c@5000 {
-                               compatible = "amlogic,meson-axg-i2c";
-                               status = "disabled";
-                               reg = <0x0 0x05000 0x0 0x20>;
-                               interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_I2C>;
-                       };
-
-                       pwm_AO_ab: pwm@7000 {
-                               compatible = "amlogic,meson-g12a-ao-pwm-ab";
-                               reg = <0x0 0x7000 0x0 0x20>;
-                               #pwm-cells = <3>;
-                               status = "disabled";
-                       };
-
-                       ir: ir@8000 {
-                               compatible = "amlogic,meson-gxbb-ir";
-                               reg = <0x0 0x8000 0x0 0x20>;
-                               interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;
-                               status = "disabled";
-                       };
-
-                       saradc: adc@9000 {
-                               compatible = "amlogic,meson-g12a-saradc",
-                                            "amlogic,meson-saradc";
-                               reg = <0x0 0x9000 0x0 0x48>;
-                               #io-channel-cells = <1>;
-                               interrupts = <GIC_SPI 200 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>,
-                                        <&clkc_AO CLKID_AO_SAR_ADC>,
-                                        <&clkc_AO CLKID_AO_SAR_ADC_CLK>,
-                                        <&clkc_AO CLKID_AO_SAR_ADC_SEL>;
-                               clock-names = "clkin", "core", "adc_clk", "adc_sel";
-                               status = "disabled";
-                       };
-               };
-
-               vdec: video-decoder@ff620000 {
-                       compatible = "amlogic,g12a-vdec";
-                       reg = <0x0 0xff620000 0x0 0x10000>,
-                             <0x0 0xffd0e180 0x0 0xe4>;
-                       reg-names = "dos", "esparser";
-                       interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "vdec", "esparser";
-
-                       amlogic,ao-sysctrl = <&rti>;
-                       amlogic,canvas = <&canvas>;
-
-                       clocks = <&clkc CLKID_PARSER>,
-                                <&clkc CLKID_DOS>,
-                                <&clkc CLKID_VDEC_1>,
-                                <&clkc CLKID_VDEC_HEVC>,
-                                <&clkc CLKID_VDEC_HEVCF>;
-                       clock-names = "dos_parser", "dos", "vdec_1",
-                                     "vdec_hevc", "vdec_hevcf";
-                       resets = <&reset RESET_PARSER>;
-                       reset-names = "esparser";
-               };
-
-               vpu: vpu@ff900000 {
-                       compatible = "amlogic,meson-g12a-vpu";
-                       reg = <0x0 0xff900000 0x0 0x100000>,
-                             <0x0 0xff63c000 0x0 0x1000>;
-                       reg-names = "vpu", "hhi";
-                       interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       amlogic,canvas = <&canvas>;
-
-                       /* CVBS VDAC output port */
-                       cvbs_vdac_port: port@0 {
-                               reg = <0>;
-                       };
-
-                       /* HDMI-TX output port */
-                       hdmi_tx_port: port@1 {
-                               reg = <1>;
-
-                               hdmi_tx_out: endpoint {
-                                       remote-endpoint = <&hdmi_tx_in>;
-                               };
-                       };
-               };
-
-               gic: interrupt-controller@ffc01000 {
-                       compatible = "arm,gic-400";
-                       reg = <0x0 0xffc01000 0 0x1000>,
-                             <0x0 0xffc02000 0 0x2000>,
-                             <0x0 0xffc04000 0 0x2000>,
-                             <0x0 0xffc06000 0 0x2000>;
-                       interrupt-controller;
-                       interrupts = <GIC_PPI 9
-                               (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
-                       #interrupt-cells = <3>;
-                       #address-cells = <0>;
-               };
-
-               cbus: bus@ffd00000 {
-                       compatible = "simple-bus";
-                       reg = <0x0 0xffd00000 0x0 0x100000>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges = <0x0 0x0 0x0 0xffd00000 0x0 0x100000>;
-
-                       reset: reset-controller@1004 {
-                               compatible = "amlogic,meson-axg-reset";
-                               reg = <0x0 0x1004 0x0 0x9c>;
-                               #reset-cells = <1>;
-                       };
-
-                       gpio_intc: interrupt-controller@f080 {
-                               compatible = "amlogic,meson-g12a-gpio-intc",
-                                            "amlogic,meson-gpio-intc";
-                               reg = <0x0 0xf080 0x0 0x10>;
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-                               amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
-                       };
-
-                       watchdog: watchdog@f0d0 {
-                               compatible = "amlogic,meson-gxbb-wdt";
-                               reg = <0x0 0xf0d0 0x0 0x10>;
-                               clocks = <&xtal>;
-                       };
-
-                       spicc0: spi@13000 {
-                               compatible = "amlogic,meson-g12a-spicc";
-                               reg = <0x0 0x13000 0x0 0x44>;
-                               interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clkc CLKID_SPICC0>,
-                                        <&clkc CLKID_SPICC0_SCLK>;
-                               clock-names = "core", "pclk";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               status = "disabled";
-                       };
-
-                       spicc1: spi@15000 {
-                               compatible = "amlogic,meson-g12a-spicc";
-                               reg = <0x0 0x15000 0x0 0x44>;
-                               interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clkc CLKID_SPICC1>,
-                                        <&clkc CLKID_SPICC1_SCLK>;
-                               clock-names = "core", "pclk";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               status = "disabled";
-                       };
-
-                       spifc: spi@14000 {
-                               compatible = "amlogic,meson-gxbb-spifc";
-                               status = "disabled";
-                               reg = <0x0 0x14000 0x0 0x80>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_CLK81>;
-                       };
-
-                       pwm_ef: pwm@19000 {
-                               compatible = "amlogic,meson-g12a-ee-pwm";
-                               reg = <0x0 0x19000 0x0 0x20>;
-                               #pwm-cells = <3>;
-                               status = "disabled";
-                       };
-
-                       pwm_cd: pwm@1a000 {
-                               compatible = "amlogic,meson-g12a-ee-pwm";
-                               reg = <0x0 0x1a000 0x0 0x20>;
-                               #pwm-cells = <3>;
-                               status = "disabled";
-                       };
-
-                       pwm_ab: pwm@1b000 {
-                               compatible = "amlogic,meson-g12a-ee-pwm";
-                               reg = <0x0 0x1b000 0x0 0x20>;
-                               #pwm-cells = <3>;
-                               status = "disabled";
-                       };
-
-                       i2c3: i2c@1c000 {
-                               compatible = "amlogic,meson-axg-i2c";
-                               status = "disabled";
-                               reg = <0x0 0x1c000 0x0 0x20>;
-                               interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_I2C>;
-                       };
-
-                       i2c2: i2c@1d000 {
-                               compatible = "amlogic,meson-axg-i2c";
-                               status = "disabled";
-                               reg = <0x0 0x1d000 0x0 0x20>;
-                               interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_I2C>;
-                       };
-
-                       i2c1: i2c@1e000 {
-                               compatible = "amlogic,meson-axg-i2c";
-                               status = "disabled";
-                               reg = <0x0 0x1e000 0x0 0x20>;
-                               interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_I2C>;
-                       };
-
-                       i2c0: i2c@1f000 {
-                               compatible = "amlogic,meson-axg-i2c";
-                               status = "disabled";
-                               reg = <0x0 0x1f000 0x0 0x20>;
-                               interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               clocks = <&clkc CLKID_I2C>;
-                       };
-
-                       clk_msr: clock-measure@18000 {
-                               compatible = "amlogic,meson-g12a-clk-measure";
-                               reg = <0x0 0x18000 0x0 0x10>;
-                       };
-
-                       uart_C: serial@22000 {
-                               compatible = "amlogic,meson-gx-uart";
-                               reg = <0x0 0x22000 0x0 0x18>;
-                               interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
-                               clock-names = "xtal", "pclk", "baud";
-                               status = "disabled";
-                       };
-
-                       uart_B: serial@23000 {
-                               compatible = "amlogic,meson-gx-uart";
-                               reg = <0x0 0x23000 0x0 0x18>;
-                               interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
-                               clock-names = "xtal", "pclk", "baud";
-                               status = "disabled";
-                       };
-
-                       uart_A: serial@24000 {
-                               compatible = "amlogic,meson-gx-uart";
-                               reg = <0x0 0x24000 0x0 0x18>;
-                               interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
-                               clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
-                               clock-names = "xtal", "pclk", "baud";
-                               status = "disabled";
-                               fifo-size = <128>;
-                       };
-               };
-
-               sd_emmc_a: sd@ffe03000 {
-                       compatible = "amlogic,meson-axg-mmc";
-                       reg = <0x0 0xffe03000 0x0 0x800>;
-                       interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
-                       status = "disabled";
-                       clocks = <&clkc CLKID_SD_EMMC_A>,
-                                <&clkc CLKID_SD_EMMC_A_CLK0>,
-                                <&clkc CLKID_FCLK_DIV2>;
-                       clock-names = "core", "clkin0", "clkin1";
-                       resets = <&reset RESET_SD_EMMC_A>;
-               };
-
-               sd_emmc_b: sd@ffe05000 {
-                       compatible = "amlogic,meson-axg-mmc";
-                       reg = <0x0 0xffe05000 0x0 0x800>;
-                       interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
-                       status = "disabled";
-                       clocks = <&clkc CLKID_SD_EMMC_B>,
-                                <&clkc CLKID_SD_EMMC_B_CLK0>,
-                                <&clkc CLKID_FCLK_DIV2>;
-                       clock-names = "core", "clkin0", "clkin1";
-                       resets = <&reset RESET_SD_EMMC_B>;
-               };
-
-               sd_emmc_c: mmc@ffe07000 {
-                       compatible = "amlogic,meson-axg-mmc";
-                       reg = <0x0 0xffe07000 0x0 0x800>;
-                       interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;
-                       status = "disabled";
-                       clocks = <&clkc CLKID_SD_EMMC_C>,
-                                <&clkc CLKID_SD_EMMC_C_CLK0>,
-                                <&clkc CLKID_FCLK_DIV2>;
-                       clock-names = "core", "clkin0", "clkin1";
-                       resets = <&reset RESET_SD_EMMC_C>;
-               };
-
-               usb: usb@ffe09000 {
-                       status = "disabled";
-                       compatible = "amlogic,meson-g12a-usb-ctrl";
-                       reg = <0x0 0xffe09000 0x0 0xa0>;
-                       interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-
-                       clocks = <&clkc CLKID_USB>;
-                       resets = <&reset RESET_USB>;
-
-                       dr_mode = "otg";
-
-                       phys = <&usb2_phy0>, <&usb2_phy1>,
-                              <&usb3_pcie_phy PHY_TYPE_USB3>;
-                       phy-names = "usb2-phy0", "usb2-phy1", "usb3-phy0";
-
-                       dwc2: usb@ff400000 {
-                               compatible = "amlogic,meson-g12a-usb", "snps,dwc2";
-                               reg = <0x0 0xff400000 0x0 0x40000>;
-                               interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
-                               clock-names = "otg";
-                               phys = <&usb2_phy1>;
-                               phy-names = "usb2-phy";
-                               dr_mode = "peripheral";
-                               g-rx-fifo-size = <192>;
-                               g-np-tx-fifo-size = <128>;
-                               g-tx-fifo-size = <128 128 16 16 16>;
-                       };
-
-                       dwc3: usb@ff500000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x0 0xff500000 0x0 0x100000>;
-                               interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                               dr_mode = "host";
-                               snps,dis_u2_susphy_quirk;
-                               snps,quirk-frame-length-adjustment = <0x20>;
-                               snps,parkmode-disable-ss-quirk;
-                       };
-               };
-
-               mali: gpu@ffe40000 {
-                       compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost";
-                       reg = <0x0 0xffe40000 0x0 0x40000>;
-                       interrupt-parent = <&gic>;
-                       interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "job", "mmu", "gpu";
-                       clocks = <&clkc CLKID_MALI>;
-                       resets = <&reset RESET_DVALIN_CAPB3>, <&reset RESET_DVALIN>;
-                       operating-points-v2 = <&gpu_opp_table>;
-                       #cooling-cells = <2>;
-               };
-       };
-
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay = <1000>;
-                       polling-delay-passive = <100>;
-                       thermal-sensors = <&cpu_temp>;
-
-                       trips {
-                               cpu_passive: cpu-passive {
-                                       temperature = <85000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "passive";
-                               };
-
-                               cpu_hot: cpu-hot {
-                                       temperature = <95000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "hot";
-                               };
-
-                               cpu_critical: cpu-critical {
-                                       temperature = <110000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               ddr_thermal: ddr-thermal {
-                       polling-delay = <1000>;
-                       polling-delay-passive = <100>;
-                       thermal-sensors = <&ddr_temp>;
-
-                       trips {
-                               ddr_passive: ddr-passive {
-                                       temperature = <85000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "passive";
-                               };
-
-                               ddr_critical: ddr-critical {
-                                       temperature = <110000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "critical";
-                               };
-                       };
-
-                       cooling-maps {
-                               map {
-                                       trip = <&ddr_passive>;
-                                       cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-                               };
-                       };
-               };
-       };
-
-       timer {
-               compatible = "arm,armv8-timer";
-               interrupts = <GIC_PPI 13
-                       (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14
-                       (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11
-                       (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10
-                       (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>;
-               arm,no-tick-in-suspend;
-       };
-
-       xtal: xtal-clk {
-               compatible = "fixed-clock";
-               clock-frequency = <24000000>;
-               clock-output-names = "xtal";
-               #clock-cells = <0>;
-       };
-
-};
diff --git a/arch/arm/dts/meson-g12.dtsi b/arch/arm/dts/meson-g12.dtsi
deleted file mode 100644 (file)
index 6a1f4dc..0000000
+++ /dev/null
@@ -1,385 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Jerome Brunet <jbrunet@baylibre.com>
- */
-
-#include "meson-g12-common.dtsi"
-#include <dt-bindings/clock/axg-audio-clkc.h>
-#include <dt-bindings/power/meson-g12a-power.h>
-#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
-#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
-
-/ {
-       tdmif_a: audio-controller-0 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_A";
-               clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_A_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-
-       tdmif_b: audio-controller-1 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_B";
-               clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_B_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-
-       tdmif_c: audio-controller-2 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_C";
-               clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_C_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-};
-
-&apb {
-       pdm: audio-controller@40000 {
-               compatible = "amlogic,g12a-pdm",
-                            "amlogic,axg-pdm";
-               reg = <0x0 0x40000 0x0 0x34>;
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "PDM";
-               clocks = <&clkc_audio AUD_CLKID_PDM>,
-                        <&clkc_audio AUD_CLKID_PDM_DCLK>,
-                        <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
-               clock-names = "pclk", "dclk", "sysclk";
-               resets = <&clkc_audio AUD_RESET_PDM>;
-               status = "disabled";
-       };
-
-       audio: bus@42000 {
-               compatible = "simple-bus";
-               reg = <0x0 0x42000 0x0 0x2000>;
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges = <0x0 0x0 0x0 0x42000 0x0 0x2000>;
-
-               clkc_audio: clock-controller@0 {
-                       status = "disabled";
-                       compatible = "amlogic,g12a-audio-clkc";
-                       reg = <0x0 0x0 0x0 0xb4>;
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-
-                       clocks = <&clkc CLKID_AUDIO>,
-                                <&clkc CLKID_MPLL0>,
-                                <&clkc CLKID_MPLL1>,
-                                <&clkc CLKID_MPLL2>,
-                                <&clkc CLKID_MPLL3>,
-                                <&clkc CLKID_HIFI_PLL>,
-                                <&clkc CLKID_FCLK_DIV3>,
-                                <&clkc CLKID_FCLK_DIV4>,
-                                <&clkc CLKID_GP0_PLL>;
-                       clock-names = "pclk",
-                                     "mst_in0",
-                                     "mst_in1",
-                                     "mst_in2",
-                                     "mst_in3",
-                                     "mst_in4",
-                                     "mst_in5",
-                                     "mst_in6",
-                                     "mst_in7";
-
-                       resets = <&reset RESET_AUDIO>;
-               };
-
-               toddr_a: audio-controller@100 {
-                       compatible = "amlogic,g12a-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x100 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_A";
-                       interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
-                       resets = <&arb AXG_ARB_TODDR_A>,
-                                <&clkc_audio AUD_RESET_TODDR_A>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <512>;
-                       status = "disabled";
-               };
-
-               toddr_b: audio-controller@140 {
-                       compatible = "amlogic,g12a-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x140 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_B";
-                       interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
-                       resets = <&arb AXG_ARB_TODDR_B>,
-                                <&clkc_audio AUD_RESET_TODDR_B>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               toddr_c: audio-controller@180 {
-                       compatible = "amlogic,g12a-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x180 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_C";
-                       interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
-                       resets = <&arb AXG_ARB_TODDR_C>,
-                                <&clkc_audio AUD_RESET_TODDR_C>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               frddr_a: audio-controller@1c0 {
-                       compatible = "amlogic,g12a-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x1c0 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_A";
-                       interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
-                       resets = <&arb AXG_ARB_FRDDR_A>,
-                                <&clkc_audio AUD_RESET_FRDDR_A>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <512>;
-                       status = "disabled";
-               };
-
-               frddr_b: audio-controller@200 {
-                       compatible = "amlogic,g12a-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x200 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_B";
-                       interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
-                       resets = <&arb AXG_ARB_FRDDR_B>,
-                                <&clkc_audio AUD_RESET_FRDDR_B>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               frddr_c: audio-controller@240 {
-                       compatible = "amlogic,g12a-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x240 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_C";
-                       interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
-                       resets = <&arb AXG_ARB_FRDDR_C>,
-                                <&clkc_audio AUD_RESET_FRDDR_C>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               arb: reset-controller@280 {
-                       status = "disabled";
-                       compatible = "amlogic,meson-axg-audio-arb";
-                       reg = <0x0 0x280 0x0 0x4>;
-                       #reset-cells = <1>;
-                       clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
-               };
-
-               tdmin_a: audio-controller@300 {
-                       compatible = "amlogic,g12a-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x300 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_A";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_A>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_b: audio-controller@340 {
-                       compatible = "amlogic,g12a-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x340 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_B";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_B>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_c: audio-controller@380 {
-                       compatible = "amlogic,g12a-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x380 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_C";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_C>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_lb: audio-controller@3c0 {
-                       compatible = "amlogic,g12a-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x3c0 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_LB";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               spdifin: audio-controller@400 {
-                       compatible = "amlogic,g12a-spdifin",
-                                    "amlogic,axg-spdifin";
-                       reg = <0x0 0x400 0x0 0x30>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "SPDIFIN";
-                       interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
-                                <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
-                       clock-names = "pclk", "refclk";
-                       resets = <&clkc_audio AUD_RESET_SPDIFIN>;
-                       status = "disabled";
-               };
-
-               spdifout: audio-controller@480 {
-                       compatible = "amlogic,g12a-spdifout",
-                                    "amlogic,axg-spdifout";
-                       reg = <0x0 0x480 0x0 0x50>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "SPDIFOUT";
-                       clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
-                                <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
-                       clock-names = "pclk", "mclk";
-                       resets = <&clkc_audio AUD_RESET_SPDIFOUT>;
-                       status = "disabled";
-               };
-
-               tdmout_a: audio-controller@500 {
-                       compatible = "amlogic,g12a-tdmout";
-                       reg = <0x0 0x500 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_A";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmout_b: audio-controller@540 {
-                       compatible = "amlogic,g12a-tdmout";
-                       reg = <0x0 0x540 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_B";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmout_c: audio-controller@580 {
-                       compatible = "amlogic,g12a-tdmout";
-                       reg = <0x0 0x580 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_C";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               spdifout_b: audio-controller@680 {
-                       compatible = "amlogic,g12a-spdifout",
-                                    "amlogic,axg-spdifout";
-                       reg = <0x0 0x680 0x0 0x50>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "SPDIFOUT_B";
-                       clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
-                                <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
-                       clock-names = "pclk", "mclk";
-                       resets = <&clkc_audio AUD_RESET_SPDIFOUT_B>;
-                       status = "disabled";
-               };
-
-               toacodec: audio-controller@740 {
-                       compatible = "amlogic,g12a-toacodec";
-                       reg = <0x0 0x740 0x0 0x4>;
-                       #sound-dai-cells = <1>;
-                       sound-name-prefix = "TOACODEC";
-                       resets = <&clkc_audio AUD_RESET_TOACODEC>;
-                       status = "disabled";
-               };
-
-               tohdmitx: audio-controller@744 {
-                       compatible = "amlogic,g12a-tohdmitx";
-                       reg = <0x0 0x744 0x0 0x4>;
-                       #sound-dai-cells = <1>;
-                       sound-name-prefix = "TOHDMITX";
-                       resets = <&clkc_audio AUD_RESET_TOHDMITX>;
-                       status = "disabled";
-               };
-       };
-};
-
-&ethmac {
-       power-domains = <&pwrc PWRC_G12A_ETH_ID>;
-};
-
-&vpu {
-       power-domains = <&pwrc PWRC_G12A_VPU_ID>;
-};
-
-&sd_emmc_a {
-       amlogic,dram-access-quirk;
-};
-
-&simplefb_cvbs {
-       power-domains = <&pwrc PWRC_G12A_VPU_ID>;
-};
-
-&simplefb_hdmi {
-       power-domains = <&pwrc PWRC_G12A_VPU_ID>;
-};
-
diff --git a/arch/arm/dts/meson-g12a-radxa-zero.dts b/arch/arm/dts/meson-g12a-radxa-zero.dts
deleted file mode 100644 (file)
index e3bb6df..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 BayLibre SAS. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "meson-g12a.dtsi"
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "radxa,zero", "amlogic,g12a";
-       model = "Radxa Zero";
-
-       aliases {
-               serial0 = &uart_AO;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       cvbs-connector {
-               status = "disabled";
-               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>;
-                       };
-               };
-       };
-
-       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";
-       };
-
-       ao_5v: regulator-ao_5v {
-               compatible = "regulator-fixed";
-               regulator-name = "AO_5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       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;
-       };
-
-       hdmi_pw: regulator-hdmi_pw {
-               compatible = "regulator-fixed";
-               regulator-name = "HDMI_PW";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&ao_5v>;
-               regulator-always-on;
-       };
-
-       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 = <&ao_5v>;
-               regulator-always-on;
-       };
-
-       vddcpu: regulator-vddcpu {
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
-
-               vin-supply = <&ao_5v>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "RADXA-ZERO";
-               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>;
-                       };
-               };
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cvbs_vdac_port {
-       cvbs_vdac_out: endpoint {
-               remote-endpoint = <&cvbs_connector_in>;
-       };
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&hdmi_tx {
-       status = "okay";
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-       hdmi-supply = <&hdmi_pw>;
-};
-
-&hdmi_tx_tmds_port {
-       hdmi_tx_tmds_out: endpoint {
-               remote-endpoint = <&hdmi_connector_in>;
-       };
-};
-
-&ir {
-       status = "disabled";
-       pinctrl-0 = <&remote_input_ao_pins>;
-       pinctrl-names = "default";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* 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;
-       sd-uhs-sdr50;
-       max-frequency = <100000000>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power to be kept while in suspend */
-       keep-power-in-suspend;
-
-       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 = <100000000>;
-       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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&vcc_1v8>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&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";
-};
diff --git a/arch/arm/dts/meson-g12a-sei510.dts b/arch/arm/dts/meson-g12a-sei510.dts
deleted file mode 100644 (file)
index 81269cc..0000000
+++ /dev/null
@@ -1,566 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre SAS. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "meson-g12a.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "seirobotics,sei510", "amlogic,g12a";
-       model = "SEI Robotics SEI510";
-
-       adc_keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 0>;
-               io-channel-names = "buttons";
-               keyup-threshold-microvolt = <1800000>;
-
-               button-onoff {
-                       label = "On/Off";
-                       linux,code = <KEY_POWER>;
-                       press-threshold-microvolt = <1700000>;
-               };
-       };
-
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-       };
-
-       mono_dac: audio-codec-0 {
-               compatible = "maxim,max98357a";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "U16";
-               sdmode-gpios = <&gpio GPIOX_8 GPIO_ACTIVE_HIGH>;
-       };
-
-       dmics: audio-codec-1 {
-               #sound-dai-cells = <0>;
-               compatible = "dmic-codec";
-               num-channels = <2>;
-               wakeup-delay-ms = <50>;
-               status = "okay";
-               sound-name-prefix = "MIC";
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       cvbs-connector {
-               compatible = "composite-video-connector";
-
-               port {
-                       cvbs_connector_in: endpoint {
-                               remote-endpoint = <&cvbs_vdac_out>;
-                       };
-               };
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       ao_5v: regulator-ao_5v {
-               compatible = "regulator-fixed";
-               regulator-name = "AO_5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&dc_in>;
-               regulator-always-on;
-       };
-
-       dc_in: regulator-dc_in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       emmc_1v8: regulator-emmc_1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_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 = <&dc_in>;
-               regulator-always-on;
-       };
-
-       vddao_3v3_t: regultor-vddao_3v3_t {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDAO_3V3_T";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&vddao_3v3>;
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-       };
-
-       vddcpu: regulator-vddcpu {
-               /*
-                * SY8120B1ABC DC/DC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
-
-               vin-supply = <&dc_in>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddio_ao1v8: regulator-vddio_ao1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vddao_3v3>;
-               regulator-always-on;
-       };
-
-       reserved-memory {
-               /* TEE Reserved Memory */
-               bl32_reserved: bl32@5000000 {
-                       reg = <0x0 0x05300000 0x0 0x2000000>;
-                       no-map;
-               };
-       };
-
-       sdio_pwrseq: sdio-pwrseq {
-               compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
-               clocks = <&wifi32k>;
-               clock-names = "ext_clock";
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "SEI510";
-               audio-aux-devs = <&tdmout_a>, <&tdmout_b>,
-                                <&tdmin_a>, <&tdmin_b>;
-               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
-                               "TDMOUT_A IN 1", "FRDDR_B OUT 0",
-                               "TDMOUT_A IN 2", "FRDDR_C OUT 0",
-                               "TDM_A Playback", "TDMOUT_A OUT",
-                               "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",
-                               "TODDR_A IN 4", "PDM Capture",
-                               "TODDR_B IN 4", "PDM Capture",
-                               "TODDR_C IN 4", "PDM Capture",
-                               "TDMIN_A IN 0", "TDM_A Capture",
-                               "TDMIN_A IN 3", "TDM_A Loopback",
-                               "TDMIN_B IN 0", "TDM_A Capture",
-                               "TDMIN_B IN 3", "TDM_A Loopback",
-                               "TDMIN_A IN 1", "TDM_B Capture",
-                               "TDMIN_A IN 4", "TDM_B Loopback",
-                               "TDMIN_B IN 1", "TDM_B Capture",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "TODDR_B IN 1", "TDMIN_B OUT",
-                               "TODDR_C IN 1", "TDMIN_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>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* internal speaker interface */
-               dai-link-6 {
-                       sound-dai = <&tdmif_a>;
-                       dai-format = "i2s";
-                       dai-tdm-slot-tx-mask-0 = <1 1>;
-                       mclk-fs = <256>;
-
-                       codec-0 {
-                               sound-dai = <&mono_dac>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
-                       };
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-7 {
-                       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>;
-                       };
-               };
-
-               /* internal digital mics */
-               dai-link-8 {
-                       sound-dai = <&pdm>;
-
-                       codec {
-                               sound-dai = <&dmics>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-9 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cvbs_vdac_port {
-       cvbs_vdac_out: endpoint {
-               remote-endpoint = <&cvbs_connector_in>;
-       };
-};
-
-&ethmac {
-       status = "okay";
-       phy-handle = <&internal_ephy>;
-       phy-mode = "rmii";
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&hdmi_tx {
-       status = "okay";
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-};
-
-&hdmi_tx_tmds_port {
-       hdmi_tx_tmds_out: endpoint {
-               remote-endpoint = <&hdmi_connector_in>;
-       };
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-};
-
-&ir {
-       status = "okay";
-       pinctrl-0 = <&remote_input_ao_pins>;
-       pinctrl-names = "default";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-};
-
-&pdm {
-       pinctrl-0 = <&pdm_din0_z_pins>, <&pdm_din1_z_pins>,
-                   <&pdm_din2_z_pins>, <&pdm_din3_z_pins>,
-                   <&pdm_dclk_z_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddio_ao1v8>;
-};
-
-/* 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;
-       sd-uhs-sdr50;
-       max-frequency = <100000000>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power to be kept while in suspend */
-       keep-power-in-suspend;
-
-       mmc-pwrseq = <&sdio_pwrseq>;
-
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&vddio_ao1v8>;
-
-       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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       non-removable;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&emmc_1v8>;
-};
-
-&tdmif_a {
-       pinctrl-0 = <&tdm_a_dout0_pins>, <&tdm_a_fs_pins>, <&tdm_a_sclk_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       assigned-clocks = <&clkc_audio AUD_CLKID_TDM_SCLK_PAD0>,
-                         <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD0>;
-       assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
-       assigned-clock-rates = <0>, <0>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmin_a {
-       status = "okay";
-};
-
-&tdmin_b {
-       status = "okay";
-};
-
-&tdmout_a {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&toddr_b {
-       status = "okay";
-};
-
-&toddr_c {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&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";
-               vbat-supply = <&vddao_3v3>;
-               vddio-supply = <&vddio_ao1v8>;
-       };
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "host";
-};
diff --git a/arch/arm/dts/meson-g12a-u200.dts b/arch/arm/dts/meson-g12a-u200.dts
deleted file mode 100644 (file)
index a26bfe7..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "meson-g12a.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-
-/ {
-       compatible = "amlogic,u200", "amlogic,g12a";
-       model = "Amlogic Meson G12A U200 Development Board";
-
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       cvbs-connector {
-               compatible = "composite-video-connector";
-
-               port {
-                       cvbs_connector_in: endpoint {
-                               remote-endpoint = <&cvbs_vdac_out>;
-                       };
-               };
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       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;
-       };
-
-       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>;
-
-               gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
-               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 */
-       };
-
-       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;
-       };
-
-       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;
-       };
-
-       vddcpu: regulator-vddcpu {
-               /*
-                * MP8756GD Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               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;
-       };
-};
-
-&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>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cvbs_vdac_port {
-       cvbs_vdac_out: endpoint {
-               remote-endpoint = <&cvbs_connector_in>;
-       };
-};
-
-&ethmac {
-       status = "okay";
-       phy-handle = <&internal_ephy>;
-       phy-mode = "rmii";
-};
-
-&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";
-};
-
-/* i2c Touch */
-&i2c0 {
-       status = "okay";
-       pinctrl-0 = <&i2c0_sda_z0_pins>, <&i2c0_sck_z1_pins>;
-       pinctrl-names = "default";
-};
-
-/* i2c CM */
-&i2c2 {
-       status = "okay";
-       pinctrl-0 = <&i2c2_sda_z_pins>, <&i2c2_sck_z_pins>;
-       pinctrl-names = "default";
-};
-
-/* i2c Audio */
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-/* 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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       non-removable;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&flash_1v8>;
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-       vbus-supply = <&usb_pwr_en>;
-};
-
-&usb2_phy0 {
-       phy-supply = <&vcc_5v>;
-};
-
-&usb2_phy1 {
-       phy-supply = <&vcc_5v>;
-};
diff --git a/arch/arm/dts/meson-g12a.dtsi b/arch/arm/dts/meson-g12a.dtsi
deleted file mode 100644 (file)
index 7677764..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
- */
-
-#include "meson-g12.dtsi"
-
-/ {
-       compatible = "amlogic,g12a";
-
-       cpus {
-               #address-cells = <0x2>;
-               #size-cells = <0x0>;
-
-               cpu0: cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x0>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu1: cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x1>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu2: cpu@2 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x2>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu3: cpu@3 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x3>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               l2: l2-cache0 {
-                       compatible = "cache";
-                       cache-level = <2>;
-               };
-       };
-
-       cpu_opp_table: opp-table {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-250000000 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-500000000 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-667000000 {
-                       opp-hz = /bits/ 64 <666666666>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1398000000 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-
-               opp-1512000000 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-
-               opp-1800000000 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-       };
-};
-
-&cpu_thermal {
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-
-               map1 {
-                       trip = <&cpu_hot>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&pmu {
-       compatible = "amlogic,g12a-ddr-pmu";
-};
diff --git a/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts
deleted file mode 100644 (file)
index 3136531..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2023 Christian Hewitt <christianshewitt@gmail.com>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-a311d.dtsi"
-#include "meson-g12b-bananapi.dtsi"
-
-/ {
-       compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b";
-       model = "BananaPi M2S";
-
-       aliases {
-               i2c0 = &i2c1;
-               i2c1 = &i2c3;
-       };
-};
-
-/* Camera (CSI) bus */
-&i2c1 {
-       status = "okay";
-       pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
-       pinctrl-names = "default";
-};
-
-/* Display (DSI) bus */
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-};
diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts b/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts
deleted file mode 100644 (file)
index 124a809..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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-a311d.dtsi"
-#include "meson-khadas-vim3.dtsi"
-#include "meson-g12b-khadas-vim3.dtsi"
-
-/ {
-       compatible = "khadas,vim3", "amlogic,a311d", "amlogic,g12b";
-};
-
-/*
- * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
- * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
- * an USB3.0 Type A connector and a M.2 Key M slot.
- * The PHY driving these differential lines is shared between
- * the USB3.0 controller and the PCIe Controller, thus only
- * a single controller can use it.
- * If the MCU is configured to mux the PCIe/USB3.0 differential lines
- * to the M.2 Key M slot, uncomment the following block to disable
- * USB3.0 from the USB Complex and enable the PCIe controller.
- * The End User is not expected to uncomment the following except for
- * testing purposes, but instead rely on the firmware/bootloader to
- * update these nodes accordingly if PCIe mode is selected by the MCU.
- */
-/*
-&pcie {
-       status = "okay";
-};
-
-&usb {
-       phys = <&usb2_phy0>, <&usb2_phy1>;
-       phy-names = "usb2-phy0", "usb2-phy1";
-};
- */
diff --git a/arch/arm/dts/meson-g12b-a311d.dtsi b/arch/arm/dts/meson-g12b-a311d.dtsi
deleted file mode 100644 (file)
index d61f430..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12b.dtsi"
-
-/ {
-       cpu_opp_table_0: opp-table-0 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-250000000 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-500000000 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-667000000 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <761000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <781000>;
-               };
-
-               opp-1398000000 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <811000>;
-               };
-
-               opp-1512000000 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <861000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <901000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <951000>;
-               };
-
-               opp-1800000000 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <1001000>;
-               };
-       };
-
-       cpub_opp_table_1: opp-table-1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-250000000 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-500000000 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-667000000 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <751000>;
-               };
-
-               opp-1398000000 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <771000>;
-               };
-
-               opp-1512000000 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <771000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <781000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <791000>;
-               };
-
-               opp-1800000000 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <831000>;
-               };
-
-                opp-1908000000 {
-                        opp-hz = /bits/ 64 <1908000000>;
-                        opp-microvolt = <861000>;
-                };
-
-                opp-2016000000 {
-                        opp-hz = /bits/ 64 <2016000000>;
-                        opp-microvolt = <911000>;
-                };
-
-                opp-2108000000 {
-                        opp-hz = /bits/ 64 <2108000000>;
-                        opp-microvolt = <951000>;
-                };
-
-                opp-2208000000 {
-                        opp-hz = /bits/ 64 <2208000000>;
-                        opp-microvolt = <1011000>;
-                };
-       };
-};
diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts
deleted file mode 100644 (file)
index 1b0c388..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-bananapi-cm4.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
-       model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module";
-
-       aliases {
-               ethernet0 = &ethmac;
-               i2c0 = &i2c1;
-               i2c1 = &i2c3;
-       };
-
-       adc-keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 2>;
-               io-channel-names = "buttons";
-               keyup-threshold-microvolt = <1710000>;
-
-               button-function {
-                       label = "Function";
-                       linux,code = <KEY_FN>;
-                       press-threshold-microvolt = <10000>;
-               };
-       };
-
-       hdmi_connector: hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-blue {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led-green {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "BPI-CM4IO";
-               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>;
-
-               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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-4 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&cecb_AO {
-       status = "okay";
-};
-
-&ethmac {
-       status = "okay";
-};
-
-&hdmi_tx {
-       status = "okay";
-};
-
-&hdmi_tx_tmds_port {
-       hdmi_tx_tmds_out: endpoint {
-               remote-endpoint = <&hdmi_connector_in>;
-       };
-};
-
-/* CSI port */
-&i2c1 {
-       status = "okay";
-};
-
-/* DSI port for touchscreen */
-&i2c3 {
-       status = "okay";
-};
-
-/* miniPCIe port with USB + SIM slot */
-&pcie {
-       status = "okay";
-};
-
-&sd_emmc_b {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-/* Peripheral Only USB-C port */
-&usb {
-       dr_mode = "peripheral";
-
-       status = "okay";
-};
diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi b/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi
deleted file mode 100644 (file)
index 97e5229..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
- */
-
-#include "meson-g12b-a311d.dtsi"
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-
-/ {
-       aliases {
-               serial0 = &uart_AO;
-               rtc1 = &vrtc;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       sdio_pwrseq: sdio-pwrseq {
-               compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>;
-               clocks = <&wifi32k>;
-               clock-names = "ext_clock";
-       };
-
-       emmc_1v8: regulator-emmc-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vddao_3v3>;
-               regulator-always-on;
-       };
-
-       dc_in: regulator-dc-in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       vddio_c: regulator-vddio-c {
-               compatible = "regulator-gpio";
-               regulator-name = "VDDIO_C";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-
-               enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-
-               gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>;
-               gpios-states = <1>;
-
-               states = <1800000 0>,
-                        <3300000 1>;
-       };
-
-       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 = <&dc_in>;
-               regulator-always-on;
-       };
-
-       vddcpu_a: regulator-vddcpu-a {
-               /*
-                * MP8756GD DC/DC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_A";
-               regulator-min-microvolt = <680000>;
-               regulator-max-microvolt = <1040000>;
-
-               pwm-supply = <&dc_in>;
-
-               pwms = <&pwm_ab 0 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddcpu_b: regulator-vddcpu-b {
-               /*
-                * SY8120B1ABC DC/DC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_B";
-               regulator-min-microvolt = <680000>;
-               regulator-max-microvolt = <1040000>;
-
-               pwm-supply = <&dc_in>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cec_AO {
-       pinctrl-0 = <&cec_ao_a_h_pins>;
-       pinctrl-names = "default";
-       hdmi-phandle = <&hdmi_tx>;
-};
-
-&cecb_AO {
-       pinctrl-0 = <&cec_ao_b_h_pins>;
-       pinctrl-names = "default";
-       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>;
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               interrupt-parent = <&gpio_intc>;
-               /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
-       };
-};
-
-/* Ethernet to be enabled in baseboard DT */
-&ethmac {
-       pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
-       pinctrl-names = "default";
-       phy-mode = "rgmii-txid";
-       phy-handle = <&external_phy>;
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-/* HDMI to be enabled in baseboard DT */
-&hdmi_tx {
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-       hdmi-supply = <&dc_in>;
-};
-
-/* "Camera" I2C bus */
-&i2c1 {
-       pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
-       pinctrl-names = "default";
-};
-
-/* Main I2C bus */
-&i2c2 {
-       pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
-       pinctrl-names = "default";
-};
-
-/* "ID" I2C bus */
-&i2c3 {
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-};
-
-&pcie {
-       reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>;
-};
-
-&pwm_ab {
-       pinctrl-0 = <&pwm_a_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-
-       status = "okay";
-};
-
-&pwm_ef {
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-
-       status = "okay";
-};
-
-&saradc {
-       vref-supply = <&vddao_1v8>;
-
-       status = "okay";
-};
-
-/* on-module SDIO WiFi */
-&sd_emmc_a {
-       pinctrl-0 = <&sdio_pins>;
-       pinctrl-1 = <&sdio_clk_gate_pins>;
-       pinctrl-names = "default", "clk-gate";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       bus-width = <4>;
-       sd-uhs-sdr104;
-       max-frequency = <50000000>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power in suspend */
-       keep-power-in-suspend;
-
-       mmc-pwrseq = <&sdio_pwrseq>;
-
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&vddao_3v3>;
-
-       status = "okay";
-
-       rtl8822cs: wifi@1 {
-               reg = <1>;
-       };
-};
-
-/* SD card to be enabled in baseboard DT */
-&sd_emmc_b {
-       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 = <&vddio_c>;
-};
-
-/* on-module eMMC */
-&sd_emmc_c {
-       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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&vddao_1v8>;
-
-       status = "okay";
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-/* on-module UART BT */
-&uart_A {
-       pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
-       pinctrl-names = "default";
-       uart-has-rtscts;
-
-       status = "okay";
-
-       bluetooth {
-               compatible = "realtek,rtl8822cs-bt";
-               enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-               host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
-               device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-&uart_AO {
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-};
-
-&usb {
-       phys = <&usb2_phy0>, <&usb2_phy1>;
-       phy-names = "usb2-phy0", "usb2-phy1";
-};
diff --git a/arch/arm/dts/meson-g12b-bananapi.dtsi b/arch/arm/dts/meson-g12b-bananapi.dtsi
deleted file mode 100644 (file)
index 8370978..0000000
+++ /dev/null
@@ -1,521 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- * Copyright (c) 2023 Christian Hewitt <christianshewitt@gmail.com>
- */
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-               rtc1 = &vrtc;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x80000000>; /* 2 GiB or 4 GiB */
-       };
-
-       adc-keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 2>;
-               io-channel-names = "buttons";
-               keyup-threshold-microvolt = <1710000>;
-
-               button-function {
-                       label = "RST";
-                       linux,code = <KEY_POWER>;
-                       press-threshold-microvolt = <10000>;
-               };
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       fan0: pwm-fan {
-               compatible = "pwm-fan";
-               #cooling-cells = <2>;
-               cooling-min-state = <0>;
-               cooling-max-state = <3>;
-               cooling-levels = <0 120 170 220>;
-               pwms = <&pwm_cd 1 40000 0>;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-0 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led-1 {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_2 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";
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-
-       dc_in: regulator-dc-in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               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 = <&dc_in>;
-
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-       };
-
-       vcc_3v3: regulator-vcc-3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "VCC_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&vsys_3v3>;
-               regulator-always-on;
-       };
-
-       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;
-       };
-
-       vddao_1v8: regulator-vddao-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vsys_3v3>;
-               regulator-always-on;
-       };
-
-       vddcpu_a: regulator-vddcpu-a {
-               compatible = "pwm-regulator";
-               regulator-name = "VDDCPU_A";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-               pwm-supply = <&dc_in>;
-               pwms = <&pwm_ab 0 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddcpu_b: regulator-vddcpu-b {
-               compatible = "pwm-regulator";
-               regulator-name = "VDDCPU_B";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-               pwm-supply = <&vsys_3v3>;
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vsys_3v3: regulator-vsys-3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "VSYS_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&dc_in>;
-               regulator-always-on;
-       };
-
-       emmc_1v8: regulator-emmc-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vcc_3v3>;
-               regulator-always-on;
-       };
-
-       usb_pwr: regulator-usb-pwr {
-               compatible = "regulator-fixed";
-               regulator-name = "USB_PWR";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&vcc_5v>;
-
-               gpio = <&gpio GPIOA_6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "BPI-M2S";
-               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>;
-
-               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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-4 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&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>;
-};
-
-&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>;
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               reset-assert-us = <10000>;
-               reset-deassert-us = <80000>;
-               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>;
-       };
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&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>;
-       };
-};
-
-/* Main i2c bus */
-&i2c2 {
-       status = "okay";
-       pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
-       pinctrl-names = "default";
-};
-
-&pcie {
-       status = "okay";
-       reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>;
-};
-
-&pwm_ab {
-       status = "okay";
-       pinctrl-0 = <&pwm_a_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-};
-
-&pwm_cd {
-       status = "okay";
-       pinctrl-0 = <&pwm_d_x6_pins>;
-       pinctrl-names = "default";
-       pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>;
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* SDIO */
-&sd_emmc_a {
-       /* enable if WiFi/BT board connected */
-       status = "disabled";
-       pinctrl-0 = <&sdio_pins>;
-       pinctrl-1 = <&sdio_clk_gate_pins>;
-       pinctrl-names = "default", "clk-gate";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       bus-width = <4>;
-       sd-uhs-sdr104;
-       max-frequency = <50000000>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power in suspend */
-       keep-power-in-suspend;
-
-       mmc-pwrseq = <&sdio_pwrseq>;
-
-       vmmc-supply = <&vsys_3v3>;
-       vqmmc-supply = <&vddao_1v8>;
-
-       rtl8822cs: wifi@1 {
-               reg = <1>;
-       };
-};
-
-/* 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 = <&vsys_3v3>;
-       vqmmc-supply = <&vsys_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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&emmc_1v8>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&uart_A {
-       /* enable if WiFi/BT board connected */
-       status = "disabled";
-       pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
-       pinctrl-names = "default";
-       uart-has-rtscts;
-
-       bluetooth {
-               compatible = "realtek,rtl8822cs-bt";
-               enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-               host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
-               device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb2_phy0 {
-       phy-supply = <&dc_in>;
-};
-
-&usb2_phy1 {
-       phy-supply = <&usb_pwr>;
-};
-
-&usb3_pcie_phy {
-       phy-supply = <&usb_pwr>;
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "peripheral";
-       phys = <&usb2_phy0>, <&usb2_phy1>;
-       phy-names = "usb2-phy0", "usb2-phy1";
-};
diff --git a/arch/arm/dts/meson-g12b-gsking-x.dts b/arch/arm/dts/meson-g12b-gsking-x.dts
deleted file mode 100644 (file)
index 6c7bfac..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-// 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/leds/common.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "azw,gsking-x", "amlogic,s922x", "amlogic,g12b";
-       model = "Beelink GS-King X";
-
-       aliases {
-               rtc0 = &rtc;
-               rtc1 = &vrtc;
-       };
-
-       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>;
-               };
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "GSKING-X";
-               audio-aux-devs = <&tdmout_a>;
-               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 1",
-                               "TDMOUT_A IN 1", "FRDDR_B OUT 1",
-                               "TDMOUT_A IN 2", "FRDDR_C OUT 1",
-                               "TDM_A Playback", "TDMOUT_A 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_a>;
-                       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_A>;
-                       };
-               };
-
-               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";
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-
-       rtc: rtc@51 {
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-               wakeup-source;
-       };
-};
-
-&tdmif_a {
-       status = "okay";
-};
-
-&tdmout_a {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
diff --git a/arch/arm/dts/meson-g12b-gtking-pro.dts b/arch/arm/dts/meson-g12b-gtking-pro.dts
deleted file mode 100644 (file)
index 707daf9..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-// 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,s922x", "amlogic,g12b";
-       model = "Beelink GT-King Pro";
-
-       aliases {
-               rtc0 = &rtc;
-               rtc1 = &vrtc;
-       };
-
-       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";
-
-               led-white {
-                       label = "power:white";
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
-               };
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "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";
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-
-       rtc: rtc@51 {
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-               wakeup-source;
-       };
-};
-
-&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
deleted file mode 100644 (file)
index 5d96c14..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-// 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,s922x", "amlogic,g12b";
-       model = "Beelink GT-King";
-
-       aliases {
-               rtc0 = &rtc;
-               rtc1 = &vrtc;
-       };
-
-       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 = "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";
-};
-
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-
-       rtc: rtc@51 {
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-               wakeup-source;
-       };
-};
-
-&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-khadas-vim3.dtsi b/arch/arm/dts/meson-g12b-khadas-vim3.dtsi
deleted file mode 100644 (file)
index f42cf4b..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-// 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>
- */
-
-/ {
-       model = "Khadas VIM3";
-
-       vddcpu_a: regulator-vddcpu-a {
-               /*
-                * MP8756GD Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_A";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-
-               vin-supply = <&dc_in>;
-
-               pwms = <&pwm_ab 0 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddcpu_b: regulator-vddcpu-b {
-               /*
-                * Silergy SY8030DEC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_B";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-
-               vin-supply = <&vsys_3v3>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-};
-
-&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>;
-};
-
-&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";
-};
-
diff --git a/arch/arm/dts/meson-g12b-odroid-go-ultra.dts b/arch/arm/dts/meson-g12b-odroid-go-ultra.dts
deleted file mode 100644 (file)
index 1e40709..0000000
+++ /dev/null
@@ -1,722 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2022 Neil Armstrong <neil.armstrong@linaro.org>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-s922x.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-toacodec.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "hardkernel,odroid-go-ultra", "amlogic,s922x", "amlogic,g12b";
-       model = "Hardkernel ODROID-GO-Ultra";
-
-       aliases {
-               serial0 = &uart_AO;
-               rtc0 = &vrtc;
-       };
-
-       adc-joystick-left {
-               compatible = "adc-joystick";
-               io-channels = <&saradc 2>, <&saradc 3>;
-               poll-interval = <10>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               axis@0 {
-                       reg = <0>;
-                       linux,code = <ABS_Y>;
-                       abs-range = <3150 950>;
-                       abs-fuzz = <32>;
-                       abs-flat = <64>;
-               };
-               axis@1 {
-                       reg = <1>;
-                       linux,code = <ABS_X>;
-                       abs-range = <700 2900>;
-                       abs-fuzz = <32>;
-                       abs-flat = <64>;
-               };
-       };
-
-       adc-joystick-right {
-               compatible = "adc-joystick";
-               io-channels = <&saradc 0>, <&saradc 1>;
-               poll-interval = <10>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               axis@0 {
-                       reg = <0>;
-                       linux,code = <ABS_RY>;
-                       abs-range = <3150 950>;
-                       abs-fuzz = <32>;
-                       abs-flat = <64>;
-               };
-               axis@1 {
-                       reg = <1>;
-                       linux,code = <ABS_RX>;
-                       abs-range = <800 3000>;
-                       abs-fuzz = <32>;
-                       abs-flat = <64>;
-               };
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       codec_clk: codec-clk {
-               compatible = "fixed-clock";
-               clock-frequency = <12288000>;
-               clock-output-names = "codec_clk";
-               #clock-cells = <0>;
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <10>;
-               pinctrl-0 = <&keypad_gpio_pins>;
-               pinctrl-names = "default";
-
-               volume-up-button {
-                       label = "VOLUME-UP";
-                       linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&gpio GPIOX_8 GPIO_ACTIVE_LOW>;
-               };
-               volume-down-button {
-                       label = "VOLUME-DOWN";
-                       linux,code = <KEY_VOLUMEDOWN>;
-                       gpios = <&gpio GPIOX_9 GPIO_ACTIVE_LOW>;
-               };
-               dpad-up-button {
-                       label = "DPAD-UP";
-                       linux,code = <BTN_DPAD_UP>;
-                       gpios = <&gpio GPIOX_0 GPIO_ACTIVE_LOW>;
-               };
-               dpad-down-button {
-                       label = "DPAD-DOWN";
-                       linux,code = <BTN_DPAD_DOWN>;
-                       gpios = <&gpio GPIOX_1 GPIO_ACTIVE_LOW>;
-               };
-               dpad-left-button {
-                       label = "DPAD-LEFT";
-                       linux,code = <BTN_DPAD_LEFT>;
-                       gpios = <&gpio GPIOX_2 GPIO_ACTIVE_LOW>;
-               };
-               dpad-right-button {
-                       label = "DPAD-RIGHT";
-                       linux,code = <BTN_DPAD_RIGHT>;
-                       gpios = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
-               };
-               a-button {
-                       label = "A";
-                       linux,code = <BTN_EAST>;
-                       gpios = <&gpio GPIOX_4 GPIO_ACTIVE_LOW>;
-               };
-               b-button {
-                       label = "B";
-                       linux,code = <BTN_SOUTH>;
-                       gpios = <&gpio GPIOX_5 GPIO_ACTIVE_LOW>;
-               };
-               y-button {
-                       label = "Y";
-                       linux,code = <BTN_WEST>;
-                       gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
-               };
-               x-button {
-                       label = "X";
-                       linux,code = <BTN_NORTH>;
-                       gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
-               };
-               f1-button {
-                       label = "F1";
-                       linux,code = <BTN_TRIGGER_HAPPY1>;
-                       gpios = <&gpio GPIOX_17 GPIO_ACTIVE_LOW>;
-               };
-               f2-button {
-                       label = "F2";
-                       linux,code = <BTN_TRIGGER_HAPPY2>;
-                       gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>;
-               };
-               f3-button {
-                       label = "F3";
-                       linux,code = <BTN_TRIGGER_HAPPY3>;
-                       gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>;
-               };
-               f4-button {
-                       label = "F4";
-                       linux,code = <BTN_TRIGGER_HAPPY4>;
-                       gpios = <&gpio GPIOX_12 GPIO_ACTIVE_LOW>;
-               };
-               f5-button {
-                       label = "F5";
-                       linux,code = <BTN_TRIGGER_HAPPY5>;
-                       gpios = <&gpio GPIOX_13 GPIO_ACTIVE_LOW>;
-               };
-               f6-button {
-                       label = "F6";
-                       linux,code = <BTN_TRIGGER_HAPPY6>;
-                       gpios = <&gpio GPIOX_16 GPIO_ACTIVE_LOW>;
-               };
-               top-left-button {
-                       label = "TOP Left";
-                       linux,code = <BTN_TL>;
-                       gpios = <&gpio GPIOX_14 GPIO_ACTIVE_LOW>;
-               };
-               top-left2-button {
-                       label = "TOP Left 2";
-                       linux,code = <BTN_TL2>;
-                       gpios = <&gpio GPIOX_19 GPIO_ACTIVE_LOW>;
-               };
-               top-right-button {
-                       label = "TOP Right";
-                       linux,code = <BTN_TR>;
-                       gpios = <&gpio GPIOX_15 GPIO_ACTIVE_LOW>;
-               };
-               top-right2-button {
-                       label = "TOP Right 2";
-                       linux,code = <BTN_TR2>;
-                       gpios = <&gpio GPIOX_18 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       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>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-blue {
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       vdd_sys: regulator-vdd-sys {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_SYS";
-               regulator-min-microvolt = <3800000>;
-               regulator-max-microvolt = <3800000>;
-               regulator-always-on;
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "Odroid GO Ultra";
-               audio-widgets = "Microphone", "Mic Jack",
-                               "Headphone", "Headphones",
-                               "Speaker", "Internal Speakers";
-               audio-aux-devs = <&tdmout_b>, <&tdmin_b>, <&speaker_amp>;
-               audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
-                               "TDM_B Playback", "TDMOUT_B OUT",
-                               "TDMIN_B IN 1", "TDM_B Capture",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "MICL", "Mic Jack",
-                               "Headphones", "HPOL",
-                               "Headphones", "HPOR",
-                               "Speaker Amplifier INL", "HPOL",
-                               "Speaker Amplifier INR", "HPOR",
-                               "Internal Speakers", "Speaker Amplifier OUTL",
-                               "Internal Speakers", "Speaker Amplifier OUTR";
-
-               assigned-clocks = <&clkc CLKID_MPLL2>,
-                                 <&clkc CLKID_MPLL0>,
-                                 <&clkc CLKID_MPLL1>;
-               assigned-clock-parents = <0>, <0>, <0>;
-               assigned-clock-rates = <294912000>,
-                                      <270950400>,
-                                      <393216000>;
-
-               dai-link-0 {
-                       sound-dai = <&frddr_a>;
-               };
-
-               dai-link-1 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-2 {
-                       sound-dai = <&tdmif_b>;
-                       dai-format = "i2s";
-                       dai-tdm-slot-tx-mask-0 = <1 1>;
-                       mclk-fs = <256>;
-
-                       codec-0 {
-                               sound-dai = <&rk817>;
-                       };
-               };
-       };
-
-       speaker_amp: speaker-amplifier {
-               compatible = "simple-audio-amplifier";
-               sound-name-prefix = "Speaker Amplifier";
-               VCC-supply = <&hp_5v>;
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-/* RK817 only supports 12.5mV steps, round up the values */
-&cpu_opp_table_0 {
-       opp-1000000000 {
-               opp-microvolt = <737500>;
-       };
-       opp-1200000000 {
-               opp-microvolt = <737500>;
-       };
-       opp-1398000000 {
-               opp-microvolt = <762500>;
-       };
-       opp-1512000000 {
-               opp-microvolt = <800000>;
-       };
-       opp-1608000000 {
-               opp-microvolt = <837500>;
-       };
-       opp-1704000000 {
-               opp-microvolt = <862500>;
-       };
-       opp-1896000000 {
-               opp-microvolt = <987500>;
-       };
-       opp-1992000000 {
-               opp-microvolt = <1012500>;
-       };
-};
-
-/* RK818 only supports 12.5mV steps, round up the values */
-&cpub_opp_table_1 {
-       opp-1000000000 {
-               opp-microvolt = <775000>;
-       };
-       opp-1200000000 {
-               opp-microvolt = <775000>;
-       };
-       opp-1398000000 {
-               opp-microvolt = <800000>;
-       };
-       opp-1512000000 {
-               opp-microvolt = <825000>;
-       };
-       opp-1608000000 {
-               opp-microvolt = <862500>;
-       };
-       opp-1704000000 {
-               opp-microvolt = <900000>;
-       };
-       opp-1800000000 {
-               opp-microvolt = <987500>;
-       };
-       opp-1908000000 {
-               opp-microvolt = <1025000>;
-       };
-};
-
-&i2c_AO {
-       status = "okay";
-       pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;
-       pinctrl-names = "default";
-
-       rk818: pmic@1c {
-               compatible = "rockchip,rk818";
-               reg = <0x1c>;
-               interrupt-parent = <&gpio_intc>;
-               interrupts = <7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */
-
-               vcc1-supply = <&vdd_sys>;
-               vcc2-supply = <&vdd_sys>;
-               vcc3-supply = <&vdd_sys>;
-               vcc4-supply = <&vdd_sys>;
-               vcc6-supply = <&vdd_sys>;
-               vcc7-supply = <&vcc_2v3>;
-               vcc8-supply = <&vcc_2v3>;
-               vcc9-supply = <&vddao_3v3>;
-               boost-supply = <&vdd_sys>;
-               switch-supply = <&vdd_sys>;
-
-               regulators {
-                       vddcpu_a: DCDC_REG1 {
-                               regulator-name = "vddcpu_a";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <775000>;
-                               regulator-max-microvolt = <1025000>;
-                               regulator-ramp-delay = <6001>;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <775000>;
-                               };
-                       };
-
-                       vdd_ee: DCDC_REG2 {
-                               regulator-name = "vdd_ee";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <875000>;
-                               regulator-max-microvolt = <1250000>;
-                               regulator-ramp-delay = <6001>;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <875000>;
-                               };
-                       };
-
-                       vddq_1v1: DCDC_REG3 {
-                               regulator-name = "vddq_1v1";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                       };
-
-                       vddao_3v3: DCDC_REG4 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vddao_3v3";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       hp_5v: DCDC_BOOST {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-name = "hp_5v";
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-
-                       vddio_ao1v8: LDO_REG5 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-name = "vddio_ao1v8";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
-                               };
-                       };
-
-                       vddq_1v8: LDO_REG7 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-name = "vddq_1v8";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
-                               };
-                       };
-
-                       vddio_c: LDO_REG9 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vddio_c";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       vcc_sd: SWITCH_REG {
-                               regulator-name = "vcc_sd";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                       };
-
-                       OTG_SWITCH {
-                               regulator-name = "otg_switch";
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-               };
-       };
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-
-       rk817: pmic@20 {
-               compatible = "rockchip,rk817";
-               reg = <0x20>;
-               interrupt-parent = <&gpio_intc>;
-
-               interrupts = <5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */
-
-               vcc1-supply = <&vdd_sys>;
-               vcc2-supply = <&vdd_sys>;
-               vcc3-supply = <&vdd_sys>;
-               vcc4-supply = <&vdd_sys>;
-               vcc5-supply = <&vdd_sys>;
-               vcc6-supply = <&vdd_sys>;
-               vcc7-supply = <&vdd_sys>;
-               vcc8-supply = <&vdd_sys>;
-               vcc9-supply = <&rk817_boost>;
-
-               #sound-dai-cells = <0>;
-               clocks = <&codec_clk>;
-               clock-names = "mclk";
-
-               #clock-cells = <1>;
-
-               regulators {
-                       vddcpu_b: DCDC_REG2 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <737500>;
-                               regulator-max-microvolt = <1012500>;
-                               regulator-ramp-delay = <6001>;
-                               regulator-initial-mode = <0x2>;
-                               regulator-name = "vddcpu_b";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1000000>;
-                               };
-                       };
-
-                       vcc_2v3: DCDC_REG3 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <2300000>;
-                               regulator-max-microvolt = <2400000>;
-                               regulator-initial-mode = <0x2>;
-                               regulator-name = "vcc_2v3";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                       };
-
-                       LDO_REG4 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vdd_codec";
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-
-                       vcc_lcd: LDO_REG8 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vcc_lcd";
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-
-                       rk817_boost: BOOST {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5400000>;
-                               regulator-name = "rk817_boost";
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-
-                       usb_host: OTG_SWITCH {
-                               regulator-name = "usb_host";
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-               };
-       };
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&eth_phy {
-       status = "disabled";
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&periphs_pinctrl {
-       keypad_gpio_pins: keypad-gpio {
-               mux {
-                       groups = "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3",
-                                "GPIOX_4", "GPIOX_5", "GPIOX_6", "GPIOX_7",
-                                "GPIOX_8", "GPIOX_9", "GPIOX_10", "GPIOX_11",
-                                "GPIOX_12", "GPIOX_13", "GPIOX_14",  "GPIOX_15",
-                                "GPIOX_16", "GPIOX_17", "GPIOX_18",  "GPIOX_19";
-                       function = "gpio_periphs";
-                       bias-pull-up;
-                       output-disable;
-               };
-       };
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddio_ao1v8>;
-};
-
-/* 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 = <&vcc_sd>;
-       vqmmc-supply = <&vddio_c>;
-
-};
-
-/* 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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_sd>;
-       vqmmc-supply = <&vddio_ao1v8>;
-};
-
-
-&tdmif_b {
-       pinctrl-0 = <&tdm_b_dout0_pins>, <&tdm_b_fs_pins>, <&tdm_b_sclk_pins>, <&tdm_b_din1_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       assigned-clocks = <&clkc_audio AUD_CLKID_TDM_SCLK_PAD1>,
-                         <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD1>;
-       assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_B_SCLK>,
-                                <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
-       assigned-clock-rates = <0>, <0>;
-};
-
-&tdmin_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "peripheral";
-};
-
-&usb2_phy0 {
-       status = "okay";
-};
-
-&usb2_phy1 {
-       status = "okay";
-       phy-supply = <&usb_host>;
-};
diff --git a/arch/arm/dts/meson-g12b-odroid-n2-plus.dts b/arch/arm/dts/meson-g12b-odroid-n2-plus.dts
deleted file mode 100644 (file)
index ce1198a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-/dts-v1/;
-
-/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
-#include "meson-g12b-a311d.dtsi"
-#include "meson-g12b-odroid-n2.dtsi"
-
-/ {
-       compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
-       model = "Hardkernel ODROID-N2Plus";
-};
-
-&vddcpu_a {
-       regulator-min-microvolt = <680000>;
-       regulator-max-microvolt = <1040000>;
-
-       pwms = <&pwm_ab 0 1500 0>;
-};
-
-&vddcpu_b {
-       regulator-min-microvolt = <680000>;
-       regulator-max-microvolt = <1040000>;
-
-       pwms = <&pwm_AO_cd 1 1500 0>;
-};
-
diff --git a/arch/arm/dts/meson-g12b-odroid-n2.dts b/arch/arm/dts/meson-g12b-odroid-n2.dts
deleted file mode 100644 (file)
index a198a91..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-s922x.dtsi"
-#include "meson-g12b-odroid-n2.dtsi"
-
-/ {
-       compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b";
-       model = "Hardkernel ODROID-N2";
-};
diff --git a/arch/arm/dts/meson-g12b-odroid-n2.dtsi b/arch/arm/dts/meson-g12b-odroid-n2.dtsi
deleted file mode 100644 (file)
index 24d0442..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12b-odroid.dtsi"
-
-/ {
-       aliases {
-               rtc0 = &rtc;
-       };
-
-       dio2133: audio-amplifier-0 {
-               compatible = "simple-audio-amplifier";
-               enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
-               VCC-supply = <&vcc_5v>;
-               sound-name-prefix = "U19";
-               status = "okay";
-       };
-
-       hub_5v: regulator-hub_5v {
-               compatible = "regulator-fixed";
-               regulator-name = "HUB_5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&vcc_5v>;
-
-               /* Connected to the Hub CHIPENABLE, LOW sets low power state */
-               gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "ODROID-N2";
-               audio-widgets = "Line", "Lineout";
-               audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&tdmin_a>,
-                                <&tdmin_b>, <&tdmin_c>, <&tdmin_lb>,
-                                <&dio2133>;
-               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",
-                               "TDMOUT_C IN 0", "FRDDR_A OUT 2",
-                               "TDMOUT_C IN 1", "FRDDR_B OUT 2",
-                               "TDMOUT_C IN 2", "FRDDR_C OUT 2",
-                               "TDM_C Playback", "TDMOUT_C OUT",
-                               "TDMIN_A IN 4", "TDM_B Loopback",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TDMIN_C IN 4", "TDM_B Loopback",
-                               "TDMIN_LB IN 1", "TDM_B Loopback",
-                               "TDMIN_A IN 5", "TDM_C Loopback",
-                               "TDMIN_B IN 5", "TDM_C Loopback",
-                               "TDMIN_C IN 5", "TDM_C Loopback",
-                               "TDMIN_LB IN 2", "TDM_C Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "TODDR_B IN 1", "TDMIN_B OUT",
-                               "TODDR_C IN 1", "TDMIN_B OUT",
-                               "TODDR_A IN 2", "TDMIN_C OUT",
-                               "TODDR_B IN 2", "TDMIN_C OUT",
-                               "TODDR_C IN 2", "TDMIN_C OUT",
-                               "TODDR_A IN 6", "TDMIN_LB OUT",
-                               "TODDR_B IN 6", "TDMIN_LB OUT",
-                               "TODDR_C IN 6", "TDMIN_LB OUT",
-                               "U19 INL", "ACODEC LOLP",
-                               "U19 INR", "ACODEC LORP",
-                               "Lineout", "U19 OUTL",
-                               "Lineout", "U19 OUTR";
-
-               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>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-6 {
-                       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-0 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&toacodec TOACODEC_IN_B>;
-                       };
-               };
-
-               /* i2s jack output interface */
-               dai-link-7 {
-                       sound-dai = <&tdmif_c>;
-                       dai-format = "i2s";
-                       dai-tdm-slot-tx-mask-0 = <1 1>;
-                       mclk-fs = <256>;
-
-                       codec-0 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&toacodec TOACODEC_IN_C>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-8 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-
-               /* acodec glue */
-               dai-link-9 {
-                       sound-dai = <&toacodec TOACODEC_OUT>;
-
-                       codec {
-                               sound-dai = <&acodec>;
-                       };
-               };
-       };
-};
-
-&acodec {
-       AVDD-supply = <&vddao_1v8>;
-       status = "okay";
-};
-
-&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>;
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               reset-assert-us = <10000>;
-               reset-deassert-us = <80000>;
-               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>;
-       };
-};
-
-&gpio {
-       gpio-line-names =
-               /* GPIOZ */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "", "", "",
-               /* GPIOH */
-               "", "", "", "", "", "", "", "",
-               "",
-               /* BOOT */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "", "", "",
-               /* GPIOC */
-               "", "", "", "", "", "", "", "",
-               /* GPIOA */
-               "PIN_44", /* GPIOA_0 */
-               "PIN_46", /* GPIOA_1 */
-               "PIN_45", /* GPIOA_2 */
-               "PIN_47", /* GPIOA_3 */
-               "PIN_26", /* GPIOA_4 */
-               "", "", "", "", "", "",
-               "PIN_42", /* GPIOA_11 */
-               "PIN_32", /* GPIOA_12 */
-               "PIN_7",  /* GPIOA_13 */
-               "PIN_27", /* GPIOA_14 */
-               "PIN_28", /* GPIOA_15 */
-               /* GPIOX */
-               "PIN_16", /* GPIOX_0 */
-               "PIN_18", /* GPIOX_1 */
-               "PIN_22", /* GPIOX_2 */
-               "PIN_11", /* GPIOX_3 */
-               "PIN_13", /* GPIOX_4 */
-               "PIN_33", /* GPIOX_5 */
-               "PIN_35", /* GPIOX_6 */
-               "PIN_15", /* GPIOX_7 */
-               "PIN_19", /* GPIOX_8 */
-               "PIN_21", /* GPIOX_9 */
-               "PIN_24", /* GPIOX_10 */
-               "PIN_23", /* GPIOX_11 */
-               "PIN_8",  /* GPIOX_12 */
-               "PIN_10", /* GPIOX_13 */
-               "PIN_29", /* GPIOX_14 */
-               "PIN_31", /* GPIOX_15 */
-               "PIN_12", /* GPIOX_16 */
-               "PIN_3",  /* GPIOX_17 */
-               "PIN_5",  /* GPIOX_18 */
-               "PIN_36"; /* GPIOX_19 */
-       /*
-        * WARNING: The USB Hub on the Odroid-N2 needs a reset signal
-        * to be turned high in order to be detected by the USB Controller
-        * This signal should be handled by a USB specific power sequence
-        * in order to reset the Hub when USB bus is powered down.
-        */
-       hog-0 {
-               gpio-hog;
-               gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "usb-hub-reset";
-       };
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-
-       rtc: rtc@51 {
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-               wakeup-source;
-       };
-};
-
-&ir {
-       status = "okay";
-       pinctrl-0 = <&remote_input_ao_pins>;
-       pinctrl-names = "default";
-       linux,rc-map-name = "rc-odroid";
-};
-
-/*
- * EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR pins
- * and eMMC Data 4 to 7 pins.
- * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0,
- * and change bus-width to 4 then spifc can be enabled.
- * The SW1 slide should also be set to the correct position.
- */
-&spifc {
-       status = "disabled";
-       pinctrl-0 = <&nor_pins>;
-       pinctrl-names = "default";
-
-       mx25u64: flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mxicy,mx25u6435f", "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <104000000>;
-       };
-};
-
-&toacodec {
-       status = "okay";
-};
-
-&usb {
-       vbus-supply = <&usb_pwr_en>;
-};
-
-&usb2_phy1 {
-       /* Enable the hub which is connected to this port */
-       phy-supply = <&hub_5v>;
-};
diff --git a/arch/arm/dts/meson-g12b-odroid-n2l.dts b/arch/arm/dts/meson-g12b-odroid-n2l.dts
deleted file mode 100644 (file)
index 70919f4..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2022 Dongjin Kim <tobetter@gmail.com>
- */
-
-/dts-v1/;
-
-/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
-#include "meson-g12b-a311d.dtsi"
-#include "meson-g12b-odroid.dtsi"
-
-/ {
-       compatible = "hardkernel,odroid-n2l", "amlogic,s922x", "amlogic,g12b";
-       model = "Hardkernel ODROID-N2L";
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "ODROID-N2L";
-               audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>,
-                                <&tdmin_c>, <&tdmin_lb>;
-               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",
-                               "TDMIN_A IN 4", "TDM_B Loopback",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TDMIN_C IN 4", "TDM_B Loopback",
-                               "TDMIN_LB IN 1", "TDM_B Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "TODDR_B IN 1", "TDMIN_B OUT",
-                               "TODDR_C IN 1", "TDMIN_B OUT",
-                               "TODDR_A IN 2", "TDMIN_C OUT",
-                               "TODDR_B IN 2", "TDMIN_C OUT",
-                               "TODDR_C IN 2", "TDMIN_C OUT",
-                               "TODDR_A IN 6", "TDMIN_LB OUT",
-                               "TODDR_B IN 6", "TDMIN_LB OUT",
-                               "TODDR_C IN 6", "TDMIN_LB 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>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-6 {
-                       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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-7 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&eth_phy {
-       status = "disabled";
-};
-
-&vddcpu_a {
-       regulator-min-microvolt = <680000>;
-       regulator-max-microvolt = <1040000>;
-
-       pwms = <&pwm_ab 0 1500 0>;
-};
-
-&vddcpu_b {
-       regulator-min-microvolt = <680000>;
-       regulator-max-microvolt = <1040000>;
-
-       pwms = <&pwm_AO_cd 1 1500 0>;
-};
-
-&usb2_phy0 {
-       phy-supply = <&usb_pwr_en>;
-};
-
-&usb2_phy1 {
-       phy-supply = <&usb_pwr_en>;
-};
diff --git a/arch/arm/dts/meson-g12b-odroid.dtsi b/arch/arm/dts/meson-g12b-odroid.dtsi
deleted file mode 100644 (file)
index 9e12a34..0000000
+++ /dev/null
@@ -1,445 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-toacodec.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-               rtc1 = &vrtc;
-       };
-
-       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>;
-       };
-
-       fan: gpio-fan {
-               compatible = "gpio-fan";
-               gpios = <&gpio_ao GPIOAO_10 GPIO_ACTIVE_HIGH>;
-               /* Using Dummy Speed */
-               gpio-fan,speed-map = <0 0>, <1 1>;
-               #cooling-cells = <2>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-blue {
-                       label = "n2:blue";
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       tflash_vdd: regulator-tflash_vdd {
-               compatible = "regulator-fixed";
-
-               regulator-name = "TFLASH_VDD";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-
-               gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-always-on;
-       };
-
-       tf_io: gpio-regulator-tf_io {
-               compatible = "regulator-gpio";
-
-               regulator-name = "TF_IO";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-
-               gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
-               gpios-states = <0>;
-
-               states = <3300000 0>,
-                        <1800000 1>;
-       };
-
-       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;
-       };
-
-       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 the microUSB port power enable */
-               gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       vcc_5v: regulator-vcc_5v {
-               compatible = "regulator-fixed";
-               regulator-name = "5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               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 {
-               /*
-                * MP8756GD Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_A";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
-
-               pwm-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 {
-               /*
-                * Silergy SY8120B1ABC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_B";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
-
-               pwm-supply = <&main_12v>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       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;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&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>;
-};
-
-&cpu_thermal {
-       trips {
-               cpu_active: cpu-active {
-                       temperature = <60000>; /* millicelsius */
-                       hysteresis = <2000>; /* millicelsius */
-                       type = "active";
-               };
-       };
-
-       cooling-maps {
-               map {
-                       trip = <&cpu_active>;
-                       cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&ddr_thermal {
-       trips {
-               ddr_active: ddr-active {
-                       temperature = <60000>; /* millicelsius */
-                       hysteresis = <2000>; /* millicelsius */
-                       type = "active";
-               };
-       };
-
-       cooling-maps {
-               map {
-                       trip = <&ddr_active>;
-                       cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&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>;
-       };
-};
-
-&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";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* 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 = <&tflash_vdd>;
-       vqmmc-supply = <&tf_io>;
-
-};
-
-/* 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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&flash_1v8>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmif_c {
-       status = "okay";
-};
-
-&tdmin_a {
-       status = "okay";
-};
-
-&tdmin_b {
-       status = "okay";
-};
-
-&tdmin_c {
-       status = "okay";
-};
-
-&tdmin_lb {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tdmout_c {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&toddr_b {
-       status = "okay";
-};
-
-&toddr_c {
-       status = "okay";
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-};
-
-&usb2_phy0 {
-       phy-supply = <&vcc_5v>;
-};
diff --git a/arch/arm/dts/meson-g12b-radxa-zero2.dts b/arch/arm/dts/meson-g12b-radxa-zero2.dts
deleted file mode 100644 (file)
index 890f5bf..0000000
+++ /dev/null
@@ -1,489 +0,0 @@
-// 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>
- * Copyright (c) 2022 Radxa Limited
- * Author: Yuntian Zhang <yt@radxa.com>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-a311d.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
-       model = "Radxa Zero2";
-
-       aliases {
-               serial0 = &uart_AO;
-               serial2 = &uart_A;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x80000000>;
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               poll-interval = <100>;
-               power-button {
-                       label = "power";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio_ao GPIOAO_3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-green {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio GPIOA_12 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       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";
-       };
-
-       ao_5v: regulator-ao-5v {
-               compatible = "regulator-fixed";
-               regulator-name = "AO_5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       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 */
-       };
-
-       vddao_1v8: regulator-vddao-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO1V8";
-               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 = <&ao_5v>;
-               regulator-always-on;
-       };
-
-       vddcpu_a: regulator-vddcpu-a {
-               /*
-                * MP8756GD Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_A";
-               regulator-min-microvolt = <730000>;
-               regulator-max-microvolt = <1022000>;
-
-               pwm-supply = <&ao_5v>;
-
-               pwms = <&pwm_ab 0 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddcpu_b: regulator-vddcpu-b {
-               /*
-                * Silergy SY8120B1ABC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU_B";
-               regulator-min-microvolt = <730000>;
-               regulator-max-microvolt = <1022000>;
-
-               pwm-supply = <&ao_5v>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "RADXA-ZERO2";
-               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>;
-
-               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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-4 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-
-       wifi32k: clock-0 {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&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>;
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&gpio {
-       gpio-line-names =
-               /* GPIOZ */
-               "PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40",
-               "", "", "", "", "", "", "", "",
-               /* GPIOH */
-               "", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23",
-               "",
-               /* BOOT */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "EMMC_PWRSEQ", "", "", "",
-               /* GPIOC */
-               "", "", "", "", "", "", "SD_CD", "PIN_36",
-               /* GPIOA */
-               "PIN_32", "PIN_12", "PIN_35", "", "", "PIN_38", "", "",
-               "", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5",
-               /* GPIOX */
-               "", "", "", "", "", "", "SDIO_PWRSEQ", "",
-               "", "", "", "", "", "", "", "",
-               "", "BT_SHUTDOWN", "", "";
-};
-
-&gpio_ao {
-       gpio-line-names =
-               /* GPIOAO */
-               "PIN_8", "PIN_10", "", "BTN_POWER", "", "", "", "PIN_29",
-               "PIN_33", "PIN_37", "FAN", "",
-               /* GPIOE */
-               "", "", "";
-};
-
-&hdmi_tx {
-       status = "okay";
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-       hdmi-supply = <&ao_5v>;
-};
-
-&hdmi_tx_tmds_port {
-       hdmi_tx_tmds_out: endpoint {
-               remote-endpoint = <&hdmi_connector_in>;
-       };
-};
-
-&ir {
-       status = "disabled";
-       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_ef {
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-       status = "okay";
-};
-
-&pwm_AO_ab {
-       pinctrl-0 = <&pwm_ao_a_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";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* 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>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power to be kept while in suspend */
-       keep-power-in-suspend;
-
-       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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&vcc_1v8>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&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";
-};
diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts
deleted file mode 100644 (file)
index 7f66f26..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2023 Christian Hewitt <christianshewitt@gmail.com>
- */
-
-/dts-v1/;
-
-#include "meson-g12b-s922x.dtsi"
-#include "meson-g12b-bananapi.dtsi"
-
-/ {
-       compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b";
-       model = "BananaPi M2S";
-};
diff --git a/arch/arm/dts/meson-g12b-s922x.dtsi b/arch/arm/dts/meson-g12b-s922x.dtsi
deleted file mode 100644 (file)
index 1e5d0ee..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12b.dtsi"
-
-/ {
-       cpu_opp_table_0: opp-table-0 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-250000000 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-500000000 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-667000000 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-
-               opp-1398000000 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-
-               opp-1512000000 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-
-               opp-1896000000 {
-                       opp-hz = /bits/ 64 <1896000000>;
-                       opp-microvolt = <981000>;
-               };
-
-               opp-1992000000 {
-                       opp-hz = /bits/ 64 <1992000000>;
-                       opp-microvolt = <1001000>;
-               };
-       };
-
-       cpub_opp_table_1: opp-table-1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <751000>;
-               };
-
-               opp-250000000 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <751000>;
-               };
-
-               opp-500000000 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <751000>;
-               };
-
-               opp-667000000 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <751000>;
-               };
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <771000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <771000>;
-               };
-
-               opp-1398000000 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <791000>;
-               };
-
-               opp-1512000000 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <821000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <861000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <891000>;
-               };
-
-               opp-1800000000 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-
-               opp-1908000000 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <1022000>;
-               };
-       };
-};
diff --git a/arch/arm/dts/meson-g12b-w400.dtsi b/arch/arm/dts/meson-g12b-w400.dtsi
deleted file mode 100644 (file)
index feb0885..0000000
+++ /dev/null
@@ -1,425 +0,0 @@
-// 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 = <80000>;
-               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>;
-};
diff --git a/arch/arm/dts/meson-g12b.dtsi b/arch/arm/dts/meson-g12b.dtsi
deleted file mode 100644 (file)
index 75ff00f..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12.dtsi"
-
-/ {
-       compatible = "amlogic,g12b";
-
-       cpus {
-               #address-cells = <0x2>;
-               #size-cells = <0x0>;
-
-               cpu-map {
-                       cluster0 {
-                               core0 {
-                                       cpu = <&cpu0>;
-                               };
-
-                               core1 {
-                                       cpu = <&cpu1>;
-                               };
-                       };
-
-                       cluster1 {
-                               core0 {
-                                       cpu = <&cpu100>;
-                               };
-
-                               core1 {
-                                       cpu = <&cpu101>;
-                               };
-
-                               core2 {
-                                       cpu = <&cpu102>;
-                               };
-
-                               core3 {
-                                       cpu = <&cpu103>;
-                               };
-                       };
-               };
-
-               cpu0: cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x0>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <592>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu1: cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a53";
-                       reg = <0x0 0x1>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <592>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu100: cpu@100 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a73";
-                       reg = <0x0 0x100>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <1024>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu101: cpu@101 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a73";
-                       reg = <0x0 0x101>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <1024>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu102: cpu@102 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a73";
-                       reg = <0x0 0x102>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <1024>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu103: cpu@103 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a73";
-                       reg = <0x0 0x103>;
-                       enable-method = "psci";
-                       capacity-dmips-mhz = <1024>;
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               l2: l2-cache0 {
-                       compatible = "cache";
-                       cache-level = <2>;
-               };
-       };
-};
-
-&clkc {
-       compatible = "amlogic,g12b-clkc";
-};
-
-&cpu_thermal {
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-               map1 {
-                       trip = <&cpu_hot>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&mali {
-       dma-coherent;
-};
-
-&pmu {
-       compatible = "amlogic,g12b-ddr-pmu";
-};
diff --git a/arch/arm/dts/meson-khadas-vim3.dtsi b/arch/arm/dts/meson-khadas-vim3.dtsi
deleted file mode 100644 (file)
index 3cf4ecb..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-// 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>
- */
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-               rtc0 = &rtc;
-               rtc1 = &vrtc;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x80000000>;
-       };
-
-       adc-keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 2>;
-               io-channel-names = "buttons";
-               keyup-threshold-microvolt = <1710000>;
-
-               button-function {
-                       label = "Function";
-                       linux,code = <KEY_FN>;
-                       press-threshold-microvolt = <10000>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-white {
-                       color = <LED_COLOR_ID_WHITE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led-red {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               poll-interval = <100>;
-
-               power-button {
-                       label = "power";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio_ao GPIOAO_7 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";
-       };
-
-       dc_in: regulator-dc_in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               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 = <&dc_in>;
-
-               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 = <&vsys_3v3>;
-               regulator-always-on;
-               /* FIXME: actually controlled by VDDCPU_B_EN */
-       };
-
-       vddao_1v8: regulator-vddao_1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vsys_3v3>;
-               regulator-always-on;
-       };
-
-       emmc_1v8: regulator-emmc_1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vcc_3v3>;
-               regulator-always-on;
-       };
-
-       vsys_3v3: regulator-vsys_3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "VSYS_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&dc_in>;
-               regulator-always-on;
-       };
-
-       usb_pwr: regulator-usb_pwr {
-               compatible = "regulator-fixed";
-               regulator-name = "USB_PWR";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&vcc_5v>;
-
-               gpio = <&gpio GPIOA_6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "KHADAS-VIM3";
-               audio-aux-devs = <&tdmin_a>, <&tdmout_a>;
-               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
-                               "TDMOUT_A IN 1", "FRDDR_B OUT 0",
-                               "TDMOUT_A IN 2", "FRDDR_C OUT 0",
-                               "TDM_A Playback", "TDMOUT_A OUT",
-                               "TDMIN_A IN 0", "TDM_A Capture",
-                               "TDMIN_A IN 3", "TDM_A Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A 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>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-6 {
-                       sound-dai = <&tdmif_a>;
-                       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_A>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-7 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&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>;
-};
-
-&cpu_thermal {
-       trips {
-               cpu_active: cpu-active {
-                       temperature = <80000>; /* millicelsius */
-                       hysteresis = <2000>; /* millicelsius */
-                       type = "active";
-               };
-       };
-
-       cooling-maps {
-               map {
-                       trip = <&cpu_active>;
-                       cooling-device = <&khadas_mcu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               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>;
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&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>;
-       };
-};
-
-&i2c_AO {
-       status = "okay";
-       pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;
-       pinctrl-names = "default";
-
-       khadas_mcu: system-controller@18 {
-               compatible = "khadas,mcu";
-               reg = <0x18>;
-               #cooling-cells = <2>;
-       };
-
-       gpio_expander: gpio-controller@20 {
-               compatible = "ti,tca6408";
-               reg = <0x20>;
-               vcc-supply = <&vcc_3v3>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       rtc: rtc@51 {
-               compatible = "haoyu,hym8563";
-               reg = <0x51>;
-               #clock-cells = <0>;
-       };
-};
-
-&ir {
-       status = "okay";
-       pinctrl-0 = <&remote_input_ao_pins>;
-       pinctrl-names = "default";
-       linux,rc-map-name = "rc-khadas";
-};
-
-&pcie {
-       reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>;
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* 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>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power to be kept while in suspend */
-       keep-power-in-suspend;
-
-       mmc-pwrseq = <&sdio_pwrseq>;
-
-       vmmc-supply = <&vsys_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 = <&vsys_3v3>;
-       vqmmc-supply = <&vsys_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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&emmc_1v8>;
-};
-
-/*
- * EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR CS
- * and eMMC Data 4 to 7 pins.
- * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0,
- * and change bus-width to 4 then spifc can be enabled.
- */
-&spifc {
-       status = "disabled";
-       pinctrl-0 = <&nor_pins>;
-       pinctrl-names = "default";
-
-       w25q128: spi-flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "winbond,w25q128fw", "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <104000000>;
-       };
-};
-
-&tdmif_a {
-       status = "okay";
-};
-
-&tdmin_a {
-       status = "okay";
-};
-
-&tdmout_a {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&toddr_b {
-       status = "okay";
-};
-
-&toddr_c {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&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";
-};
-
-&usb2_phy0 {
-       phy-supply = <&dc_in>;
-};
-
-&usb2_phy1 {
-       phy-supply = <&usb_pwr>;
-};
-
-&usb3_pcie_phy {
-       phy-supply = <&usb_pwr>;
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "peripheral";
-};
diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts
deleted file mode 100644 (file)
index 5860343..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 BayLibre SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-/dts-v1/;
-
-#include "meson-sm1-bananapi.dtsi"
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "bananapi,bpi-m2-pro", "amlogic,sm1";
-       model = "Banana Pi BPI-M2-PRO";
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "BPI-M2-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>;
-
-               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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-4 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&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-sm1-bananapi-m5.dts b/arch/arm/dts/meson-sm1-bananapi-m5.dts
deleted file mode 100644 (file)
index f045bf8..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 BayLibre SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-/dts-v1/;
-
-#include "meson-sm1-bananapi.dtsi"
-#include <dt-bindings/sound/meson-g12a-toacodec.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "bananapi,bpi-m5", "amlogic,sm1";
-       model = "Banana Pi BPI-M5";
-
-       /* TOFIX: handle CVBS_DET on SARADC channel 0 */
-       cvbs-connector {
-               compatible = "composite-video-connector";
-
-               port {
-                       cvbs_connector_in: endpoint {
-                               remote-endpoint = <&cvbs_vdac_out>;
-                       };
-               };
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "BPI-M5";
-               audio-widgets = "Line", "Lineout";
-               audio-aux-devs = <&tdmout_b>, <&tdmout_c>,
-                                <&tdmin_a>, <&tdmin_b>, <&tdmin_c>;
-               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",
-                               "TDMOUT_C IN 0", "FRDDR_A OUT 2",
-                               "TDMOUT_C IN 1", "FRDDR_B OUT 2",
-                               "TDMOUT_C IN 2", "FRDDR_C OUT 2",
-                               "TDM_C Playback", "TDMOUT_C OUT",
-                               "TDMIN_A IN 4", "TDM_B Loopback",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TDMIN_C IN 4", "TDM_B Loopback",
-                               "TDMIN_A IN 5", "TDM_C Loopback",
-                               "TDMIN_B IN 5", "TDM_C Loopback",
-                               "TDMIN_C IN 5", "TDM_C Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "TODDR_B IN 1", "TDMIN_B OUT",
-                               "TODDR_C IN 1", "TDMIN_B OUT",
-                               "TODDR_A IN 2", "TDMIN_C OUT",
-                               "TODDR_B IN 2", "TDMIN_C OUT",
-                               "TODDR_C IN 2", "TDMIN_C OUT",
-                               "Lineout", "ACODEC LOLP",
-                               "Lineout", "ACODEC LORP";
-
-               assigned-clocks = <&clkc CLKID_MPLL2>,
-                                 <&clkc CLKID_MPLL0>,
-                                 <&clkc CLKID_MPLL1>;
-               assigned-clock-parents = <0>, <0>, <0>;
-               assigned-clock-rates = <294912000>,
-                                      <270950400>,
-                                      <393216000>;
-
-               dai-link-0 {
-                       sound-dai = <&frddr_a>;
-               };
-
-               dai-link-1 {
-                       sound-dai = <&frddr_b>;
-               };
-
-               dai-link-2 {
-                       sound-dai = <&frddr_c>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-6 {
-                       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-0 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&toacodec TOACODEC_IN_B>;
-                       };
-               };
-
-               /* i2s jack output interface */
-               dai-link-7 {
-                       sound-dai = <&tdmif_c>;
-                       dai-format = "i2s";
-                       dai-tdm-slot-tx-mask-0 = <1 1>;
-                       mclk-fs = <256>;
-
-                       codec-0 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&toacodec TOACODEC_IN_C>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-8 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-
-               /* acodec glue */
-               dai-link-9 {
-                       sound-dai = <&toacodec TOACODEC_OUT>;
-
-                       codec {
-                               sound-dai = <&acodec>;
-                       };
-               };
-       };
-};
-
-&acodec {
-       AVDD-supply = <&vddao_1v8>;
-       status = "okay";
-};
-
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cvbs_vdac_port {
-       cvbs_vdac_out: endpoint {
-               remote-endpoint = <&cvbs_connector_in>;
-       };
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmif_c {
-       status = "okay";
-};
-
-&tdmin_a {
-       status = "okay";
-};
-
-&tdmin_b {
-       status = "okay";
-};
-
-&tdmin_c {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tdmout_c {
-       status = "okay";
-};
-
-&toacodec {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&toddr_b {
-       status = "okay";
-};
-
-&toddr_c {
-       status = "okay";
-};
diff --git a/arch/arm/dts/meson-sm1-bananapi.dtsi b/arch/arm/dts/meson-sm1-bananapi.dtsi
deleted file mode 100644 (file)
index 17045ff..0000000
+++ /dev/null
@@ -1,435 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 BayLibre SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-sm1.dtsi"
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-
-/ {
-       adc-keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 2>;
-               io-channel-names = "buttons";
-               keyup-threshold-microvolt = <1800000>;
-
-               button-sw3 {
-                       label = "SW3";
-                       linux,code = <BTN_3>;
-                       press-threshold-microvolt = <1700000>;
-               };
-       };
-
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               key {
-                       label = "SW1";
-                       linux,code = <BTN_1>;
-                       gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
-               };
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-green {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
-               };
-
-               led-blue {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       emmc_1v8: regulator-emmc_1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vddao_3v3>;
-               regulator-always-on;
-       };
-
-       dc_in: regulator-dc_in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       vddio_c: regulator-vddio_c {
-               compatible = "regulator-gpio";
-               regulator-name = "VDDIO_C";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-
-               enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-
-               gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_DRAIN>;
-               gpios-states = <1>;
-
-               states = <1800000 0>,
-                        <3300000 1>;
-       };
-
-       tflash_vdd: regulator-tflash_vdd {
-               compatible = "regulator-fixed";
-               regulator-name = "TFLASH_VDD";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&dc_in>;
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-       };
-
-       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 = <&dc_in>;
-               regulator-always-on;
-       };
-
-       vddcpu: regulator-vddcpu {
-               /*
-                * SY8120B1ABC DC/DC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-
-               pwm-supply = <&dc_in>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       /* USB Hub Power Enable */
-       vl_pwr_en: regulator-vl_pwr_en {
-               compatible = "regulator-fixed";
-               regulator-name = "VL_PWR_EN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&dc_in>;
-
-               gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU1_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU2_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU3_CLK>;
-       clock-latency = <50000>;
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               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-txid";
-       phy-handle = <&external_phy>;
-};
-
-&gpio {
-       gpio-line-names =
-               /* GPIOZ */
-               "ETH_MDIO", /* GPIOZ_0 */
-               "ETH_MDC", /* GPIOZ_1 */
-               "ETH_RXCLK", /* GPIOZ_2 */
-               "ETH_RX_DV", /* GPIOZ_3 */
-               "ETH_RXD0", /* GPIOZ_4 */
-               "ETH_RXD1", /* GPIOZ_5 */
-               "ETH_RXD2", /* GPIOZ_6 */
-               "ETH_RXD3", /* GPIOZ_7 */
-               "ETH_TXCLK", /* GPIOZ_8 */
-               "ETH_TXEN", /* GPIOZ_9 */
-               "ETH_TXD0", /* GPIOZ_10 */
-               "ETH_TXD1", /* GPIOZ_11 */
-               "ETH_TXD2", /* GPIOZ_12 */
-               "ETH_TXD3", /* GPIOZ_13 */
-               "ETH_INTR", /* GPIOZ_14 */
-               "ETH_NRST", /* GPIOZ_15 */
-               /* GPIOH */
-               "HDMI_SDA", /* GPIOH_0 */
-               "HDMI_SCL", /* GPIOH_1 */
-               "HDMI_HPD", /* GPIOH_2 */
-               "HDMI_CEC", /* GPIOH_3 */
-               "VL-RST_N", /* GPIOH_4 */
-               "CON1-P36", /* GPIOH_5 */
-               "VL-PWREN", /* GPIOH_6 */
-               "WiFi_3V3_1V8", /* GPIOH_7 */
-               "TFLASH_VDD_EN", /* GPIOH_8 */
-               /* BOOT */
-               "eMMC_D0", /* BOOT_0 */
-               "eMMC_D1", /* BOOT_1 */
-               "eMMC_D2", /* BOOT_2 */
-               "eMMC_D3", /* BOOT_3 */
-               "eMMC_D4", /* BOOT_4 */
-               "eMMC_D5", /* BOOT_5 */
-               "eMMC_D6", /* BOOT_6 */
-               "eMMC_D7", /* BOOT_7 */
-               "eMMC_CLK", /* BOOT_8 */
-               "",
-               "eMMC_CMD", /* BOOT_10 */
-               "",
-               "eMMC_RST#", /* BOOT_12 */
-               "eMMC_DS", /* BOOT_13 */
-               "", "",
-               /* GPIOC */
-               "SD_D0_B", /* GPIOC_0 */
-               "SD_D1_B", /* GPIOC_1 */
-               "SD_D2_B", /* GPIOC_2 */
-               "SD_D3_B", /* GPIOC_3 */
-               "SD_CLK_B", /* GPIOC_4 */
-               "SD_CMD_B", /* GPIOC_5 */
-               "CARD_EN_DET", /* GPIOC_6 */
-               "",
-               /* GPIOA */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "",
-               "CON1-P27", /* GPIOA_14 */
-               "CON1-P28", /* GPIOA_15 */
-               /* GPIOX */
-               "CON1-P16", /* GPIOX_0 */
-               "CON1-P18", /* GPIOX_1 */
-               "CON1-P22", /* GPIOX_2 */
-               "CON1-P11", /* GPIOX_3 */
-               "CON1-P13", /* GPIOX_4 */
-               "CON1-P07", /* GPIOX_5 */
-               "CON1-P33", /* GPIOX_6 */
-               "CON1-P15", /* GPIOX_7 */
-               "CON1-P19", /* GPIOX_8 */
-               "CON1-P21", /* GPIOX_9 */
-               "CON1-P24", /* GPIOX_10 */
-               "CON1-P23", /* GPIOX_11 */
-               "CON1-P08", /* GPIOX_12 */
-               "CON1-P10", /* GPIOX_13 */
-               "CON1-P29", /* GPIOX_14 */
-               "CON1-P31", /* GPIOX_15 */
-               "CON1-P26", /* GPIOX_16 */
-               "CON1-P03", /* GPIOX_17 */
-               "CON1-P05", /* GPIOX_18 */
-               "CON1-P32"; /* GPIOX_19 */
-
-       /*
-        * WARNING: The USB Hub needs a reset signal to be turned high in
-        * order to be detected by the USB Controller. This signal should
-        * be handled by a USB specific power sequence to reset the Hub
-        * when the USB bus is powered down.
-        */
-       usb-hub-hog {
-               gpio-hog;
-               gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "usb-hub-reset";
-       };
-};
-
-&gpio_ao {
-       gpio-line-names =
-               /* GPIOAO */
-               "DEBUG TX", /* GPIOAO_0 */
-               "DEBUG RX", /* GPIOAO_1 */
-               "SYS_LED2", /* GPIOAO_2 */
-               "UPDATE_KEY", /* GPIOAO_3 */
-               "CON1-P40", /* GPIOAO_4 */
-               "IR_IN", /* GPIOAO_5 */
-               "TF_3V3N_1V8_EN", /* GPIOAO_6 */
-               "CON1-P35", /* GPIOAO_7 */
-               "CON1-P12", /* GPIOAO_8 */
-               "CON1-P37", /* GPIOAO_9 */
-               "CON1-P38", /* GPIOAO_10 */
-               "SYS_LED", /* GPIOAO_11 */
-               /* GPIOE */
-               "VDDEE_PWM", /* GPIOE_0 */
-               "VDDCPU_PWM", /* GPIOE_1 */
-               "TF_PWR_EN"; /* GPIOE_2 */
-};
-
-&hdmi_tx {
-       status = "okay";
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-       hdmi-supply = <&dc_in>;
-};
-
-&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_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddao_1v8>;
-};
-
-/* 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;
-
-       /* TOFIX: SD card is barely usable in SDR modes */
-
-       cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
-       vmmc-supply = <&tflash_vdd>;
-       vqmmc-supply = <&vddio_c>;
-};
-
-/* 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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&emmc_1v8>;
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-};
-
-&usb2_phy0 {
-       phy-supply = <&dc_in>;
-};
-
-&usb2_phy1 {
-       /* Enable the hub which is connected to this port */
-       phy-supply = <&vl_pwr_en>;
-};
diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l.dts b/arch/arm/dts/meson-sm1-khadas-vim3l.dts
deleted file mode 100644 (file)
index f2c0981..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-/dts-v1/;
-
-#include "meson-sm1.dtsi"
-#include "meson-khadas-vim3.dtsi"
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "khadas,vim3l", "amlogic,sm1";
-       model = "Khadas VIM3L";
-
-       vddcpu: regulator-vddcpu {
-               /*
-                * Silergy SY8030DEC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-
-               vin-supply = <&vsys_3v3>;
-
-               pwms = <&pwm_AO_cd 1 1250 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       sound {
-               model = "G12B-KHADAS-VIM3L";
-               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
-                               "TDMOUT_A IN 1", "FRDDR_B OUT 0",
-                               "TDMOUT_A IN 2", "FRDDR_C OUT 0",
-                               "TDM_A Playback", "TDMOUT_A OUT",
-                               "TDMIN_A IN 0", "TDM_A Capture",
-                               "TDMIN_A IN 13", "TDM_A Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT";
-       };
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU1_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU2_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU3_CLK>;
-       clock-latency = <50000>;
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-/*
- * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
- * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
- * an USB3.0 Type A connector and a M.2 Key M slot.
- * The PHY driving these differential lines is shared between
- * the USB3.0 controller and the PCIe Controller, thus only
- * a single controller can use it.
- * If the MCU is configured to mux the PCIe/USB3.0 differential lines
- * to the M.2 Key M slot, uncomment the following block to disable
- * USB3.0 from the USB Complex and enable the PCIe controller.
- * The End User is not expected to uncomment the following except for
- * testing purposes, but instead rely on the firmware/bootloader to
- * update these nodes accordingly if PCIe mode is selected by the MCU.
- */
-/*
-&pcie {
-       status = "okay";
-};
-
-&usb {
-       phys = <&usb2_phy0>, <&usb2_phy1>;
-       phy-names = "usb2-phy0", "usb2-phy1";
-};
- */
-
-&sd_emmc_a {
-       sd-uhs-sdr50;
-};
diff --git a/arch/arm/dts/meson-sm1-odroid-c4.dts b/arch/arm/dts/meson-sm1-odroid-c4.dts
deleted file mode 100644 (file)
index 8c30ce6..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
- */
-
-/dts-v1/;
-
-#include "meson-sm1-odroid.dtsi"
-
-/ {
-       compatible = "hardkernel,odroid-c4", "amlogic,sm1";
-       model = "Hardkernel ODROID-C4";
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-blue {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-                       panic-indicator;
-               };
-       };
-
-       sound {
-               model = "ODROID-C4";
-       };
-};
-
-&gpio {
-       /*
-        * WARNING: The USB Hub on the Odroid-C4 needs a reset signal
-        * to be turned high in order to be detected by the USB Controller
-        * This signal should be handled by a USB specific power sequence
-        * in order to reset the Hub when USB bus is powered down.
-        */
-       hog-0 {
-               gpio-hog;
-               gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "usb-hub-reset";
-       };
-};
-
-&ir {
-       linux,rc-map-name = "rc-odroid";
-};
diff --git a/arch/arm/dts/meson-sm1-odroid-hc4.dts b/arch/arm/dts/meson-sm1-odroid-hc4.dts
deleted file mode 100644 (file)
index f3f9532..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
- */
-
-/dts-v1/;
-
-#include "meson-sm1-odroid.dtsi"
-
-/ {
-       compatible = "hardkernel,odroid-hc4", "amlogic,sm1";
-       model = "Hardkernel ODROID-HC4";
-
-       aliases {
-               rtc0 = &rtc;
-               rtc1 = &vrtc;
-       };
-
-       fan0: pwm-fan {
-               compatible = "pwm-fan";
-               #cooling-cells = <2>;
-               cooling-min-state = <0>;
-               cooling-max-state = <3>;
-               cooling-levels = <0 120 170 220>;
-               pwms = <&pwm_cd 1 40000 0>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-blue {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-                       panic-indicator;
-               };
-
-               led-red {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_POWER;
-                       gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
-               };
-       };
-
-       /* Powers the SATA Disk 0 regulator, which is enabled when a disk load is detected */
-       p12v_0: regulator-p12v_0 {
-               compatible = "regulator-fixed";
-               regulator-name = "P12V_0";
-               regulator-min-microvolt = <12000000>;
-               regulator-max-microvolt = <12000000>;
-               vin-supply = <&main_12v>;
-
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-       };
-
-       /* Powers the SATA Disk 1 regulator, which is enabled when a disk load is detected */
-       p12v_1: regulator-p12v_1 {
-               compatible = "regulator-fixed";
-               regulator-name = "P12V_1";
-               regulator-min-microvolt = <12000000>;
-               regulator-max-microvolt = <12000000>;
-               vin-supply = <&main_12v>;
-
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-       };
-
-       sound {
-               model = "ODROID-HC4";
-       };
-};
-
-&cpu_thermal {
-       cooling-maps {
-               map {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&ir {
-       linux,rc-map-name = "rc-odroid";
-};
-
-&i2c2 {
-       status = "okay";
-       pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
-       pinctrl-names = "default";
-
-       rtc: rtc@51 {
-               status = "okay";
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-               wakeup-source;
-       };
-};
-
-&pcie {
-       status = "okay";
-       reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
-};
-
-&pwm_cd {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pwm_d_x6_pins>;
-};
-
-&sd_emmc_c {
-       status = "disabled";
-};
-
-&spifc {
-       status = "okay";
-       pinctrl-0 = <&nor_pins>;
-       pinctrl-names = "default";
-
-       spi-flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <104000000>;
-       };
-};
-
-&usb {
-       phys = <&usb2_phy1>;
-       phy-names = "usb2-phy1";
-};
-
-&usb2_phy0 {
-       status = "disabled";
-};
diff --git a/arch/arm/dts/meson-sm1-odroid.dtsi b/arch/arm/dts/meson-sm1-odroid.dtsi
deleted file mode 100644 (file)
index fd0ad85..0000000
+++ /dev/null
@@ -1,449 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
- */
-
-#include "meson-sm1.dtsi"
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.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>;
-       };
-
-       tflash_vdd: regulator-tflash_vdd {
-               compatible = "regulator-fixed";
-
-               regulator-name = "TFLASH_VDD";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-
-               gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
-               enable-active-high;
-               regulator-always-on;
-       };
-
-       tf_io: gpio-regulator-tf_io {
-               compatible = "regulator-gpio";
-
-               regulator-name = "TF_IO";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&vcc_5v>;
-
-               enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-always-on;
-
-               gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
-               gpios-states = <0>;
-
-               states = <3300000 0>,
-                        <1800000 1>;
-       };
-
-       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 = "5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               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: regulator-vddcpu {
-               /*
-                * MP8756GD Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               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;
-       };
-
-       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 the microUSB port power enable */
-               gpio = <&gpio_ao GPIOAO_2 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;
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               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>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-4 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU1_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU2_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU3_CLK>;
-       clock-latency = <50000>;
-};
-
-&ext_mdio {
-       external_phy: ethernet-phy@0 {
-               /* Realtek RTL8211F (0x001cc916) */
-               reg = <0>;
-               max-speed = <1000>;
-
-               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>;
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&gpio {
-       gpio-line-names =
-               /* GPIOZ */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "", "", "",
-               /* GPIOH */
-               "", "", "", "", "",
-               "PIN_36", /* GPIOH_5 */
-               "PIN_26", /* GPIOH_6 */
-               "PIN_32", /* GPIOH_7 */
-               "",
-               /* BOOT */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "", "", "",
-               /* GPIOC */
-               "", "", "", "", "", "", "", "",
-               /* GPIOA */
-               "", "", "", "", "", "", "", "",
-               "", "", "", "", "", "",
-               "PIN_27", /* GPIOA_14 */
-               "PIN_28", /* GPIOA_15 */
-               /* GPIOX */
-               "PIN_16", /* GPIOX_0 */
-               "PIN_18", /* GPIOX_1 */
-               "PIN_22", /* GPIOX_2 */
-               "PIN_11", /* GPIOX_3 */
-               "PIN_13", /* GPIOX_4 */
-               "PIN_7",  /* GPIOX_5 */
-               "PIN_33", /* GPIOX_6 */
-               "PIN_15", /* GPIOX_7 */
-               "PIN_19", /* GPIOX_8 */
-               "PIN_21", /* GPIOX_9 */
-               "PIN_24", /* GPIOX_10 */
-               "PIN_23", /* GPIOX_11 */
-               "PIN_8",  /* GPIOX_12 */
-               "PIN_10", /* GPIOX_13 */
-               "PIN_29", /* GPIOX_14 */
-               "PIN_31", /* GPIOX_15 */
-               "PIN_12", /* GPIOX_16 */
-               "PIN_3",  /* GPIOX_17 */
-               "PIN_5",  /* GPIOX_18 */
-               "PIN_35"; /* GPIOX_19 */
-};
-
-&gpio_ao {
-       gpio-line-names =
-               /* GPIOAO */
-               "", "", "", "",
-               "PIN_47", /* GPIOAO_4 */
-               "", "",
-               "PIN_45", /* GPIOAO_7 */
-               "PIN_46", /* GPIOAO_8 */
-               "PIN_44", /* GPIOAO_9 */
-               "PIN_42", /* GPIOAO_10 */
-               "",
-               /* GPIOE */
-               "", "", "";
-};
-
-&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_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&saradc {
-       status = "okay";
-};
-
-/* 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 = <200000000>;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
-       sd-uhs-sdr50;
-       sd-uhs-sdr104;
-       disable-wp;
-
-       cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
-       vmmc-supply = <&tflash_vdd>;
-       vqmmc-supply = <&tf_io>;
-};
-
-/* 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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vcc_3v3>;
-       vqmmc-supply = <&flash_1v8>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-       vbus-supply = <&usb_pwr_en>;
-};
-
-&usb2_phy0 {
-       phy-supply = <&vcc_5v>;
-};
-
diff --git a/arch/arm/dts/meson-sm1-sei610.dts b/arch/arm/dts/meson-sm1-sei610.dts
deleted file mode 100644 (file)
index 2194a77..0000000
+++ /dev/null
@@ -1,616 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre SAS. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "meson-sm1.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/meson-g12a-gpio.h>
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
-/ {
-       compatible = "seirobotics,sei610", "amlogic,sm1";
-       model = "SEI Robotics SEI610";
-
-       aliases {
-               serial0 = &uart_AO;
-               ethernet0 = &ethmac;
-       };
-
-       mono_dac: audio-codec-0 {
-               compatible = "maxim,max98357a";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "U16";
-               sdmode-gpios = <&gpio GPIOX_8 GPIO_ACTIVE_HIGH>;
-       };
-
-       dmics: audio-codec-1 {
-               #sound-dai-cells = <0>;
-               compatible = "dmic-codec";
-               num-channels = <2>;
-               wakeup-delay-ms = <50>;
-               status = "okay";
-               sound-name-prefix = "MIC";
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       emmc_pwrseq: emmc-pwrseq {
-               compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               key1 {
-                       label = "A";
-                       linux,code = <BTN_0>;
-                       gpios = <&gpio GPIOH_6 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <34 IRQ_TYPE_EDGE_BOTH>;
-               };
-
-               key2 {
-                       label = "B";
-                       linux,code = <BTN_1>;
-                       gpios = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <35 IRQ_TYPE_EDGE_BOTH>;
-               };
-
-               key3 {
-                       label = "C";
-                       linux,code = <BTN_2>;
-                       gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <2 IRQ_TYPE_EDGE_BOTH>;
-               };
-
-               mic_mute {
-                       label = "MicMute";
-                       linux,code = <SW_MUTE_DEVICE>;
-                       linux,input-type = <EV_SW>;
-                       gpios = <&gpio_ao GPIOE_2 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <99 IRQ_TYPE_EDGE_BOTH>;
-               };
-
-               power_key {
-                       label = "PowerKey";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
-                       interrupt-parent = <&gpio_intc>;
-                       interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
-               };
-       };
-
-       hdmi-connector {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_connector_in: endpoint {
-                               remote-endpoint = <&hdmi_tx_tmds_out>;
-                       };
-               };
-       };
-
-       led-controller-1 {
-               compatible = "gpio-leds";
-
-               led-1 {
-                       label = "sei610:blue:bt";
-                       gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
-                       default-state = "off";
-               };
-       };
-
-       led-controller-2 {
-               compatible = "pwm-leds";
-
-               led-2 {
-                       label = "sei610:red:power";
-                       pwms = <&pwm_AO_ab 0 30518 0>;
-                       max-brightness = <255>;
-                       linux,default-trigger = "default-on";
-                       active-low;
-               };
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0 0x0 0x40000000>;
-       };
-
-       ao_5v: regulator-ao_5v {
-               compatible = "regulator-fixed";
-               regulator-name = "AO_5V";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&dc_in>;
-               regulator-always-on;
-       };
-
-       dc_in: regulator-dc_in {
-               compatible = "regulator-fixed";
-               regulator-name = "DC_IN";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       emmc_1v8: regulator-emmc_1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "EMMC_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 = <&dc_in>;
-               regulator-always-on;
-       };
-
-       /* Used by Tuner, RGB Led & IR Emitter LED array */
-       vddao_3v3_t: regulator-vddao_3v3_t {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDAO_3V3_T";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               vin-supply = <&vddao_3v3>;
-               gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-               enable-active-low;
-               regulator-always-on;
-       };
-
-       vddcpu: regulator-vddcpu {
-               /*
-                * SY8120B1ABC DC/DC Regulator.
-                */
-               compatible = "pwm-regulator";
-
-               regulator-name = "VDDCPU";
-               regulator-min-microvolt = <690000>;
-               regulator-max-microvolt = <1050000>;
-
-               vin-supply = <&dc_in>;
-
-               pwms = <&pwm_AO_cd 1 1500 0>;
-               pwm-dutycycle-range = <100 0>;
-
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       vddio_ao1v8: regulator-vddio_ao1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO1V8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vddao_3v3>;
-               regulator-always-on;
-       };
-
-       reserved-memory {
-               /* TEE Reserved Memory */
-               bl32_reserved: bl32@5000000 {
-                       reg = <0x0 0x05300000 0x0 0x2000000>;
-                       no-map;
-               };
-       };
-
-       sdio_pwrseq: sdio-pwrseq {
-               compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
-               clocks = <&wifi32k>;
-               clock-names = "ext_clock";
-       };
-
-       sound {
-               compatible = "amlogic,axg-sound-card";
-               model = "SEI610";
-               audio-aux-devs = <&tdmout_a>, <&tdmout_b>,
-                                <&tdmin_a>, <&tdmin_b>;
-               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
-                               "TDMOUT_A IN 1", "FRDDR_B OUT 0",
-                               "TDMOUT_A IN 2", "FRDDR_C OUT 0",
-                               "TDM_A Playback", "TDMOUT_A OUT",
-                               "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",
-                               "TODDR_A IN 4", "PDM Capture",
-                               "TODDR_B IN 4", "PDM Capture",
-                               "TODDR_C IN 4", "PDM Capture",
-                               "TDMIN_A IN 0", "TDM_A Capture",
-                               "TDMIN_A IN 3", "TDM_A Loopback",
-                               "TDMIN_B IN 0", "TDM_A Capture",
-                               "TDMIN_B IN 3", "TDM_A Loopback",
-                               "TDMIN_A IN 1", "TDM_B Capture",
-                               "TDMIN_A IN 4", "TDM_B Loopback",
-                               "TDMIN_B IN 1", "TDM_B Capture",
-                               "TDMIN_B IN 4", "TDM_B Loopback",
-                               "TODDR_A IN 0", "TDMIN_A OUT",
-                               "TODDR_B IN 0", "TDMIN_A OUT",
-                               "TODDR_C IN 0", "TDMIN_A OUT",
-                               "TODDR_A IN 1", "TDMIN_B OUT",
-                               "TODDR_B IN 1", "TDMIN_B OUT",
-                               "TODDR_C IN 1", "TDMIN_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>;
-               };
-
-               dai-link-3 {
-                       sound-dai = <&toddr_a>;
-               };
-
-               dai-link-4 {
-                       sound-dai = <&toddr_b>;
-               };
-
-               dai-link-5 {
-                       sound-dai = <&toddr_c>;
-               };
-
-               /* internal speaker interface */
-               dai-link-6 {
-                       sound-dai = <&tdmif_a>;
-                       dai-format = "i2s";
-                       dai-tdm-slot-tx-mask-0 = <1 1>;
-                       mclk-fs = <256>;
-
-                       codec-0 {
-                               sound-dai = <&mono_dac>;
-                       };
-
-                       codec-1 {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
-                       };
-               };
-
-               /* 8ch hdmi interface */
-               dai-link-7 {
-                       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>;
-                       };
-               };
-
-               /* internal digital mics */
-               dai-link-8 {
-                       sound-dai = <&pdm>;
-
-                       codec {
-                               sound-dai = <&dmics>;
-                       };
-               };
-
-               /* hdmi glue */
-               dai-link-9 {
-                       sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-                       codec {
-                               sound-dai = <&hdmi_tx>;
-                       };
-               };
-       };
-
-       wifi32k: wifi32k {
-               compatible = "pwm-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
-       };
-};
-
-&arb {
-       status = "okay";
-};
-
-&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>;
-};
-
-&clkc_audio {
-       status = "okay";
-};
-
-&cpu0 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu1 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU1_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu2 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU2_CLK>;
-       clock-latency = <50000>;
-};
-
-&cpu3 {
-       cpu-supply = <&vddcpu>;
-       operating-points-v2 = <&cpu_opp_table>;
-       clocks = <&clkc CLKID_CPU3_CLK>;
-       clock-latency = <50000>;
-};
-
-&ethmac {
-       status = "okay";
-       phy-handle = <&internal_ephy>;
-       phy-mode = "rmii";
-};
-
-&frddr_a {
-       status = "okay";
-};
-
-&frddr_b {
-       status = "okay";
-};
-
-&frddr_c {
-       status = "okay";
-};
-
-&hdmi_tx {
-       status = "okay";
-       pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
-       pinctrl-names = "default";
-};
-
-&hdmi_tx_tmds_port {
-       hdmi_tx_tmds_out: endpoint {
-               remote-endpoint = <&hdmi_connector_in>;
-       };
-};
-
-&i2c3 {
-       status = "okay";
-       pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-       pinctrl-names = "default";
-};
-
-&ir {
-       status = "okay";
-       pinctrl-0 = <&remote_input_ao_pins>;
-       pinctrl-names = "default";
-};
-
-&pdm {
-       pinctrl-0 = <&pdm_din0_z_pins>, <&pdm_dclk_z_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&pwm_AO_ab {
-       status = "okay";
-       pinctrl-0 = <&pwm_ao_a_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-};
-
-&pwm_AO_cd {
-       pinctrl-0 = <&pwm_ao_d_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin1";
-       status = "okay";
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-0 = <&pwm_e_pins>;
-       pinctrl-names = "default";
-       clocks = <&xtal>;
-       clock-names = "clkin0";
-};
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddio_ao1v8>;
-};
-
-/* 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;
-       sd-uhs-sdr50;
-       max-frequency = <100000000>;
-
-       non-removable;
-       disable-wp;
-
-       /* WiFi firmware requires power to be kept while in suspend */
-       keep-power-in-suspend;
-
-       mmc-pwrseq = <&sdio_pwrseq>;
-
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&vddio_ao1v8>;
-
-       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;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       max-frequency = <200000000>;
-       non-removable;
-       disable-wp;
-
-       mmc-pwrseq = <&emmc_pwrseq>;
-       vmmc-supply = <&vddao_3v3>;
-       vqmmc-supply = <&emmc_1v8>;
-};
-
-&tdmif_a {
-       pinctrl-0 = <&tdm_a_dout0_pins>, <&tdm_a_fs_pins>, <&tdm_a_sclk_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       assigned-clocks = <&clkc_audio AUD_CLKID_TDM_SCLK_PAD0>,
-                         <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD0>;
-       assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
-       assigned-clock-rates = <0>, <0>;
-};
-
-&tdmif_b {
-       status = "okay";
-};
-
-&tdmin_a {
-       status = "okay";
-};
-
-&tdmin_b {
-       status = "okay";
-};
-
-&tdmout_a {
-       status = "okay";
-};
-
-&tdmout_b {
-       status = "okay";
-};
-
-&toddr_a {
-       status = "okay";
-};
-
-&toddr_b {
-       status = "okay";
-};
-
-&toddr_c {
-       status = "okay";
-};
-
-&tohdmitx {
-       status = "okay";
-};
-
-&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";
-               interrupt-parent = <&gpio_intc>;
-               interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "host-wakeup";
-               shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-               max-speed = <2000000>;
-               clocks = <&wifi32k>;
-               clock-names = "lpo";
-               vbat-supply = <&vddao_3v3>;
-               vddio-supply = <&vddio_ao1v8>;
-       };
-};
-
-/* Exposed via the on-board USB to Serial FT232RL IC */
-&uart_AO {
-       status = "okay";
-       pinctrl-0 = <&uart_ao_a_pins>;
-       pinctrl-names = "default";
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "otg";
-};
diff --git a/arch/arm/dts/meson-sm1.dtsi b/arch/arm/dts/meson-sm1.dtsi
deleted file mode 100644 (file)
index 56ca0ba..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12-common.dtsi"
-#include <dt-bindings/clock/axg-audio-clkc.h>
-#include <dt-bindings/power/meson-sm1-power.h>
-#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
-#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
-
-/ {
-       compatible = "amlogic,sm1";
-
-       tdmif_a: audio-controller-0 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_A";
-               clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_A_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-
-       tdmif_b: audio-controller-1 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_B";
-               clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_B_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-
-       tdmif_c: audio-controller-2 {
-               compatible = "amlogic,axg-tdm-iface";
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "TDM_C";
-               clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
-                        <&clkc_audio AUD_CLKID_MST_C_SCLK>,
-                        <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
-               clock-names = "mclk", "sclk", "lrclk";
-               status = "disabled";
-       };
-
-       cpus {
-               #address-cells = <0x2>;
-               #size-cells = <0x0>;
-
-               cpu0: cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a55";
-                       reg = <0x0 0x0>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu1: cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a55";
-                       reg = <0x0 0x1>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu2: cpu@2 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a55";
-                       reg = <0x0 0x2>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               cpu3: cpu@3 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a55";
-                       reg = <0x0 0x3>;
-                       enable-method = "psci";
-                       next-level-cache = <&l2>;
-                       #cooling-cells = <2>;
-               };
-
-               l2: l2-cache0 {
-                       compatible = "cache";
-                       cache-level = <2>;
-               };
-       };
-
-       cpu_opp_table: opp-table {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-1000000000 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <770000>;
-               };
-
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <780000>;
-               };
-
-               opp-1404000000 {
-                       opp-hz = /bits/ 64 <1404000000>;
-                       opp-microvolt = <790000>;
-               };
-
-               opp-1500000000 {
-                       opp-hz = /bits/ 64 <1500000000>;
-                       opp-microvolt = <800000>;
-               };
-
-               opp-1608000000 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <810000>;
-               };
-
-               opp-1704000000 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <850000>;
-               };
-
-               opp-1800000000 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <900000>;
-               };
-
-               opp-1908000000 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <950000>;
-               };
-       };
-};
-
-&apb {
-       audio: bus@60000 {
-               compatible = "simple-bus";
-               reg = <0x0 0x60000 0x0 0x1000>;
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges = <0x0 0x0 0x0 0x60000 0x0 0x1000>;
-
-               clkc_audio: clock-controller@0 {
-                       status = "disabled";
-                       compatible = "amlogic,sm1-audio-clkc";
-                       reg = <0x0 0x0 0x0 0xb4>;
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-
-                       clocks = <&clkc CLKID_AUDIO>,
-                                <&clkc CLKID_MPLL0>,
-                                <&clkc CLKID_MPLL1>,
-                                <&clkc CLKID_MPLL2>,
-                                <&clkc CLKID_MPLL3>,
-                                <&clkc CLKID_HIFI_PLL>,
-                                <&clkc CLKID_FCLK_DIV3>,
-                                <&clkc CLKID_FCLK_DIV4>,
-                                <&clkc CLKID_FCLK_DIV5>;
-                       clock-names = "pclk",
-                                     "mst_in0",
-                                     "mst_in1",
-                                     "mst_in2",
-                                     "mst_in3",
-                                     "mst_in4",
-                                     "mst_in5",
-                                     "mst_in6",
-                                     "mst_in7";
-
-                       resets = <&reset RESET_AUDIO>;
-               };
-
-               toddr_a: audio-controller@100 {
-                       compatible = "amlogic,sm1-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x100 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_A";
-                       interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
-                       resets = <&arb AXG_ARB_TODDR_A>,
-                                <&clkc_audio AUD_RESET_TODDR_A>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <8192>;
-                       status = "disabled";
-               };
-
-               toddr_b: audio-controller@140 {
-                       compatible = "amlogic,sm1-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x140 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_B";
-                       interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
-                       resets = <&arb AXG_ARB_TODDR_B>,
-                                <&clkc_audio AUD_RESET_TODDR_B>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               toddr_c: audio-controller@180 {
-                       compatible = "amlogic,sm1-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x180 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_C";
-                       interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
-                       resets = <&arb AXG_ARB_TODDR_C>,
-                                <&clkc_audio AUD_RESET_TODDR_C>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               frddr_a: audio-controller@1c0 {
-                       compatible = "amlogic,sm1-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x1c0 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_A";
-                       interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
-                       resets = <&arb AXG_ARB_FRDDR_A>,
-                                <&clkc_audio AUD_RESET_FRDDR_A>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <512>;
-                       status = "disabled";
-               };
-
-               frddr_b: audio-controller@200 {
-                       compatible = "amlogic,sm1-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x200 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_B";
-                       interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
-                       resets = <&arb AXG_ARB_FRDDR_B>,
-                                <&clkc_audio AUD_RESET_FRDDR_B>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               frddr_c: audio-controller@240 {
-                       compatible = "amlogic,sm1-frddr",
-                                    "amlogic,axg-frddr";
-                       reg = <0x0 0x240 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_C";
-                       interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
-                       resets = <&arb AXG_ARB_FRDDR_C>,
-                                <&clkc_audio AUD_RESET_FRDDR_C>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               arb: reset-controller@280 {
-                       status = "disabled";
-                       compatible = "amlogic,meson-sm1-audio-arb";
-                       reg = <0x0 0x280 0x0 0x4>;
-                       #reset-cells = <1>;
-                       clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
-               };
-
-               tdmin_a: audio-controller@300 {
-                       compatible = "amlogic,sm1-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x300 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_A";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_A>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_b: audio-controller@340 {
-                       compatible = "amlogic,sm1-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x340 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_B";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_B>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_c: audio-controller@380 {
-                       compatible = "amlogic,sm1-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x380 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_C";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_C>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmin_lb: audio-controller@3c0 {
-                       compatible = "amlogic,sm1-tdmin",
-                                    "amlogic,axg-tdmin";
-                       reg = <0x0 0x3c0 0x0 0x40>;
-                       sound-name-prefix = "TDMIN_LB";
-                       resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               spdifin: audio-controller@400 {
-                       compatible = "amlogic,g12a-spdifin",
-                                    "amlogic,axg-spdifin";
-                       reg = <0x0 0x400 0x0 0x30>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "SPDIFIN";
-                       interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
-                       <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
-                       clock-names = "pclk", "refclk";
-                       resets = <&clkc_audio AUD_RESET_SPDIFIN>;
-                       status = "disabled";
-               };
-
-               spdifout_a: audio-controller@480 {
-                       compatible = "amlogic,g12a-spdifout",
-                                    "amlogic,axg-spdifout";
-                       reg = <0x0 0x480 0x0 0x50>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "SPDIFOUT_A";
-                       clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
-                       <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
-                       clock-names = "pclk", "mclk";
-                       resets = <&clkc_audio AUD_RESET_SPDIFOUT>;
-                       status = "disabled";
-               };
-
-               tdmout_a: audio-controller@500 {
-                       compatible = "amlogic,sm1-tdmout";
-                       reg = <0x0 0x500 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_A";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmout_b: audio-controller@540 {
-                       compatible = "amlogic,sm1-tdmout";
-                       reg = <0x0 0x540 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_B";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               tdmout_c: audio-controller@580 {
-                       compatible = "amlogic,sm1-tdmout";
-                       reg = <0x0 0x580 0x0 0x40>;
-                       sound-name-prefix = "TDMOUT_C";
-                       resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
-                       clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
-                                <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
-                       clock-names = "pclk", "sclk", "sclk_sel",
-                                     "lrclk", "lrclk_sel";
-                       status = "disabled";
-               };
-
-               toacodec: audio-controller@740 {
-                       compatible = "amlogic,sm1-toacodec",
-                                    "amlogic,g12a-toacodec";
-                       reg = <0x0 0x740 0x0 0x4>;
-                       #sound-dai-cells = <1>;
-                       sound-name-prefix = "TOACODEC";
-                       resets = <&clkc_audio AUD_RESET_TOACODEC>;
-                       status = "disabled";
-               };
-
-               tohdmitx: audio-controller@744 {
-                       compatible = "amlogic,sm1-tohdmitx",
-                                    "amlogic,g12a-tohdmitx";
-                       reg = <0x0 0x744 0x0 0x4>;
-                       #sound-dai-cells = <1>;
-                       sound-name-prefix = "TOHDMITX";
-                       resets = <&clkc_audio AUD_RESET_TOHDMITX>;
-                       status = "disabled";
-               };
-
-               toddr_d: audio-controller@840 {
-                       compatible = "amlogic,sm1-toddr",
-                                    "amlogic,axg-toddr";
-                       reg = <0x0 0x840 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "TODDR_D";
-                       interrupts = <GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_TODDR_D>;
-                       resets = <&arb AXG_ARB_TODDR_D>,
-                                <&clkc_audio AUD_RESET_TODDR_D>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-
-               frddr_d: audio-controller@880 {
-                        compatible = "amlogic,sm1-frddr",
-                                     "amlogic,axg-frddr";
-                       reg = <0x0 0x880 0x0 0x2c>;
-                       #sound-dai-cells = <0>;
-                       sound-name-prefix = "FRDDR_D";
-                       interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&clkc_audio AUD_CLKID_FRDDR_D>;
-                       resets = <&arb AXG_ARB_FRDDR_D>,
-                                <&clkc_audio AUD_RESET_FRDDR_D>;
-                       reset-names = "arb", "rst";
-                       amlogic,fifo-depth = <256>;
-                       status = "disabled";
-               };
-       };
-
-       pdm: audio-controller@61000 {
-               compatible = "amlogic,sm1-pdm",
-                            "amlogic,axg-pdm";
-               reg = <0x0 0x61000 0x0 0x34>;
-               #sound-dai-cells = <0>;
-               sound-name-prefix = "PDM";
-               clocks = <&clkc_audio AUD_CLKID_PDM>,
-                        <&clkc_audio AUD_CLKID_PDM_DCLK>,
-                        <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
-               clock-names = "pclk", "dclk", "sysclk";
-               resets = <&clkc_audio AUD_RESET_PDM>;
-               status = "disabled";
-       };
-};
-
-&cecb_AO {
-       compatible = "amlogic,meson-sm1-ao-cec";
-};
-
-&clk_msr {
-       compatible = "amlogic,meson-sm1-clk-measure";
-};
-
-
-&clkc {
-       compatible = "amlogic,sm1-clkc";
-};
-
-&cpu_thermal {
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-
-               map1 {
-                       trip = <&cpu_hot>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                       <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
-&ethmac {
-       power-domains = <&pwrc PWRC_SM1_ETH_ID>;
-};
-
-&gpio_intc {
-       compatible = "amlogic,meson-sm1-gpio-intc",
-                    "amlogic,meson-gpio-intc";
-};
-
-&pcie {
-       power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
-};
-
-&pmu {
-       compatible = "amlogic,sm1-ddr-pmu";
-};
-
-&pwrc {
-       compatible = "amlogic,meson-sm1-pwrc";
-};
-
-&simplefb_cvbs {
-       power-domains = <&pwrc PWRC_SM1_VPU_ID>;
-};
-
-&simplefb_hdmi {
-       power-domains = <&pwrc PWRC_SM1_VPU_ID>;
-};
-
-&vdec {
-       compatible = "amlogic,sm1-vdec";
-};
-
-&vpu {
-       power-domains = <&pwrc PWRC_SM1_VPU_ID>;
-};
-
-&usb {
-       power-domains = <&pwrc PWRC_SM1_USB_ID>;
-};
diff --git a/include/dt-bindings/gpio/meson-g12a-gpio.h b/include/dt-bindings/gpio/meson-g12a-gpio.h
deleted file mode 100644 (file)
index f7bd693..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
-/*
- * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
- * Author: Xingyu Chen <xingyu.chen@amlogic.com>
- */
-
-#ifndef _DT_BINDINGS_MESON_G12A_GPIO_H
-#define _DT_BINDINGS_MESON_G12A_GPIO_H
-
-/* First GPIO chip */
-#define GPIOAO_0       0
-#define GPIOAO_1       1
-#define GPIOAO_2       2
-#define GPIOAO_3       3
-#define GPIOAO_4       4
-#define GPIOAO_5       5
-#define GPIOAO_6       6
-#define GPIOAO_7       7
-#define GPIOAO_8       8
-#define GPIOAO_9       9
-#define GPIOAO_10      10
-#define GPIOAO_11      11
-#define GPIOE_0                12
-#define GPIOE_1                13
-#define GPIOE_2                14
-
-/* Second GPIO chip */
-#define GPIOZ_0                0
-#define GPIOZ_1                1
-#define GPIOZ_2                2
-#define GPIOZ_3                3
-#define GPIOZ_4                4
-#define GPIOZ_5                5
-#define GPIOZ_6                6
-#define GPIOZ_7                7
-#define GPIOZ_8                8
-#define GPIOZ_9                9
-#define GPIOZ_10       10
-#define GPIOZ_11       11
-#define GPIOZ_12       12
-#define GPIOZ_13       13
-#define GPIOZ_14       14
-#define GPIOZ_15       15
-#define GPIOH_0                16
-#define GPIOH_1                17
-#define GPIOH_2                18
-#define GPIOH_3                19
-#define GPIOH_4                20
-#define GPIOH_5                21
-#define GPIOH_6                22
-#define GPIOH_7                23
-#define GPIOH_8                24
-#define BOOT_0         25
-#define BOOT_1         26
-#define BOOT_2         27
-#define BOOT_3         28
-#define BOOT_4         29
-#define BOOT_5         30
-#define BOOT_6         31
-#define BOOT_7         32
-#define BOOT_8         33
-#define BOOT_9         34
-#define BOOT_10                35
-#define BOOT_11                36
-#define BOOT_12                37
-#define BOOT_13                38
-#define BOOT_14                39
-#define BOOT_15                40
-#define GPIOC_0                41
-#define GPIOC_1                42
-#define GPIOC_2                43
-#define GPIOC_3                44
-#define GPIOC_4                45
-#define GPIOC_5                46
-#define GPIOC_6                47
-#define GPIOC_7                48
-#define GPIOA_0                49
-#define GPIOA_1                50
-#define GPIOA_2                51
-#define GPIOA_3                52
-#define GPIOA_4                53
-#define GPIOA_5                54
-#define GPIOA_6                55
-#define GPIOA_7                56
-#define GPIOA_8                57
-#define GPIOA_9                58
-#define GPIOA_10       59
-#define GPIOA_11       60
-#define GPIOA_12       61
-#define GPIOA_13       62
-#define GPIOA_14       63
-#define GPIOA_15       64
-#define GPIOX_0                65
-#define GPIOX_1                66
-#define GPIOX_2                67
-#define GPIOX_3                68
-#define GPIOX_4                69
-#define GPIOX_5                70
-#define GPIOX_6                71
-#define GPIOX_7                72
-#define GPIOX_8                73
-#define GPIOX_9                74
-#define GPIOX_10       75
-#define GPIOX_11       76
-#define GPIOX_12       77
-#define GPIOX_13       78
-#define GPIOX_14       79
-#define GPIOX_15       80
-#define GPIOX_16       81
-#define GPIOX_17       82
-#define GPIOX_18       83
-#define GPIOX_19       84
-
-#endif /* _DT_BINDINGS_MESON_G12A_GPIO_H */
diff --git a/include/dt-bindings/power/meson-g12a-power.h b/include/dt-bindings/power/meson-g12a-power.h
deleted file mode 100644 (file)
index bb5e67a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#ifndef _DT_BINDINGS_MESON_G12A_POWER_H
-#define _DT_BINDINGS_MESON_G12A_POWER_H
-
-#define PWRC_G12A_VPU_ID               0
-#define PWRC_G12A_ETH_ID               1
-
-#endif
diff --git a/include/dt-bindings/power/meson-sm1-power.h b/include/dt-bindings/power/meson-sm1-power.h
deleted file mode 100644 (file)
index a020ab0..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
-/*
- * Copyright (c) 2019 BayLibre, SAS
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#ifndef _DT_BINDINGS_MESON_SM1_POWER_H
-#define _DT_BINDINGS_MESON_SM1_POWER_H
-
-#define PWRC_SM1_VPU_ID                0
-#define PWRC_SM1_NNA_ID                1
-#define PWRC_SM1_USB_ID                2
-#define PWRC_SM1_PCIE_ID       3
-#define PWRC_SM1_GE2D_ID       4
-#define PWRC_SM1_AUDIO_ID      5
-#define PWRC_SM1_ETH_ID                6
-
-#endif
diff --git a/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h b/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h
deleted file mode 100644 (file)
index 1ef8078..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR MIT)
- *
- * Copyright (c) 2018 Baylibre SAS.
- * Author: Jerome Brunet <jbrunet@baylibre.com>
- */
-
-#ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H
-#define _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H
-
-#define AXG_ARB_TODDR_A        0
-#define AXG_ARB_TODDR_B        1
-#define AXG_ARB_TODDR_C        2
-#define AXG_ARB_FRDDR_A        3
-#define AXG_ARB_FRDDR_B        4
-#define AXG_ARB_FRDDR_C        5
-#define AXG_ARB_TODDR_D        6
-#define AXG_ARB_FRDDR_D        7
-
-#endif /* _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H */
diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
deleted file mode 100644 (file)
index f805129..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2019 BayLibre, SAS.
- * Author: Jerome Brunet <jbrunet@baylibre.com>
- *
- */
-
-#ifndef _DT_BINDINGS_AMLOGIC_MESON_G12A_AUDIO_RESET_H
-#define _DT_BINDINGS_AMLOGIC_MESON_G12A_AUDIO_RESET_H
-
-#define AUD_RESET_PDM          0
-#define AUD_RESET_TDMIN_A      1
-#define AUD_RESET_TDMIN_B      2
-#define AUD_RESET_TDMIN_C      3
-#define AUD_RESET_TDMIN_LB     4
-#define AUD_RESET_LOOPBACK     5
-#define AUD_RESET_TODDR_A      6
-#define AUD_RESET_TODDR_B      7
-#define AUD_RESET_TODDR_C      8
-#define AUD_RESET_FRDDR_A      9
-#define AUD_RESET_FRDDR_B      10
-#define AUD_RESET_FRDDR_C      11
-#define AUD_RESET_TDMOUT_A     12
-#define AUD_RESET_TDMOUT_B     13
-#define AUD_RESET_TDMOUT_C     14
-#define AUD_RESET_SPDIFOUT     15
-#define AUD_RESET_SPDIFOUT_B   16
-#define AUD_RESET_SPDIFIN      17
-#define AUD_RESET_EQDRC                18
-#define AUD_RESET_RESAMPLE     19
-#define AUD_RESET_DDRARB       20
-#define AUD_RESET_POWDET       21
-#define AUD_RESET_TORAM                22
-#define AUD_RESET_TOACODEC     23
-#define AUD_RESET_TOHDMITX     24
-#define AUD_RESET_CLKTREE      25
-
-/* SM1 added resets */
-#define AUD_RESET_RESAMPLE_B   26
-#define AUD_RESET_TOVAD                27
-#define AUD_RESET_LOCKER       28
-#define AUD_RESET_SPDIFIN_LB   29
-#define AUD_RESET_FRATV                30
-#define AUD_RESET_FRHDMIRX     31
-#define AUD_RESET_FRDDR_D      32
-#define AUD_RESET_TODDR_D      33
-#define AUD_RESET_LOOPBACK_B   34
-#define AUD_RESET_EARCTX       35
-#define AUD_RESET_EARCRX       36
-#define AUD_RESET_FRDDR_E      37
-#define AUD_RESET_TODDR_E      38
-
-#endif
diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
deleted file mode 100644 (file)
index 6d487c5..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
-/*
- * Copyright (c) 2019 BayLibre, SAS.
- * Author: Jerome Brunet <jbrunet@baylibre.com>
- *
- */
-
-#ifndef _DT_BINDINGS_AMLOGIC_MESON_G12A_RESET_H
-#define _DT_BINDINGS_AMLOGIC_MESON_G12A_RESET_H
-
-/*     RESET0                                  */
-#define RESET_HIU                      0
-/*                                     1       */
-#define RESET_DOS                      2
-/*                                     3-4     */
-#define RESET_VIU                      5
-#define RESET_AFIFO                    6
-#define RESET_VID_PLL_DIV              7
-/*                                     8-9     */
-#define RESET_VENC                     10
-#define RESET_ASSIST                   11
-#define RESET_PCIE_CTRL_A              12
-#define RESET_VCBUS                    13
-#define RESET_PCIE_PHY                 14
-#define RESET_PCIE_APB                 15
-#define RESET_GIC                      16
-#define RESET_CAPB3_DECODE             17
-/*                                     18      */
-#define RESET_HDMITX_CAPB3             19
-#define RESET_DVALIN_CAPB3             20
-#define RESET_DOS_CAPB3                        21
-/*                                     22      */
-#define RESET_CBUS_CAPB3               23
-#define RESET_AHB_CNTL                 24
-#define RESET_AHB_DATA                 25
-#define RESET_VCBUS_CLK81              26
-/*                                     27-31   */
-/*     RESET1                                  */
-/*                                     32      */
-#define RESET_DEMUX                    33
-#define RESET_USB                      34
-#define RESET_DDR                      35
-/*                                     36      */
-#define RESET_BT656                    37
-#define RESET_AHB_SRAM                 38
-/*                                     39      */
-#define RESET_PARSER                   40
-/*                                     41      */
-#define RESET_ISA                      42
-#define RESET_ETHERNET                 43
-#define RESET_SD_EMMC_A                        44
-#define RESET_SD_EMMC_B                        45
-#define RESET_SD_EMMC_C                        46
-/*                                     47      */
-#define RESET_USB_PHY20                        48
-#define RESET_USB_PHY21                        49
-/*                                     50-60   */
-#define RESET_AUDIO_CODEC              61
-/*                                     62-63   */
-/*     RESET2                                  */
-/*                                     64      */
-#define RESET_AUDIO                    65
-#define RESET_HDMITX_PHY               66
-/*                                     67      */
-#define RESET_MIPI_DSI_HOST            68
-#define RESET_ALOCKER                  69
-#define RESET_GE2D                     70
-#define RESET_PARSER_REG               71
-#define RESET_PARSER_FETCH             72
-#define RESET_CTL                      73
-#define RESET_PARSER_TOP               74
-/*                                     75-77   */
-#define RESET_DVALIN                   78
-#define RESET_HDMITX                   79
-/*                                     80-95   */
-/*     RESET3                                  */
-/*                                     96-95   */
-#define RESET_DEMUX_TOP                        105
-#define RESET_DEMUX_DES_PL             106
-#define RESET_DEMUX_S2P_0              107
-#define RESET_DEMUX_S2P_1              108
-#define RESET_DEMUX_0                  109
-#define RESET_DEMUX_1                  110
-#define RESET_DEMUX_2                  111
-/*                                     112-127 */
-/*     RESET4                                  */
-/*                                     128-129 */
-#define RESET_MIPI_DSI_PHY             130
-/*                                     131-132 */
-#define RESET_RDMA                     133
-#define RESET_VENCI                    134
-#define RESET_VENCP                    135
-/*                                     136     */
-#define RESET_VDAC                     137
-/*                                     138-139 */
-#define RESET_VDI6                     140
-#define RESET_VENCL                    141
-#define RESET_I2C_M1                   142
-#define RESET_I2C_M2                   143
-/*                                     144-159 */
-/*     RESET5                                  */
-/*                                     160-191 */
-/*     RESET6                                  */
-#define RESET_GEN                      192
-#define RESET_SPICC0                   193
-#define RESET_SC                       194
-#define RESET_SANA_3                   195
-#define RESET_I2C_M0                   196
-#define RESET_TS_PLL                   197
-#define RESET_SPICC1                   198
-#define RESET_STREAM                   199
-#define RESET_TS_CPU                   200
-#define RESET_UART0                    201
-#define RESET_UART1_2                  202
-#define RESET_ASYNC0                   203
-#define RESET_ASYNC1                   204
-#define RESET_SPIFC0                   205
-#define RESET_I2C_M3                   206
-/*                                     207-223 */
-/*     RESET7                                  */
-#define RESET_USB_DDR_0                        224
-#define RESET_USB_DDR_1                        225
-#define RESET_USB_DDR_2                        226
-#define RESET_USB_DDR_3                        227
-#define RESET_TS_GPU                   228
-#define RESET_DEVICE_MMC_ARB           229
-#define RESET_DVALIN_DMC_PIPL          230
-#define RESET_VID_LOCK                 231
-#define RESET_NIC_DMC_PIPL             232
-#define RESET_DMC_VPU_PIPL             233
-#define RESET_GE2D_DMC_PIPL            234
-#define RESET_HCODEC_DMC_PIPL          235
-#define RESET_WAVE420_DMC_PIPL         236
-#define RESET_HEVCF_DMC_PIPL           237
-/*                                     238-255 */
-
-#endif
diff --git a/include/dt-bindings/sound/meson-g12a-toacodec.h b/include/dt-bindings/sound/meson-g12a-toacodec.h
deleted file mode 100644 (file)
index 69d7a75..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __DT_MESON_G12A_TOACODEC_H
-#define __DT_MESON_G12A_TOACODEC_H
-
-#define TOACODEC_IN_A  0
-#define TOACODEC_IN_B  1
-#define TOACODEC_IN_C  2
-#define TOACODEC_OUT   3
-
-#endif /* __DT_MESON_G12A_TOACODEC_H */
diff --git a/include/dt-bindings/sound/meson-g12a-tohdmitx.h b/include/dt-bindings/sound/meson-g12a-tohdmitx.h
deleted file mode 100644 (file)
index c5e1f48..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __DT_MESON_G12A_TOHDMITX_H
-#define __DT_MESON_G12A_TOHDMITX_H
-
-#define TOHDMITX_I2S_IN_A      0
-#define TOHDMITX_I2S_IN_B      1
-#define TOHDMITX_I2S_IN_C      2
-#define TOHDMITX_I2S_OUT       3
-#define TOHDMITX_SPDIF_IN_A    4
-#define TOHDMITX_SPDIF_IN_B    5
-#define TOHDMITX_SPDIF_OUT     6
-
-#endif /* __DT_MESON_G12A_TOHDMITX_H */