| Message ID | 20221003182637.v6.2.I1454364ac3d8ecc64677884d6b7d2f3e334e4b4a@changeid |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add LTE SKU for sc7280-evoker family | expand |
On Mon, Oct 03, 2022 at 06:27:35PM +0800, Sheng-Liang Pan wrote: Please prefix your sc7280 changes with "arm64: dts: qcom: sc7280: "... Regards, Bjorn > evoker have wifi/lte sku, add different dts for each sku. > > Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com> > Reviewed-by: Douglas Anderson <dianders@chromium.org> > --- > > (no changes since v5) > > Changes in v5: > - remove unnecessary whitespace > > Changes in v4: > - remove change for trackpad and touchscreen > > arch/arm64/boot/dts/qcom/Makefile | 3 ++- > .../boot/dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++++++ > .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 15 +++++++++++++++ > ...evoker-r0.dts => sc7280-herobrine-evoker.dtsi} | 7 ------- > 4 files changed, 31 insertions(+), 8 deletions(-) > create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > rename arch/arm64/boot/dts/qcom/{sc7280-herobrine-evoker-r0.dts => sc7280-herobrine-evoker.dtsi} (98%) > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index 65cb0f714ed6b..91153baeeffae 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -95,7 +95,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb > -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-r0.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts > new file mode 100644 > index 0000000000000..3af9224a7492e > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts > @@ -0,0 +1,14 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Google Evoker board device tree source > + * > + * Copyright 2022 Google LLC. > + */ > + > +#include "sc7280-herobrine-evoker.dts" > +#include "sc7280-herobrine-lte-sku.dtsi" > + > +/ { > + model = "Google Evoker with LTE"; > + compatible = "google,evoker-sku512", "qcom,sc7280"; > +}; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > new file mode 100644 > index 0000000000000..dcdd4eecfe670 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > @@ -0,0 +1,15 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Google Evoker board device tree source > + * > + * Copyright 2022 Google LLC. > + */ > + > +/dts-v1/; > + > +#include "sc7280-herobrine-evoker.dtsi" > + > +/ { > + model = "Google Evoker"; > + compatible = "google,evoker", "qcom,sc7280"; > +}; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi > similarity index 98% > rename from arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts > rename to arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi > index ccbe50b6249ab..e78072159d54b 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi > @@ -5,15 +5,8 @@ > * Copyright 2022 Google LLC. > */ > > -/dts-v1/; > - > #include "sc7280-herobrine.dtsi" > > -/ { > - model = "Google Evoker"; > - compatible = "google,evoker", "qcom,sc7280"; > -}; > - > /* > * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES > * > -- > 2.34.1 >
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 65cb0f714ed6b..91153baeeffae 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -95,7 +95,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-r0.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts new file mode 100644 index 0000000000000..3af9224a7492e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +#include "sc7280-herobrine-evoker.dts" +#include "sc7280-herobrine-lte-sku.dtsi" + +/ { + model = "Google Evoker with LTE"; + compatible = "google,evoker-sku512", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts new file mode 100644 index 0000000000000..dcdd4eecfe670 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine-evoker.dtsi" + +/ { + model = "Google Evoker"; + compatible = "google,evoker", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi similarity index 98% rename from arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts rename to arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi index ccbe50b6249ab..e78072159d54b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi @@ -5,15 +5,8 @@ * Copyright 2022 Google LLC. */ -/dts-v1/; - #include "sc7280-herobrine.dtsi" -/ { - model = "Google Evoker"; - compatible = "google,evoker", "qcom,sc7280"; -}; - /* * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES *