mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: dts: qcom: sc7180: Move trogdor rt5682s bits to a fragment

Browse Source 
Several trogdor boards have moved from the older rt5862i to the newer
rt5862s, at least on newer revisions of boards. Let's get rid of the
dts duplication across boards and promote this to a fragment.

Note: The old boards used to override the "compatible" in the "sound"
node with the exact same thing that was in "sc7180-trogdor.dtsi"
("google,sc7180-trogdor"). I got rid of that.

This is validated to produce the same result when taking the dtbs
generated by the kernel build and then doing:

  for dtb in *trogdor*.dtb; do
    dtc -I dtb -O dts $dtb -o out/$dtb.dts;
  done

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
Link: https://lore.kernel.org/r/20230816112143.1.I7227efd47e0dc42b6ff243bd22aa1a3e01923220@changeid
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Douglas Anderson
2023-08-16 11:21:53 -07:00
committed by Bjorn Andersson
parent 9cbaee8379
commit 8ff1aaba03
5 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts
View File

@@ -11,19 +11,13 @@
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include <arm/cros-ec-keyboard.dtsi>
#include "sc7180-trogdor-lte-sku.dtsi"
#include "sc7180-trogdor-rt5682s-sku.dtsi"
/ {
model = "Google Kingoftown";
compatible = "google,kingoftown", "qcom,sc7180";
};
&alc5682 {
compatible = "realtek,rt5682s";
/delete-property/ VBAT-supply;
realtek,dmic1-clk-pin = <2>;
realtek,dmic-clk-rate-hz = <2048000>;
};
&ap_tp_i2c {
status = "okay";
};
@@ -84,11 +78,6 @@ ap_ts_pen_1v8: &i2c4 {
gpio = <&tlmm 67 GPIO_ACTIVE_HIGH>;
};
&sound {
compatible = "google,sc7180-trogdor";
model = "sc7180-rt5682s-max98357a-1mic";
};
&wifi {
qcom,ath10k-calibration-variant = "GO_KINGOFTOWN";
};

13
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
View File

@@ -7,13 +7,7 @@
/* This file must be included after sc7180-trogdor.dtsi */
#include "sc7180-trogdor-pazquel.dtsi"
&alc5682 {
compatible = "realtek,rt5682s";
realtek,dmic1-clk-pin = <2>;
realtek,dmic-clk-rate-hz = <2048000>;
/delete-property/ VBAT-supply;
};
#include "sc7180-trogdor-rt5682s-sku.dtsi"
ap_ts_pen_1v8: &i2c4 {
clock-frequency = <400000>;
@@ -64,11 +58,6 @@ ap_ts_pen_1v8: &i2c4 {
>;
};
&sound {
compatible = "google,sc7180-trogdor";
model = "sc7180-rt5682s-max98357a-1mic";
};
&wifi {
qcom,ath10k-calibration-variant = "GO_PAZQUEL360";
};

17
arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi Normal file
View File

@@ -0,0 +1,17 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Trogdor dts fragment for SKUs with
*
* Copyright 2023 Google LLC.
*/
&alc5682 {
compatible = "realtek,rt5682s";
/delete-property/ VBAT-supply;
realtek,dmic1-clk-pin = <2>;
realtek,dmic-clk-rate-hz = <2048000>;
};
&sound {
model = "sc7180-rt5682s-max98357a-1mic";
};

13
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
View File

@@ -11,20 +11,9 @@
/dts-v1/;
#include "sc7180-trogdor-wormdingler-rev1-boe.dts"
#include "sc7180-trogdor-rt5682s-sku.dtsi"
/ {
model = "Google Wormdingler rev1+ (BOE, rt5682s)";
compatible = "google,wormdingler-sku1025", "qcom,sc7180";
};
&alc5682 {
compatible = "realtek,rt5682s";
/delete-property/ VBAT-supply;
realtek,dmic1-clk-pin = <2>;
realtek,dmic-clk-rate-hz = <2048000>;
};
&sound {
compatible = "google,sc7180-trogdor";
model = "sc7180-rt5682s-max98357a-1mic";
};

13
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts
View File

@@ -11,20 +11,9 @@
/dts-v1/;
#include "sc7180-trogdor-wormdingler-rev1-inx.dts"
#include "sc7180-trogdor-rt5682s-sku.dtsi"
/ {
model = "Google Wormdingler rev1+ (INX, rt5682s)";
compatible = "google,wormdingler-sku1", "qcom,sc7180";
};
&alc5682 {
compatible = "realtek,rt5682s";
/delete-property/ VBAT-supply;
realtek,dmic1-clk-pin = <2>;
realtek,dmic-clk-rate-hz = <2048000>;
};
&sound {
compatible = "google,sc7180-trogdor";
model = "sc7180-rt5682s-max98357a-1mic";
};