| Message ID | 20230804175734.v2.3.Ie77732a87ab53d21bac47db309b75a796fa19337@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add no-esim sku for sc7180-lazor family and new board version | expand |
Hi, On Fri, Aug 4, 2023 at 2:58 AM Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com> wrote: > > +++ 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; > + > +&panel { > + compatible = "edp-panel"; > +}; > + > +&sdhc_2 { > + status = "okay"; > +}; > + > +&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"; > +}; The sort ordering of the nodes above is still wrong. It should be alphabetical. AKA "alc5682", "panel", "sdhc_2", "sound". Once that's fixed, feel free to include: Reviewed-by: Douglas Anderson <dianders@chromium.org>
On 04/08/2023 11:58, 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> > --- > > Changes in v2: > - correct newly create dts files > > 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; No, don't delete properties. First of all, why you do not have this supply here? I doubt it... Especially that this DTS has vbat-supply regulator! Second, define the properties where applicable instead. > + 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"; This is not what your binding is saying. You just introduced new dtbs_check warnings :( It does not look like you tested the DTS against bindings. Please run `make dtbs_check` (see Documentation/devicetree/bindings/writing-schema.rst or https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/ for instructions). Best regards, Krzysztof
Hi, On Sun, Aug 6, 2023 at 11:34 PM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 04/08/2023 11:58, 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> > > --- > > > > Changes in v2: > > - correct newly create dts files > > > > > > 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; > > No, don't delete properties. First of all, why you do not have this > supply here? I doubt it... Especially that this DTS has vbat-supply > regulator! > > Second, define the properties where applicable instead. It looks like v3 is out, but responding here since it looks like Sheng-Liang didn't make any changes in v3 but also didn't respond and explain why he didn't make any changes. Sheng-Liang: for future reference you should make sure to address comments folks have on the list. If your new version takes their feedback into account then there's no reason to just respond with "Done", but if (like in this case) you ignored feedback you need to say why. In this case the extra "/delete-property/" is needed to pass bindings checks. Specifically this revision of the board replaces the "rt5682i" with the newer "rt5682s". This new codec is _almost_ a drop-in replacement for the old codec with just a few tiny changes. One such change is that the new codec doesn't need a "VBAT-supply". Since most trogdor devices have the older "rt5682i" codec, the default in "sc7180-trogdor.dtsi" specifies the properties for that codec. Only the handful of boards that have been spun to use the new codec have an override like this. You can see that the override done here matches the one done in a few other trogdor boards. A good grep is: git grep -A4 realtek,rt5682s -- arch/arm64/boot/dts/qcom/sc7180-* Ironically, that grep finds that "sc7180-trogdor-pazquel360.dtsi" is missing the "/delete-property/" which I'm fairly certain means that it's giving a validation warning today. I'm happy to have a bikeshed discussion about doing this better. In a previous reply [1] I suggested that it's probably time to move the "realtek,rt5682s" snippet to something like "sc7180-trogdor-rt5682s-sku.dtsi". Then we could include it in the devices and avoid duplicating this bit of dts. I didn't insist on it, but if you feel strongly then maybe Sheng-Liang could add that to his series? Once done, we could have further bikeshed discussions about whether we should continue to use the "/delete-property/" solution or if we have to also create a "sc7180-trogdor-rt5682i-sku.dtsi" and force all older SKUs to include that. Personally I don't hate this "/delete-property/" but I don't care a whole lot either way. [1] https://lore.kernel.org/r/CAD=FV=XRq8ymnPrMPCa=c7PkSH+Kj9aG29_hCjCNSL3fY-qaGg@mail.gmail.com -Doug
On 15/08/2023 23:10, Doug Anderson wrote: > Hi, > > On Sun, Aug 6, 2023 at 11:34 PM Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> On 04/08/2023 11:58, 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> >>> --- >>> >>> Changes in v2: >>> - correct newly create dts files >>> >> >> >>> 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; >> >> No, don't delete properties. First of all, why you do not have this >> supply here? I doubt it... Especially that this DTS has vbat-supply >> regulator! >> >> Second, define the properties where applicable instead. > > It looks like v3 is out, but responding here since it looks like > Sheng-Liang didn't make any changes in v3 but also didn't respond and > explain why he didn't make any changes. Sheng-Liang: for future > reference you should make sure to address comments folks have on the > list. If your new version takes their feedback into account then > there's no reason to just respond with "Done", but if (like in this > case) you ignored feedback you need to say why. > > In this case the extra "/delete-property/" is needed to pass bindings > checks. Specifically this revision of the board replaces the "rt5682i" > with the newer "rt5682s". This new codec is _almost_ a drop-in > replacement for the old codec with just a few tiny changes. One such > change is that the new codec doesn't need a "VBAT-supply". > > Since most trogdor devices have the older "rt5682i" codec, the default > in "sc7180-trogdor.dtsi" specifies the properties for that codec. Only > the handful of boards that have been spun to use the new codec have an > override like this. You can see that the override done here matches > the one done in a few other trogdor boards. A good grep is: > > git grep -A4 realtek,rt5682s -- arch/arm64/boot/dts/qcom/sc7180-* > > Ironically, that grep finds that "sc7180-trogdor-pazquel360.dtsi" is > missing the "/delete-property/" which I'm fairly certain means that > it's giving a validation warning today. > > I'm happy to have a bikeshed discussion about doing this better. In a > previous reply [1] I suggested that it's probably time to move the > "realtek,rt5682s" snippet to something like > "sc7180-trogdor-rt5682s-sku.dtsi". Then we could include it in the > devices and avoid duplicating this bit of dts. I didn't insist on it, > but if you feel strongly then maybe Sheng-Liang could add that to his > series? Once done, we could have further bikeshed discussions about > whether we should continue to use the "/delete-property/" solution or > if we have to also create a "sc7180-trogdor-rt5682i-sku.dtsi" and > force all older SKUs to include that. Personally I don't hate this > "/delete-property/" but I don't care a whole lot either way. Thanks for explanation. I vote against /delete-property/ because it is error-prone and a bit confusing. The same with overriding compatibles - if possible, should be avoided. sc7180-trogdor-pazquel360.dtsi is doing both, but that's not the pattern I find easy to read. I accept overriding supplies or pins, because these differ per board. But if common DTSI defines compatible, then it is common for everyone or it is not really part of common DTSI. IOW, the common DTSI should be more like a SoC DTSI - have only parts present there. I simplify here, because obviously SoC is a real thing piece of hardware and common board DTSI is not. It's just an abstraction... but anyway if different boards use different codecs, then I would say it is not part of common platform. Best regards, Krzysztof
Hi, On Wed, Aug 16, 2023 at 2:59 AM Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com> wrote: > > > On 15/08/2023 23:10, Doug Anderson wrote: > >> Hi, > >> > >> On Sun, Aug 6, 2023 at 11:34 PM Krzysztof Kozlowski > >> <krzysztof.kozlowski@linaro.org> wrote: > >>> > >>> On 04/08/2023 11:58, 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> > >>>> --- > >>>> > >>>> Changes in v2: > >>>> - correct newly create dts files > >>>> > >>> > >>> > >>>> 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; > >>> > >>> No, don't delete properties. First of all, why you do not have this > >>> supply here? I doubt it... Especially that this DTS has vbat-supply > >>> regulator! > >>> > >>> Second, define the properties where applicable instead. > >> > >> It looks like v3 is out, but responding here since it looks like > >> Sheng-Liang didn't make any changes in v3 but also didn't respond and > >> explain why he didn't make any changes. Sheng-Liang: for future > >> reference you should make sure to address comments folks have on the > >> list. If your new version takes their feedback into account then > >> there's no reason to just respond with "Done", but if (like in this > >> case) you ignored feedback you need to say why. > >> > >> In this case the extra "/delete-property/" is needed to pass bindings > >> checks. Specifically this revision of the board replaces the "rt5682i" > >> with the newer "rt5682s". This new codec is _almost_ a drop-in > >> replacement for the old codec with just a few tiny changes. One such > >> change is that the new codec doesn't need a "VBAT-supply". > >> > >> Since most trogdor devices have the older "rt5682i" codec, the default > >> in "sc7180-trogdor.dtsi" specifies the properties for that codec. Only > >> the handful of boards that have been spun to use the new codec have an > >> override like this. You can see that the override done here matches > >> the one done in a few other trogdor boards. A good grep is: > >> > >> git grep -A4 realtek,rt5682s -- arch/arm64/boot/dts/qcom/sc7180-* > >> > >> Ironically, that grep finds that "sc7180-trogdor-pazquel360.dtsi" is > >> missing the "/delete-property/" which I'm fairly certain means that > >> it's giving a validation warning today. > >> > >> I'm happy to have a bikeshed discussion about doing this better. In a > >> previous reply [1] I suggested that it's probably time to move the > >> "realtek,rt5682s" snippet to something like > >> "sc7180-trogdor-rt5682s-sku.dtsi". Then we could include it in the > >> devices and avoid duplicating this bit of dts. I didn't insist on it, > >> but if you feel strongly then maybe Sheng-Liang could add that to his > >> series? Once done, we could have further bikeshed discussions about > >> whether we should continue to use the "/delete-property/" solution or > >> if we have to also create a "sc7180-trogdor-rt5682i-sku.dtsi" and > >> force all older SKUs to include that. Personally I don't hate this > >> "/delete-property/" but I don't care a whole lot either way. > > > > Thanks for explanation. I vote against /delete-property/ because it is > > error-prone and a bit confusing. The same with overriding compatibles - > > if possible, should be avoided. sc7180-trogdor-pazquel360.dtsi is doing > > both, but that's not the pattern I find easy to read. OK, I tried it. I'm on the fence but don't object to it landing [1] > > I accept overriding supplies or pins, because these differ per board. > > But if common DTSI defines compatible, then it is common for everyone or > > it is not really part of common DTSI. > > > > IOW, the common DTSI should be more like a SoC DTSI - have only parts > > present there. I simplify here, because obviously SoC is a real thing > > piece of hardware and common board DTSI is not. It's just an > > abstraction... but anyway if different boards use different codecs, then > > I would say it is not part of common platform. > > > > Best regards, > > Krzysztof > > > > > Thank Doug's explain, as Doug says, we need "/delete-property/" to pass binding checks. > I read from https://lore.kernel.org/all/20221102182002.255282-9-nfraprado@collabora.com/ which removed VBAT-supply; > > I'd like to know what I can do for our project. Please advise. I've posted a series which I think will help [2] [1]. Assuming those look good, your action items would be: 1. If they look good, you could provide "Reviewed-by" and/or "Tested-by" tags on my patches. 2. You can send a new version of your patches based atop mine. You'd want to note in the cover letter and/or "after the cut" in the patch that your patches depend on mine. NOTE: there's no reason that the cleanup patches needed to be posted by me. As you get more familiar with upstream kernel development, you should be able to write similar patches yourself and include them in your series. It's perfectly OK to "cleanup" other boards as part of your series. [1] https://lore.kernel.org/r/20230816112143.2.I29a5a330b6994afca81871f74bbacaf55b155937@changeid [2] https://lore.kernel.org/r/20230816112143.1.I7227efd47e0dc42b6ff243bd22aa1a3e01923220@changeid
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..fe634e2caf3b --- /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; + +&panel { + compatible = "edp-panel"; +}; + +&sdhc_2 { + status = "okay"; +}; + +&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-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..7b97963cce6e --- /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; + +&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"; +}; + +&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-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..6f98f61ac567 --- /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"; +}; + +&keyboard_backlight { + status = "okay"; +}; + +&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-r10-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts new file mode 100644 index 000000000000..03d0d0af367c --- /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"; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + +&keyboard_backlight { + status = "okay"; +}; + +&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-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"; };
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> --- 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