Resending from an email account that doesn’t get rejected by all the lists. Apologies if you did get this twice: > On 3 Mar 2023, at 9:37 pm, Neil Armstrong <neil.armstrong@xxxxxxxxxx> wrote: > > Add support for both the BananaPi BPI-CM4 module and the BananaPi > baseboard which is comnpatible with the RaspberryPi CM4IO baseboard. > > The BananaPi BPI-CM4 module follows the CM4 specifications at [1], > but with a single HDMI port and a since DSI output. > > The current CM4IO baseboard DT should work fine on the Raspberry CM4 > baseboard and other derivatives baseboards, but proper DT should > be written for other baseboards. > > The split is done so it's easy to describe a new CM4 baseboard, enabling > only the necessary HW used on the baseboard. > > [1] https://datasheets.raspberrypi.com/cm4io/cm4io-datasheet.pdf > > Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx> > --- > arch/arm64/boot/dts/amlogic/Makefile | 1 + > .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 +++++++++ > .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 +++++++++++++++++++++ > 3 files changed, 554 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile > index ccf1ba57fa87..e626c4b82b29 100644 > --- a/arch/arm64/boot/dts/amlogic/Makefile > +++ b/arch/arm64/boot/dts/amlogic/Makefile > @@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb > +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb ^ Please add before meson-g12b-gsking-x.dtb to keep the list sorted > dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts > new file mode 100644 > index 000000000000..2c4a5b3f1b20 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts > @@ -0,0 +1,165 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2023 Neil Armstrong <neil.armstrong@xxxxxxxxxx> > + */ > + > +/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 = ðmac; > + 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 0", > + "TDMOUT_B IN 1", "FRDDR_B OUT 0", > + "TDMOUT_B IN 2", "FRDDR_C OUT 0", ^ Should be “FRDDR_A OUT 1” and same for FRDDR_B/C else dmesg is spammed with: Mar 04 08:12:24 LibreELEC kernel: fe.dai-link-0: ASoC: no backend DAIs enabled for fe.dai-link-0 Mar 04 08:12:24 LibreELEC kernel: fe.dai-link-0: ASoC: error at dpcm_fe_dai_prepare on fe.dai-link-0: -22 Mar 04 08:12:24 LibreELEC kernel: fe.dai-link-0: ASoC: no backend DAIs enabled for fe.dai-link-0 Mar 04 08:12:24 LibreELEC kernel: fe.dai-link-0: ASoC: error at dpcm_fe_dai_prepare on fe.dai-link-0: -22 > + "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"; > +}; > + > +ðmac { > + 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/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi > new file mode 100644 > index 000000000000..dc0988c82694 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi > @@ -0,0 +1,388 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2023 Neil Armstrong <neil.armstrong@xxxxxxxxxx> > + */ > + > +#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 */ > +ðmac { > + pinctrl-0 = <ð_pins>, <ð_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"; > +}; With the audio correction all appears to be good, here’s dmesg: http://ix.io/4pTy Tested-by: Christian Hewitt <christianshewitt@xxxxxxxxx> Christian
