| Message ID | 20230809144516.v3.3.Ie77732a87ab53d21bac47db309b75a796fa19337@changeid (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add no-esim sku for sc7180-lazor family and new board version | expand |
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@quanta.corp-partner.google.com> > Reviewed-by: Douglas Anderson <dianders@chromium.org> > --- > > 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
On 10/08/2023 11:30, Sheng-Liang Pan wrote: > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> Isn't this duplicated with r9? Probably other places as well... or.... >> separate r10 add rt5682s node which different with r9. > we separate r10 add rt5682s which differentwith r9 > > >>> - 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? > patch 2 explain why we added new sku for no-eSIM. So which commit explain why you touch the same line twice? Sorry, this does not make sense. Best regards, Krzysztof
On 11/08/2023 05:46, Sheng-Liang Pan wrote: > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > On 10/08/2023 11:30, Sheng-Liang Pan wrote: >>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> >>>> Isn't this duplicated with r9? Probably other places as well... or.... >>>> separate r10 add rt5682s node which different with r9. >>> we separate r10 add rt5682s which differentwith r9 >>> >>> >>>>> - 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? >>> patch 2 explain why we added new sku for no-eSIM. >> >> So which commit explain why you touch the same line twice? Sorry, this >> does not make sense. >> >> Best regards, >> Krzysztof > > We sort patch by change order, > fist request for non-eSIM, patch2 add new sku 10, 15 for non-eSIM, and 18, but keep the newset reversion is r9, > after add non-eSIM SKU, a sencond request for ALC5682i-VS, > so continue patch2 we upreversion r10 which include rt5682s node. I barely can parse it, but anyway does not look right. You explained what you are doing but it does not explain why touching the same line twice. There is no point in making one board new SKU, but then immediately change it to something else. The previous commit is just no-op. Best regards, Krzysztof
Hi, On Mon, Aug 14, 2023 at 2:49 AM Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com> wrote: > > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> > >> On 10/08/2023 11:30, Sheng-Liang Pan wrote: > >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>>> > >>>>> Isn't this duplicated with r9? Probably other places as well... or.... > >>>>> separate r10 add rt5682s node which different with r9. > >>>> we separate r10 add rt5682s which differentwith r9 > >>>> > >>>> > >>>>>> - 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? > >>>> patch 2 explain why we added new sku for no-eSIM. > >>> > >>> So which commit explain why you touch the same line twice? Sorry, this > >>> does not make sense. > >>> > >>> Best regards, > >>> Krzysztof > >> > >> We sort patch by change order, > >> fist request for non-eSIM, patch2 add new sku 10, 15 for non-eSIM, and 18, but keep the newset reversion is r9, > >> after add non-eSIM SKU, a sencond request for ALC5682i-VS, > >> so continue patch2 we upreversion r10 which include rt5682s node. > > > > I barely can parse it, but anyway does not look right. You explained > > what you are doing but it does not explain why touching the same line > > twice. There is no point in making one board new SKU, but then > > immediately change it to something else. The previous commit is just no-op. > > > > Best regards, > > Krzysztof > > Thanks Krzysztof. > > Hi Douglas, > May I consult with you if you can accept we merge patch2 and patch3 together? I have no objection to merging patch #2 and patch #3 into one patch if that makes it better for Krzysztof. -Doug
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"; +}; + +/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"; }; /delete-node/&ap_ts; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts new file mode 100644 index 000000000000..7e22cec29ee9 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts @@ -0,0 +1,56 @@ +// 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 (rev10+)"; + compatible = "google,lazor-sku4", "google,lazor-sku15", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&alc5682 { + compatible = "realtek,rt5682s"; + /delete-property/ VBAT-supply; + realtek,dmic1-clk-pin = <2>; + realtek,dmic-clk-rate-hz = <2048000>; +}; + +&ap_ts_pen_1v8 { + ap_ts: touchscreen@10 { + compatible = "elan,ekth3500"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + vcc33-supply = <&pp3300_ts>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + }; +}; + +&panel { + compatible = "auo,b116xa01"; +}; + +&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-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts index 2038a82bc0e7..3b6053f3e62b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts @@ -13,8 +13,8 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor Limozeen (rev9+)"; - compatible = "google,lazor-sku4", "google,lazor-sku15", "qcom,sc7180"; + model = "Google Lazor Limozeen (rev9)"; + compatible = "google,lazor-rev9-sku4", "google,lazor-rev9-sku15", "qcom,sc7180"; }; /delete-node/&ap_ts; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts new file mode 100644 index 000000000000..6e44e6e04144 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor 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-lite.dtsi" + +/ { + model = "Google Lazor (rev10+) with KB Backlight"; + compatible = "google,lazor-sku2", "qcom,sc7180"; +}; + +&alc5682 { + compatible = "realtek,rt5682s"; + /delete-property/ VBAT-supply; + realtek,dmic1-clk-pin = <2>; + realtek,dmic-clk-rate-hz = <2048000>; +}; + +&keyboard_backlight { + status = "okay"; +}; + +&sound { + compatible = "google,sc7180-trogdor"; + model = "sc7180-rt5682s-max98357a-1mic"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts new file mode 100644 index 000000000000..a79b7cc5bfb1 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor 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 (rev10+) with LTE"; + compatible = "google,lazor-sku0", "google,lazor-sku10", "qcom,sc7180"; +}; + +&alc5682 { + compatible = "realtek,rt5682s"; + /delete-property/ VBAT-supply; + realtek,dmic1-clk-pin = <2>; + realtek,dmic-clk-rate-hz = <2048000>; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + +&keyboard_backlight { + status = "okay"; +}; + +&sound { + compatible = "google,sc7180-trogdor"; + model = "sc7180-rt5682s-max98357a-1mic"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts new file mode 100644 index 000000000000..5a58e94c228e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor 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-lite.dtsi" + +/ { + model = "Google Lazor (rev10+)"; + compatible = "google,lazor", "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"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts index 960f7b7ce094..f74a1985cac6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts @@ -13,8 +13,8 @@ #include "sc7180-lite.dtsi" / { - model = "Google Lazor (rev9+) with KB Backlight"; - compatible = "google,lazor-sku2", "qcom,sc7180"; + model = "Google Lazor (rev9) with KB Backlight"; + compatible = "google,lazor-rev9-sku2", "qcom,sc7180"; }; &keyboard_backlight { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts index 438ab9cd3389..15dcf95da311 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts @@ -13,8 +13,8 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor (rev9+) with LTE"; - compatible = "google,lazor-sku0", "google,lazor-sku10", "qcom,sc7180"; + model = "Google Lazor (rev9) with LTE"; + compatible = "google,lazor-rev9-sku0", "google,lazor-rev9-sku10", "qcom,sc7180"; }; &ap_sar_sensor_i2c { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts index 56dd222650d3..44f61bc56f81 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts @@ -13,6 +13,6 @@ #include "sc7180-lite.dtsi" / { - model = "Google Lazor (rev9+)"; - compatible = "google,lazor", "qcom,sc7180"; + model = "Google Lazor (rev9)"; + compatible = "google,lazor-rev9", "qcom,sc7180"; };