| Message ID | 20210301213437.4165775-1-dianders@chromium.org |
|---|---|
| Headers | show |
| Series | arm64: dts: qcom: Update sc7180-trogdor variants from downstream | expand |
Quoting Douglas Anderson (2021-03-01 13:34:27) > The trackpad interrupt got renamed and also moved to a new GPIO on > newer boards. Let's do the move in the "trogdor.dtsi" file and then > undo it in the two old boards. > > NOTE: since none of the new boards have device trees yet, this change > looks silly on its own but it will make sense after more boards are > supported. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Quoting Douglas Anderson (2021-03-01 13:34:31) > From: Alexandru M Stan <amstan@chromium.org> > > Removed the pinctrl and pin{mux,conf} for the control pins because: > 1. The only need for them is for userspace control via flash_fp_mcu > 2. cros-ec doesn't know what to do with them, and even if it did, > it would interfere with flash_fp_mcu at the most inopportune times > > Since we're not using hogs, we rely on AP firmware to set all the > control pins correctly. > > Cc: Stephen Boyd <swboyd@chromium.org> > Cc: Craig Hesling <hesling@chromium.org> > Signed-off-by: Alexandru M Stan <amstan@chromium.org> > [dianders: adjusted since coachz isn't upstream yet] > Reviewed-by; Matthias Kaehlcke <mka@chromium.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Quoting Douglas Anderson (2021-03-01 13:34:32) > From: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org> > > Removed voting for RPMH_RF_CLK2 which is not required as it is > getting managed by BT SoC through SW_CTRL line. > > Cc: Matthias Kaehlcke <mka@chromium.org> > Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Quoting Douglas Anderson (2021-03-01 13:34:33) > From: Abhishek Kumar <kuabhs@chromium.org> > > For trogdor, in the latest board-2.bin file, new BDF with variant > name GO_LAZOR has been introduced, so we need this property set, for > GO_LAZOR BDF to be picked. > > Cc: Philip Chen <philipchen@chromium.org> > Signed-off-by: Abhishek Kumar <kuabhs@chromium.org> > [dianders: adjusted subject line and sort order] > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Quoting Douglas Anderson (2021-03-01 13:34:36) > This is a trogdor variant. This is mostly a grab from the downstream > tree with notable exceptions: > - I skip -rev0. This was a super early build and there's no advantage > of long term support. > - In -rev1 I translate the handling of the USB hub like is done for > similar boards. See the difference between the downstream and > upstream 'sc7180-trogdor-lazor-r0.dts' for an example. This will > need to be resolved when proper support for the USB hub is figured > out upstream. > - I remove sound node since sound hasn't landed upstream yet. > - In incorporate the pending <https://crrev.com/c/2719075> for the > keyboard. > > Cc: Philip Chen <philipchen@google.com> > Cc: Matthias Kaehlcke <mka@chromium.org> > Cc: Stephen Boyd <swboyd@chromium.org> > Cc: Tzung-Bi Shih <tzungbi@chromium.org> > Cc: Judy Hsiao <judyhsiao@chromium.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
The point of this series is to catch upstream up to what we have downstream in terms of sc7180-trogdor variants. Notably: - It incorporates minor changes that snuck into the trogdor and lazor device tree files since they were posted upstream. - It adds the "Limozeen" SKU variant of Lazor. - It adds support the Pompom and CoachZ type trogdor boards. This series was tested on the "for-next" Qualcomm tree at commit d242adf2067e ("Merge branch 'arm64-for-5.13' into for-next"). - The patch ("arm64: dts: qcom: sc7180: Use pdc interrupts for USB instead of GIC interrupts") [1] just because it reduced diffs and seemed ready to go. - The patch ("arm64: dts: qcom: sc7180: Avoid glitching SPI CS at bootup on trogdor") [2] because that's an important bugfix. With all these changes things are in pretty good shape. Looking at diffs compared to downstream w/ a few patches [3]: - I haven't tried to resolve "sound" with upstream, instead stripping / leaving as-is any audio related nodes. Someone with more knowledge of the current state of audio needs to take a pass here. - I haven't tried to resolve DP with upstream. It's basically not there. Someone who works on this: please help! - We have a downstream patch to manage power for USB hubs. Without that we have to keep power on all the time for USB. Matthias is still working on trying to get an agreement for how that should work. - Downstream we have an early version of the "sleep stats" driver landed. I believe this is in Maulik's court to re-post. I have tested this series on "lazor", "lazor-limozeen", "pompom" and "coachz". All of them boot to the web browser with this patch series. [1] https://lore.kernel.org/r/1594235417-23066-4-git-send-email-sanm@codeaurora.org [2] https://lore.kernel.org/r/20210218145456.1.I1da01a075dd86e005152f993b2d5d82dd9686238@changeid [3] https://chromium.googlesource.com/chromiumos/third_party/kernel/+log/refs/sandbox/dianders/210225-downstream-dts Changes in v2: - Add link to Acked bindings. - Proper compatible for the "correct" panel (added -ea1 suffix). - Rebase atop commit 7822de1a2946 ("arm64:...1 for charger temperature") - Removed "i2c_wlc" as Stephen suggested. - lazor => trogdor in subject Abhishek Kumar (1): arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor Alexandru M Stan (1): arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz Douglas Anderson (6): arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards arm64: dts: qcom: Unify the sc7180-trogdor panel nodes arm64: dts: qcom: Add sc7180-lazor-limozeen skus arm64: dts: qcom: Add sc7180-trogdor-pompom skus arm64: dts: qcom: Add sc7180-trogdor-coachz skus Matthias Kaehlcke (1): arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs Stephen Boyd (3): arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy arm64: dts: qcom: trogdor: Only wakeup from pen eject arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by default Venkata Lakshmi Narayana Gubba (1): arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor arch/arm64/boot/dts/qcom/Makefile | 11 + .../dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 18 ++ .../dts/qcom/sc7180-trogdor-coachz-r1.dts | 154 ++++++++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 18 ++ .../dts/qcom/sc7180-trogdor-coachz-r2.dts | 15 + .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 240 +++++++++++++++ .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 +++ .../sc7180-trogdor-lazor-limozeen-nots.dts | 26 ++ .../qcom/sc7180-trogdor-lazor-limozeen.dts | 42 +++ .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 5 +- .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +- .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 1 + .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 39 +-- .../dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 14 + .../dts/qcom/sc7180-trogdor-pompom-r1.dts | 26 ++ .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 14 + .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 44 +++ .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 288 ++++++++++++++++++ .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 35 ++- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 105 +++---- arch/arm64/boot/dts/qcom/sc7180.dtsi | 41 +-- 21 files changed, 1064 insertions(+), 110 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi