| Message ID | 20220923174224.v3.2.I1454364ac3d8ecc64677884d6b7d2f3e334e4b4a@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add LTE SKU for sc7280-evoker family | expand |
Hi, On Fri, Sep 23, 2022 at 2:43 AM Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com> wrote: > > 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> > --- > > (no changes since v1) > > arch/arm64/boot/dts/qcom/Makefile | 3 ++- > .../dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++ > .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 16 ++++++++++++ > ...er-r0.dts => sc7280-herobrine-evoker.dtsi} | 26 +++++-------------- > 4 files changed, 39 insertions(+), 20 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} (93%) > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index d7669a7cee9f7..76390301a76c0 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -104,7 +104,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..f490b2bb26df8 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > @@ -0,0 +1,16 @@ > +// 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"; > +}; > + When I apply your patch, git complains here: new blank line at EOF. + warning: 1 line adds whitespace errors. > 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 93% > 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..561bb1ee77eee 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 > * > @@ -30,16 +23,15 @@ ap_tp_i2c: &i2c0 { > status = "okay"; > clock-frequency = <400000>; > > - trackpad: trackpad@2c { > - compatible = "hid-over-i2c"; > - reg = <0x2c>; > + trackpad: trackpad@15 { > + compatible = "elan,ekth3000"; > + reg = <0x15>; The trackpad change should be a separate patch. > pinctrl-names = "default"; > pinctrl-0 = <&tp_int_odl>; > > interrupt-parent = <&tlmm>; > interrupts = <7 IRQ_TYPE_EDGE_FALLING>; > > - hid-descr-addr = <0x20>; > vcc-supply = <&pp3300_z1>; > > wakeup-source; > @@ -50,18 +42,15 @@ ts_i2c: &i2c13 { > status = "okay"; > clock-frequency = <400000>; > > - ap_ts: touchscreen@10 { > - compatible = "elan,ekth6915"; > - reg = <0x10>; > - pinctrl-names = "default"; > - pinctrl-0 = <&ts_int_conn>, <&ts_rst_conn>; > + touchscreen: touchscreen@5d { > + compatible = "goodix,gt7375p"; > + reg = <0x5d>; The touchscreen change should be a separate patch. > interrupt-parent = <&tlmm>; > interrupts = <55 IRQ_TYPE_LEVEL_LOW>; > > reset-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>; > - > - vcc33-supply = <&ts_avdd>; > + vdd-supply = <&ts_avdd>; > }; > }; > > @@ -90,7 +79,6 @@ &pcie1 { > status = "okay"; > }; > > -/* For nvme */ Not sure why you're touching this line in the patch. I'd say leave it alone. -Doug
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index d7669a7cee9f7..76390301a76c0 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -104,7 +104,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..f490b2bb26df8 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -0,0 +1,16 @@ +// 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 93% 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..561bb1ee77eee 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 * @@ -30,16 +23,15 @@ ap_tp_i2c: &i2c0 { status = "okay"; clock-frequency = <400000>; - trackpad: trackpad@2c { - compatible = "hid-over-i2c"; - reg = <0x2c>; + trackpad: trackpad@15 { + compatible = "elan,ekth3000"; + reg = <0x15>; pinctrl-names = "default"; pinctrl-0 = <&tp_int_odl>; interrupt-parent = <&tlmm>; interrupts = <7 IRQ_TYPE_EDGE_FALLING>; - hid-descr-addr = <0x20>; vcc-supply = <&pp3300_z1>; wakeup-source; @@ -50,18 +42,15 @@ ts_i2c: &i2c13 { status = "okay"; clock-frequency = <400000>; - ap_ts: touchscreen@10 { - compatible = "elan,ekth6915"; - reg = <0x10>; - pinctrl-names = "default"; - pinctrl-0 = <&ts_int_conn>, <&ts_rst_conn>; + touchscreen: touchscreen@5d { + compatible = "goodix,gt7375p"; + reg = <0x5d>; interrupt-parent = <&tlmm>; interrupts = <55 IRQ_TYPE_LEVEL_LOW>; reset-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>; - - vcc33-supply = <&ts_avdd>; + vdd-supply = <&ts_avdd>; }; }; @@ -90,7 +79,6 @@ &pcie1 { status = "okay"; }; -/* For nvme */ &pcie1_phy { status = "okay"; };
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> --- (no changes since v1) arch/arm64/boot/dts/qcom/Makefile | 3 ++- .../dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++ .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 16 ++++++++++++ ...er-r0.dts => sc7280-herobrine-evoker.dtsi} | 26 +++++-------------- 4 files changed, 39 insertions(+), 20 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} (93%)