* [PATCH v2 0/2] arm64: dts: meson: add support for Beelink GS-King-X @ 2020-12-30 10:37 Christian Hewitt 2020-12-30 10:37 ` [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the " Christian Hewitt 2020-12-30 10:37 ` [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree Christian Hewitt 0 siblings, 2 replies; 7+ messages in thread From: Christian Hewitt @ 2020-12-30 10:37 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel Cc: Christian Hewitt This series adds bindings and device-tree for the Beelink (AZW) GS-King-X, which like GT-King and GT-King Pro is based on the W400 reference design. Changes since v1: - move audio from TDM_B to TDM_A - drop S/PDIF content - add Rob's bindings ack Christian Hewitt (2): dt-bindings: arm: amlogic: add support for the Beelink GS-King-X arm64: dts: meson: add initial Beelink GS-King-X device-tree .../devicetree/bindings/arm/amlogic.yaml | 1 + arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-g12b-gsking-x.dts | 133 ++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the Beelink GS-King-X 2020-12-30 10:37 [PATCH v2 0/2] arm64: dts: meson: add support for Beelink GS-King-X Christian Hewitt @ 2020-12-30 10:37 ` Christian Hewitt 2020-12-31 0:20 ` Martin Blumenstingl 2020-12-30 10:37 ` [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree Christian Hewitt 1 sibling, 1 reply; 7+ messages in thread From: Christian Hewitt @ 2020-12-30 10:37 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel Cc: Christian Hewitt The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference board with an S922X-H chip. Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Acked-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index 3341788d1096..6bef60ddda64 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -151,6 +151,7 @@ properties: - description: Boards with the Amlogic Meson G12B S922X SoC items: - enum: + - azw,gsking-x - azw,gtking - azw,gtking-pro - hardkernel,odroid-n2 -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the Beelink GS-King-X 2020-12-30 10:37 ` [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the " Christian Hewitt @ 2020-12-31 0:20 ` Martin Blumenstingl 0 siblings, 0 replies; 7+ messages in thread From: Martin Blumenstingl @ 2020-12-31 0:20 UTC (permalink / raw) To: Christian Hewitt Cc: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel On Wed, Dec 30, 2020 at 11:38 AM Christian Hewitt <christianshewitt@gmail.com> wrote: > > The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference > board with an S922X-H chip. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree 2020-12-30 10:37 [PATCH v2 0/2] arm64: dts: meson: add support for Beelink GS-King-X Christian Hewitt 2020-12-30 10:37 ` [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the " Christian Hewitt @ 2020-12-30 10:37 ` Christian Hewitt 2020-12-31 0:23 ` Martin Blumenstingl 2020-12-31 11:05 ` Neil Armstrong 1 sibling, 2 replies; 7+ messages in thread From: Christian Hewitt @ 2020-12-30 10:37 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel Cc: Christian Hewitt The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference board with an S922X-H chip. - 4GB LPDDR4 RAM - 64GB eMMC storage - 10/100/1000 Base-T Ethernet - AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1) - HDMI 2.1 video - S/PDIF optical output - 2x ESS9018 audio DACs - 4x Ricor RT6862 audio amps - Analogue headphone output - 1x USB 2.0 OTG port - 3x USB 3.0 ports - IR receiver - 1x micro SD card slot (internal) - USB SATA controller with 2x 3.5" drive bays - 1x Power on/off button Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-g12b-gsking-x.dts | 133 ++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index ced03946314f..dce41cd3f347 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts new file mode 100644 index 000000000000..c9d9dcb0cd65 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts @@ -0,0 +1,133 @@ +// 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,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 = "G12B-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"; +}; -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree 2020-12-30 10:37 ` [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree Christian Hewitt @ 2020-12-31 0:23 ` Martin Blumenstingl 2020-12-31 2:47 ` Christian Hewitt 2020-12-31 11:05 ` Neil Armstrong 1 sibling, 1 reply; 7+ messages in thread From: Martin Blumenstingl @ 2020-12-31 0:23 UTC (permalink / raw) To: Christian Hewitt Cc: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel On Wed, Dec 30, 2020 at 11:38 AM Christian Hewitt <christianshewitt@gmail.com> wrote: > > The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference > board with an S922X-H chip. > > - 4GB LPDDR4 RAM > - 64GB eMMC storage > - 10/100/1000 Base-T Ethernet > - AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1) > - HDMI 2.1 video > - S/PDIF optical output are you planning to enable this also? > - 2x ESS9018 audio DACs > - 4x Ricor RT6862 audio amps > - Analogue headphone output there's no driver for that DAC so I think that's why you are not enabling them > - 1x USB 2.0 OTG port > - 3x USB 3.0 ports > - IR receiver > - 1x micro SD card slot (internal) > - USB SATA controller with 2x 3.5" drive bays > - 1x Power on/off button > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> I don't know/have this board but also I don't see anything problematic so: Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree 2020-12-31 0:23 ` Martin Blumenstingl @ 2020-12-31 2:47 ` Christian Hewitt 0 siblings, 0 replies; 7+ messages in thread From: Christian Hewitt @ 2020-12-31 2:47 UTC (permalink / raw) To: Martin Blumenstingl Cc: Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel > On 31 Dec 2020, at 4:23 am, Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > > On Wed, Dec 30, 2020 at 11:38 AM Christian Hewitt > <christianshewitt@gmail.com> wrote: >> >> The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference >> board with an S922X-H chip. >> >> - 4GB LPDDR4 RAM >> - 64GB eMMC storage >> - 10/100/1000 Base-T Ethernet >> - AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1) >> - HDMI 2.1 video >> - S/PDIF optical output > are you planning to enable this also? I plan to add this later (after v1 comments). >> - 2x ESS9018 audio DACs >> - 4x Ricor RT6862 audio amps >> - Analogue headphone output > there's no driver for that DAC so I think that's why you are not enabling them ESS9018 is used with some Raspberry Pi DAC boards so there may be some prior art to build upon. However it’s not clear (even with schematics) how the DAC and AMP are controlled (they look like dumb input/output devices) so this is still to be explored. >> - 1x USB 2.0 OTG port >> - 3x USB 3.0 ports >> - IR receiver >> - 1x micro SD card slot (internal) >> - USB SATA controller with 2x 3.5" drive bays >> - 1x Power on/off button >> >> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > I don't know/have this board but also I don't see anything problematic so: > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Thx! ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree 2020-12-30 10:37 ` [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree Christian Hewitt 2020-12-31 0:23 ` Martin Blumenstingl @ 2020-12-31 11:05 ` Neil Armstrong 1 sibling, 0 replies; 7+ messages in thread From: Neil Armstrong @ 2020-12-31 11:05 UTC (permalink / raw) To: Christian Hewitt, Rob Herring, Mark Rutland, Kevin Hilman, devicetree, linux-arm-kernel, linux-amlogic, linux-kernel On 30/12/2020 11:37, Christian Hewitt wrote: > The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference > board with an S922X-H chip. > > - 4GB LPDDR4 RAM > - 64GB eMMC storage > - 10/100/1000 Base-T Ethernet > - AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1) > - HDMI 2.1 video > - S/PDIF optical output > - 2x ESS9018 audio DACs > - 4x Ricor RT6862 audio amps > - Analogue headphone output > - 1x USB 2.0 OTG port > - 3x USB 3.0 ports > - IR receiver > - 1x micro SD card slot (internal) > - USB SATA controller with 2x 3.5" drive bays > - 1x Power on/off button > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > arch/arm64/boot/dts/amlogic/Makefile | 1 + > .../boot/dts/amlogic/meson-g12b-gsking-x.dts | 133 ++++++++++++++++++ > 2 files changed, 134 insertions(+) > create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts > > diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile > index ced03946314f..dce41cd3f347 100644 > --- a/arch/arm64/boot/dts/amlogic/Makefile > +++ b/arch/arm64/boot/dts/amlogic/Makefile > @@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb > +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb > dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts > new file mode 100644 > index 000000000000..c9d9dcb0cd65 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts > @@ -0,0 +1,133 @@ > +// 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,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 = "G12B-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"; > +}; > Tested-by: Neil Armstrong <narmstrong@baylibre.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-12-31 11:06 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-12-30 10:37 [PATCH v2 0/2] arm64: dts: meson: add support for Beelink GS-King-X Christian Hewitt 2020-12-30 10:37 ` [PATCH v2 1/2] dt-bindings: arm: amlogic: add support for the " Christian Hewitt 2020-12-31 0:20 ` Martin Blumenstingl 2020-12-30 10:37 ` [PATCH v2 2/2] arm64: dts: meson: add initial Beelink GS-King-X device-tree Christian Hewitt 2020-12-31 0:23 ` Martin Blumenstingl 2020-12-31 2:47 ` Christian Hewitt 2020-12-31 11:05 ` Neil Armstrong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox