On 09/08/2023 08:49, Sheng-Liang Pan wrote:
> add BRD_ID(0, Z, 0) = 10 for new board with ALC5682i-VS
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> ---
>
> Changes in v3:
> - sort out the node order alphabetically
>
> Changes in v2:
> - correct newly create dts files
>
> arch/arm64/boot/dts/qcom/Makefile | 5 ++
> ...sc7180-trogdor-lazor-limozeen-nots-r10.dts | 40 +++++++++++++
> .../sc7180-trogdor-lazor-limozeen-nots-r9.dts | 4 +-
> .../sc7180-trogdor-lazor-limozeen-r10.dts | 56 +++++++++++++++++++
> .../qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 34 +++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 38 +++++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10.dts | 30 ++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 4 +-
> 11 files changed, 213 insertions(+), 10 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 337abc4ceb17..73e745fb1ff0 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -109,11 +109,16 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> new file mode 100644
> index 000000000000..bfeddd287aaf
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Lazor Limozeen board device tree source
> + *
> + * Copyright 2023 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7180-trogdor.dtsi"
> +#include "sc7180-trogdor-parade-ps8640.dtsi"
> +#include "sc7180-trogdor-lazor.dtsi"
> +#include "sc7180-trogdor-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Lazor Limozeen without Touchscreen (rev10+)";
> + compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
Isn't this duplicated with r9? Probably other places as well... or....
> +};
> +
> +/delete-node/&ap_ts;
> +
> +&alc5682 {
> + compatible = "realtek,rt5682s";
> + /delete-property/ VBAT-supply;
> + realtek,dmic1-clk-pin = <2>;
> + realtek,dmic-clk-rate-hz = <2048000>;
> +};
> +
> +&panel {
> + compatible = "edp-panel";
> +};
> +
> +&sdhc_2 {
> + status = "okay";
> +};
> +
> +&sound {
> + compatible = "google,sc7180-trogdor";
> + model = "sc7180-rt5682s-max98357a-1mic";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
> index cef57c15b70b..e3f1f30a7fc3 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
> @@ -13,8 +13,8 @@
> #include "sc7180-trogdor-lte-sku.dtsi"
>
> / {
> - model = "Google Lazor Limozeen without Touchscreen (rev9+)";
> - compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
> + model = "Google Lazor Limozeen without Touchscreen (rev9)";
> + compatible = "google,lazor-rev9-sku6", "google,lazor-rev9-sku18", "qcom,sc7180";
Your patch 2 does not make any sense. Didn't you touch it in patch 2?
Really, what is happening here?
Best regards,
Krzysztof
