| Message ID | 20211130060523.19161-1-christianshewitt@gmail.com |
|---|---|
| Headers | show |
| Series | arm64: dts: meson: add support for aac2xx devices | expand |
Hi, On 30/11/2021 07:05, Christian Hewitt wrote: > This series adds support for several popular Amlogic S905X3 (SM1) Android > Set-Top Box devices. Like most Android box devices, they ship in variants > with multiple RAM, eMMC, WiFi and BT configurations. RAM and eMMC are not > something we need to consider to get a working boot, but we do need to get > the correct connectivity spec. Broadly speaking we see boxes with Higher > and Lower spec connectivity; High spec is Gigabit Ethernet and Faster dual > antennna WiFi, and Lower spec is Megabit Ethernet and a single antenna. In > some low-end boxes BT is ommitted. > > The main reason for the RFC tag is to solicit feedback on the choice of > the -100 and -1000 suffixes which are used to distinguish between devices > with 10/100 Mbit (Internal PHY) or 10/100/1000 Gbit (External PHY) NIC > configurations; which is important to get correct else the box will have > no connectivity. I'm not a big fan of the suffixes, but earlier versions > where I used -int/-ext and -mbit/-gbit resulted in users having no idea > what the difference was. I'd like to informally establish a convention for > this naming before doing similar things with some S905X2 devices. I have no opinion for -100/-1000, -int/-ext, -mbit/-gbit or <nothing>/-gigabit or whatever. I'll wait for further comments from other reviewers here ! Neil > > NB: At the current time the Realtek 8822CS and MT7668 WiFi/BT chips we > have seen on 'AIR' devices are not supported in the kernel so these are > deliberately ommitted. The H96-Max uses a conventional Broadcom module > so has more complete support. I'm also still exploring / learning about > alsa userspace configuration so for now the boxes have simple HDMI audio > support; wiring up the Headphone socket will be done at a later date. > > Christian Hewitt (9): > arm64: dts: meson: add common SM1 ac2xx dtsi > dt-bindings: arm: amlogic: add X96-AIR bindings > arm64: dts: meson: add initial device-trees for X96-AIR > dt-bindings: vendor-prefixes: add cyx prefix > dt-bindings: arm: amlogic: add A95XF3-AIR bindings > arm64: dts: meson: add initial device-trees for A95XF3-AIR > dt-bindings: vendor-prefixes: add haochuangyi prefix > dt-bindings: arm: amlogic: add H96-Max bindings > arm64: dts: meson: add initial device-tree for H96-Max > > .../devicetree/bindings/arm/amlogic.yaml | 5 + > .../devicetree/bindings/vendor-prefixes.yaml | 4 + > arch/arm64/boot/dts/amlogic/Makefile | 5 + > .../dts/amlogic/meson-sm1-a95xf3-air-100.dts | 108 +++++++ > .../dts/amlogic/meson-sm1-a95xf3-air-1000.dts | 129 ++++++++ > .../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 300 ++++++++++++++++++ > .../boot/dts/amlogic/meson-sm1-h96-max.dts | 145 +++++++++ > .../dts/amlogic/meson-sm1-x96-air-100.dts | 112 +++++++ > .../dts/amlogic/meson-sm1-x96-air-1000.dts | 133 ++++++++ > 9 files changed, 941 insertions(+) > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-1000.dts >
Christian Hewitt <christianshewitt@gmail.com> writes: > This series adds support for several popular Amlogic S905X3 (SM1) Android > Set-Top Box devices. Like most Android box devices, they ship in variants > with multiple RAM, eMMC, WiFi and BT configurations. RAM and eMMC are not > something we need to consider to get a working boot, but we do need to get > the correct connectivity spec. The reason we don't need to care about RAM differences is because u-boot takes care of that, and updates the DT nodes accordingly. In general, I'm not a fan of leaving these decisions up to u-boot, but... as an option... I'm pondering if we should do the same for the connectivity settings? A properly configured u-boot already knows if it's an internal/external PHY, Mbit vs Gbit etc. so in a similar way could enable/disable the right nodes. We could have a single DTS for each of these board families which has some reasonable defaults, then u-boot would enable/disable nodes accordingly. Kevin
On Tue, Nov 30, 2021 at 7:06 AM Christian Hewitt <christianshewitt@gmail.com> wrote: > > Add a common dtsi for Android STB devices based on the Amlogic S905X3 > (AC213/AC214) and S905D3 (AC201/AC202) reference designs. The dtsi is > loosely based on the existing SEI610 device-tree. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> # X96-Air with Gbit/s PHY
On Tue, Nov 30, 2021 at 7:07 AM Christian Hewitt <christianshewitt@gmail.com> wrote: > > The Amediatek X96-AIR is based on Amlogic S905X3 reference board > designs and ships in multiple configurations: > > – 4GB DDR3 + 64GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet > – 4GB DDR3 + 32GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet > – 4GB DDR3 + 32GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet > – 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet > ... > - HDMI 2.1 video > - S/PDIF optical output > - AV output > - 2x USB 2.0 inc. OTG port > - 1x USB 3.0 port > - IR receiver > - 1x micro SD card slot (internal) > - 1x Reset/Update button (in AV jack) > - 7-segment VFD > > The device-tree with -100 suffix supports models with 10/100 Ethernet > and with -1000 suffix supports models with Gigabit Ethernet. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> # X96-Air with Gbit/s PHY
> Wiadomość napisana przez Christian Hewitt <christianshewitt@gmail.com> w dniu 30.11.2021, o godz. 07:05: > > > – 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet Tested-by: Piotr Oniszczuk <piotr.oniszczuk@gmail.com> # X96-Air with 10/100 Eth
On 06/12/2021 19:06, Kevin Hilman wrote: > Christian Hewitt <christianshewitt@gmail.com> writes: > >> This series adds support for several popular Amlogic S905X3 (SM1) Android >> Set-Top Box devices. Like most Android box devices, they ship in variants >> with multiple RAM, eMMC, WiFi and BT configurations. RAM and eMMC are not >> something we need to consider to get a working boot, but we do need to get >> the correct connectivity spec. > > The reason we don't need to care about RAM differences is because u-boot > takes care of that, and updates the DT nodes accordingly. > > In general, I'm not a fan of leaving these decisions up to u-boot, > but... as an option... For now we always set "safe" values for RAM in DT so it could work even if not the entire memory is configured. Since there is no way to detect this from Linux on ARM64, we have no choice but hoping U-boot sets the right value... > > I'm pondering if we should do the same for the connectivity settings? A > properly configured u-boot already knows if it's an internal/external > PHY, Mbit vs Gbit etc. so in a similar way could enable/disable the > right nodes. > > We could have a single DTS for each of these board families which > has some reasonable defaults, then u-boot would enable/disable nodes > accordingly. Yes it's technically possible, but it puts a larger dependency on the bootloader. Having a lower RAM value is not idea but the system will work, having the wrong PHY setup simply doesn't work. Neil > > Kevin > >
Hi, On 30/11/2021 07:05, Christian Hewitt wrote: > The CYX A95XF3-AIR is based on Amlogic S905X3 reference board > designs and ships in multiple configurations: > > – 4GB DDR3 + 64GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet > – 4GB DDR3 + 32GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet > – 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet > ... > - HDMI 2.1 video > - S/PDIF optical output > - AV output > - 1x USB 2.0 OTG port > - 1x USB 3.0 port > - IR receiver > - 1x micro SD card slot (internal) > - 1x Reset/Update button (in AV jack) > - 7-segment VFD > - Multicolour case LED 'arc' > > The device-tree with -100 suffix supports models with 10/100 Ethernet > and with -1000 suffix supports models with Gigabit Ethernet. I thought about this, and I think we should have: - meson-sm1-a95xf3-air.dts for 10/100 version - meson-sm1-a95xf3-air-gbit.dts for gigabit 10/100/1000 version With this, I'm ok to apply the serie. Neil > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > arch/arm64/boot/dts/amlogic/Makefile | 2 + > .../dts/amlogic/meson-sm1-a95xf3-air-100.dts | 108 +++++++++++++++ > .../dts/amlogic/meson-sm1-a95xf3-air-1000.dts | 129 ++++++++++++++++++ > 3 files changed, 239 insertions(+) > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts > > diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile > index a0c1a7fbae57..e198d17f2ea8 100644 > --- a/arch/arm64/boot/dts/amlogic/Makefile > +++ b/arch/arm64/boot/dts/amlogic/Makefile > @@ -51,6 +51,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb > +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-100.dtb > +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-1000.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb > diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts > new file mode 100644 > index 000000000000..5158cc40485e > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts > @@ -0,0 +1,108 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2019 BayLibre SAS. All rights reserved. > + * Copyright (c) 2020 Christian Hewitt <christianshewitt@gmail.com> > + */ > + > +/dts-v1/; > + > +#include "meson-sm1-ac2xx.dtsi" > +#include <dt-bindings/sound/meson-g12a-tohdmitx.h> > + > +/ { > + compatible = "cyx,a95xf3-air-100", "amlogic,sm1"; > + model = "Shenzhen CYX Industrial Co., Ltd A95XF3-AIR"; > + > + sound { > + compatible = "amlogic,axg-sound-card"; > + model = "A95XF3-AIR"; > + 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"; > +}; > + > +ðmac { > + status = "okay"; > + phy-handle = <&internal_ephy>; > + phy-mode = "rmii"; > +}; > + > +&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/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts > new file mode 100644 > index 000000000000..c87d948fa3e6 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts > @@ -0,0 +1,129 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2019 BayLibre SAS. All rights reserved. > + * Copyright (c) 2020 Christian Hewitt <christianshewitt@gmail.com> > + */ > + > +/dts-v1/; > + > +#include "meson-sm1-ac2xx.dtsi" > +#include <dt-bindings/sound/meson-g12a-tohdmitx.h> > + > +/ { > + compatible = "cyx,a95xf3-air-1000", "amlogic,sm1"; > + model = "Shenzhen CYX Industrial Co., Ltd A95XF3-AIR"; > + > + sound { > + compatible = "amlogic,axg-sound-card"; > + model = "A95XF3-AIR"; > + 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"; > +}; > + > +ðmac { > + status = "okay"; > + > + pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; > + pinctrl-names = "default"; > + phy-mode = "rgmii-txid"; > + phy-handle = <&external_phy>; > + > + rx-internal-delay-ps = <800>; > +}; > + > +&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"; > +}; > + > +&tdmif_b { > + status = "okay"; > +}; > + > +&tdmout_b { > + status = "okay"; > +}; > + > +&tohdmitx { > + status = "okay"; > +}; >
> On 3 Jan 2022, at 7:21 pm, Neil Armstrong <narmstrong@baylibre.com> wrote: > > Hi, > > On 30/11/2021 07:05, Christian Hewitt wrote: >> The CYX A95XF3-AIR is based on Amlogic S905X3 reference board >> designs and ships in multiple configurations: >> >> – 4GB DDR3 + 64GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet >> – 4GB DDR3 + 32GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet >> – 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet >> ... >> - HDMI 2.1 video >> - S/PDIF optical output >> - AV output >> - 1x USB 2.0 OTG port >> - 1x USB 3.0 port >> - IR receiver >> - 1x micro SD card slot (internal) >> - 1x Reset/Update button (in AV jack) >> - 7-segment VFD >> - Multicolour case LED 'arc' >> >> The device-tree with -100 suffix supports models with 10/100 Ethernet >> and with -1000 suffix supports models with Gigabit Ethernet. > > I thought about this, and I think we should have: > - meson-sm1-a95xf3-air.dts for 10/100 version > - meson-sm1-a95xf3-air-gbit.dts for gigabit 10/100/1000 version > > With this, I'm ok to apply the serie. > > Neil That’s fine with me, thanks for the review. I’ll rework the patches and send a v2 series to the list. Christian