From: Neil Armstrong <neil.armstrong@linaro.org>
To: Karl Chan <exkcmailist@yahoo.com>, linux-amlogic@lists.infradead.org
Subject: Re: [PATCH] ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3
Date: Wed, 31 May 2023 10:54:03 +0200 [thread overview]
Message-ID: <235c9482-c7f8-d4ae-096a-326e61788f59@linaro.org> (raw)
In-Reply-To: <a36dd7f2-52fc-4623-e503-a2aeeb04f6ac@yahoo.com>
Hi,
On 03/04/2023 09:47, Karl Chan wrote:
> The Xiaomi Mi Box 3 is a TV box based on the Amlogic S905X chipset.
> There are two variants:
> - 2 GiB/16GIB
> - 1 GiB/8GIB
>
> Both variants come with:
> - 802.11a/b/g/n/ac wifi (BCM4345)
> - HDMI , AV (CVBS) and spdif optical output
> - 1x USB (utilizing both USB ports provided by the SoC)
>
> The board seems to be very similar to the P212 reference
> boards, which is why it includes meson-gxl-s905x-p212.dtsi:
Drop the last ":"
> Signed-off-by: Karl Chan <exxxxkc@getgoogleoff.me>
> Tested-by: Karl Chan <exxxxkc@getgoogleoff.me>
You can drop this one, Signed-off-by means you tested it
> ---
> arch/arm64/boot/dts/amlogic/Makefile | 1 +
> .../amlogic/meson-gxl-s905x-xiaomi-once.dts | 142 ++++++++++++++++++
> 2 files changed, 143 insertions(+)
> create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
>
> diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
> index e213aeebb..904bb1e19 100644
> --- a/arch/arm64/boot/dts/amlogic/Makefile
> +++ b/arch/arm64/boot/dts/amlogic/Makefile
> @@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
> dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
> dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
> dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
> +dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-xiaomi-once.dtb
This is an invalid patch format
> dtb-$(CONFIG_ARCH_MESON) += meson-gxm-gt1-ultimate.dtb
> dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
> dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
> new file mode 100644
> index 000000000..6169c0dc0
> --- /dev/null
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
> @@ -0,0 +1,142 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2023 exkc <exxxxkc@getgoogleoff.me>
> + * Based on meson-gxl-s905x-p212.dts
> + *
> + */
> +
> +/dts-v1/;
> +
> +#include "meson-gxl-s905x-p212.dtsi"
> +#include <dt-bindings/sound/meson-aiu.h>
> +
> +/ {
> + compatible = "xiaomi,once", "amlogic,s905x", "amlogic,meson-gxl";
> + model = "Xiaomi Mi Box 3";
> +
> + dio2133: analog-amplifier {
> + compatible = "simple-audio-amplifier";
> + sound-name-prefix = "AU2";
> + VCC-supply = <&hdmi_5v>;
> + enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
> + };
> +
> + 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>;
> + };
> + };
> + };
> +
> + sound {
> + compatible = "amlogic,gx-sound-card";
> + model = "XIAOMI-ONCE";
> + audio-aux-devs = <&dio2133>;
> + audio-widgets = "Line", "Lineout";
> + audio-routing = "Lineout", "AU2 OUTL",
> + "Lineout", "AU2 OUTR";
> + assigned-clocks = <&clkc CLKID_MPLL0>,
> + <&clkc CLKID_MPLL1>,
> + <&clkc CLKID_MPLL2>;
> + assigned-clock-parents = <0>, <0>, <0>;
> + assigned-clock-rates = <294912000>,
> + <270950400>,
> + <393216000>;
> + dai-link-0 {
> + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
> + };
> +
> + dai-link-1 {
> + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
> + dai-format = "i2s";
> + mclk-fs = <256>;
> +
> + codec-0 {
> + sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
> + };
> +
> + codec-1 {
> + sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
> + };
> + };
> +
> + dai-link-2 {
> + sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <&hdmi_tx>;
> + };
> + };
> +
> + dai-link-3 {
> + sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <&acodec>;
> + };
> + };
> + };
> +};
> +
> +&acodec {
> + AVDD-supply = <&vddio_ao18>;
> + status = "okay";
> +};
> +
> +&aiu {
> + status = "okay";
> +};
> +
> +&cec_AO {
> + status = "okay";
> + pinctrl-0 = <&ao_cec_pins>;
> + pinctrl-names = "default";
> + hdmi-phandle = <&hdmi_tx>;
> +};
> +
> +&cvbs_vdac_port {
> + cvbs_vdac_out: endpoint {
> + remote-endpoint = <&cvbs_connector_in>;
> + };
> +};
> +
> +&hdmi_tx {
> + status = "okay";
> + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
> + pinctrl-names = "default";
> + hdmi-supply = <&hdmi_5v>;
> +};
> +
> +&hdmi_tx_tmds_port {
> + hdmi_tx_tmds_out: endpoint {
> + remote-endpoint = <&hdmi_connector_in>;
> + };
> +};
> +
> +ðmac {
> + status = "disabled";
> +};
> +
> +&usb {
> + status = "okay";
> + dr_mode = "host";
> +};
> +
> +/* This UART is brought out to the uarl pad on the pcb*/
> +&uart_AO {
> + status = "okay";
> +};
Seems you re-edited the P212 DT, but you replaces all tabs by spaces, please use tabs only
As-is it doesn't apply cleanly and doesn't build:
# b4 shazam a36dd7f2-52fc-4623-e503-a2aeeb04f6ac@yahoo.com
Grabbing thread from lore.kernel.org/all/a36dd7f2-52fc-4623-e503-a2aeeb04f6ac%40yahoo.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Added from v2: 1 patches
Analyzing 3 messages in the thread
Will use the latest revision: v2
You can pick other revisions using the -vN flag
Checking attestation on all messages, may take a moment...
---
✗ [PATCH v2] ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3
+ Link: https://lore.kernel.org/r/8035a445-5a8c-9901-d69f-63d7daa7e2f5@yahoo.com
+ Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
✗ BADSIG: DKIM/yahoo.com
✓ Signed: DKIM/lists.infradead.org (From: exkcmailist@yahoo.com)
---
Total patches: 1
---
Applying: ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3
Patch failed at 0001 ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
error: git diff header lacks filename information when removing 1 leading pathname component (line 13)
hint: Use 'git am --show-current-patch=diff' to see the failed patch
# git am --show-current-patch=diff | patch -p1
patching file arch/arm64/boot/dts/amlogic/Makefile
patch: **** malformed patch at line 18: meson-gxl-s905x-libretech-cc-v2.dtb
If I fix this:
patching file arch/arm64/boot/dts/amlogic/Makefile
Hunk #1 FAILED at 45.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/boot/dts/amlogic/Makefile.rej
If I fix this:
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts:14.1-2 syntax error
FATAL ERROR: Unable to parse input tree
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
prev parent reply other threads:[~2023-05-31 8:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a36dd7f2-52fc-4623-e503-a2aeeb04f6ac.ref@yahoo.com>
2023-04-03 7:47 ` Karl Chan
2023-04-03 8:45 ` Christian Hewitt
2023-05-31 8:54 ` Neil Armstrong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=235c9482-c7f8-d4ae-096a-326e61788f59@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=exkcmailist@yahoo.com \
--cc=linux-amlogic@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®