| Message ID | 20230323173019.3706069-1-dianders@chromium.org |
|---|---|
| Headers | show |
| Series | Control Quad SPI pinctrl better on Qualcomm Chromebooks | expand |
On Thu, Mar 23, 2023 at 6:31 PM Douglas Anderson <dianders@chromium.org> wrote: > The main goal of this series is to do a better job of cI can apply ontroling the > pins related to the "Quad SPI" IP block on Qualcomm Chromebooks. This > is essentially 'v2' of my previous attempt in the patch ("arm64: dts: > qcom: sc7180: Fix trogdor qspi pull direction") [1] but since it's > spiraled out a bit and there are no patches that are exactly the same > I've reset to v1. > > The early patches in this series are just no-op cleanup patches that > can be applied. They're not terribly critical but since they are > "Fixes" I've listed them first. > > The next patch in the series is a very simple and (hopefully) > non-controversial SPI patch. It can be applied independently if > anything else. > > Next, we have a bunch of pinctrl patches (including the device tree > bindings related to them). I dunno what folks are going to think about > these. If everyone hates them, we can drop them and just change the > later patches in the series to use "input-enable" instead of > "output-disable". It feels ugly to me, but it maybe less upheval. > > Next I removed the now-deprecated "input-enable" property from all > Chromebooks. None of them were necessary. > > Finally, I did what I really wanted to do in the first place: attempt > to cleanup the pinctrl states of the Quad SPI. These patches have a > hard requirement on the pinctrl change. This looks good to me (TM) Do you have a merge plan? I can queue the pinctrl patch into the pinctrl tree, and the pinctrl binding patches. Will you take the rest to the SPI and SoC tree? Acked-by: Linus Walleij <linus.walleij@linaro.org> FWIW Yours, Linus Walleij
Hi, On Mon, Mar 27, 2023 at 2:45 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Thu, Mar 23, 2023 at 6:31 PM Douglas Anderson <dianders@chromium.org> wrote: > > > The main goal of this series is to do a better job of cI can apply ontroling the > > pins related to the "Quad SPI" IP block on Qualcomm Chromebooks. This > > is essentially 'v2' of my previous attempt in the patch ("arm64: dts: > > qcom: sc7180: Fix trogdor qspi pull direction") [1] but since it's > > spiraled out a bit and there are no patches that are exactly the same > > I've reset to v1. > > > > The early patches in this series are just no-op cleanup patches that > > can be applied. They're not terribly critical but since they are > > "Fixes" I've listed them first. > > > > The next patch in the series is a very simple and (hopefully) > > non-controversial SPI patch. It can be applied independently if > > anything else. > > > > Next, we have a bunch of pinctrl patches (including the device tree > > bindings related to them). I dunno what folks are going to think about > > these. If everyone hates them, we can drop them and just change the > > later patches in the series to use "input-enable" instead of > > "output-disable". It feels ugly to me, but it maybe less upheval. > > > > Next I removed the now-deprecated "input-enable" property from all > > Chromebooks. None of them were necessary. > > > > Finally, I did what I really wanted to do in the first place: attempt > > to cleanup the pinctrl states of the Quad SPI. These patches have a > > hard requirement on the pinctrl change. > > This looks good to me (TM) > > Do you have a merge plan? > I can queue the pinctrl patch into the pinctrl tree, and > the pinctrl binding patches. > > Will you take the rest to the SPI and SoC tree? > > Acked-by: Linus Walleij <linus.walleij@linaro.org> My thoughts: 1. Mark could land the SPI patch at any time, assuming he's OK with it. It can land totally independently. 2. First 7 dts patches could land in the Qualcomm tree. There are no dependencies on these ones other than the commit message of some of the later dts patches talking about the pinctrl patches. ...then... Option A: 3. You land the pinctrl and binding patches in an immutable branch and merge into pinctrl. 4. Bjorn merges the immutable branch into the Qulacomm tree and places the last 3 dts patches atop. Option B: 3. You Ack the pinctrl patches and Bjorn lands them all, plus the last 3 dts patches. Option C: 3. You land the pinctrl patches, then we want a few months and land the last 3 dts patches.
On Thu, 23 Mar 2023 10:30:04 -0700, Douglas Anderson wrote: > The main goal of this series is to do a better job of controling the > pins related to the "Quad SPI" IP block on Qualcomm Chromebooks. This > is essentially 'v2' of my previous attempt in the patch ("arm64: dts: > qcom: sc7180: Fix trogdor qspi pull direction") [1] but since it's > spiraled out a bit and there are no patches that are exactly the same > I've reset to v1. > > [...] Applied to broonie/spi.git for-next Thanks! [05/14] spi: spi-qcom-qspi: Support pinctrl sleep states commit: 0098c52745112c4387942a37559ababeaf072f0c All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On Mon, Mar 27, 2023 at 11:51 PM Doug Anderson <dianders@chromium.org> wrote: > 1. Mark could land the SPI patch at any time, assuming he's OK with > it. It can land totally independently. OK this happened. > Option A: > > 3. You land the pinctrl and binding patches in an immutable branch and > merge into pinctrl. > > 4. Bjorn merges the immutable branch into the Qulacomm tree and places > the last 3 dts patches atop. Looks most appetizing. I have applied patches 6,7,8 to this immutable branch: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-qcom-quad-spi and I merged that into my "devel" branch for v6.4. Bjorn can grab the branch if he wants it. Yours, Linus Walleij
On Wed, Mar 29, 2023 at 10:50:34AM +0200, Linus Walleij wrote: > On Mon, Mar 27, 2023 at 11:51 PM Doug Anderson <dianders@chromium.org> wrote: > > > 1. Mark could land the SPI patch at any time, assuming he's OK with > > it. It can land totally independently. > > OK this happened. > > > Option A: > > > > 3. You land the pinctrl and binding patches in an immutable branch and > > merge into pinctrl. > > > > 4. Bjorn merges the immutable branch into the Qulacomm tree and places > > the last 3 dts patches atop. > > Looks most appetizing. > > I have applied patches 6,7,8 to this immutable branch: > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-qcom-quad-spi > > and I merged that into my "devel" branch for v6.4. > > Bjorn can grab the branch if he wants it. > Thank you, Bjorn > Yours, > Linus Walleij
On Thu, 23 Mar 2023 10:30:04 -0700, Douglas Anderson wrote: > The main goal of this series is to do a better job of controling the > pins related to the "Quad SPI" IP block on Qualcomm Chromebooks. This > is essentially 'v2' of my previous attempt in the patch ("arm64: dts: > qcom: sc7180: Fix trogdor qspi pull direction") [1] but since it's > spiraled out a bit and there are no patches that are exactly the same > I've reset to v1. > > [...] Applied, thanks! [01/14] arm64: dts: sc7180: Rename qspi data12 as data23 commit: d84f8f2687bdc67f20262e822b206419bcfd0038 [02/14] arm64: dts: sc7280: Rename qspi data12 as data23 commit: 14acf21c0d3f7b7298ffcd2e5b5db4a476ec6202 [03/14] arm64: dts: sdm845: Rename qspi data12 as data23 commit: 37f7349b56decc91c66f8039712e63740b1f25f9 [04/14] arm64: dts: qcom: sc7180: Annotate l13a on trogdor to always-on commit: ced32c299e5d6c447ad0b80d7a16b44e0e72e8e0 [09/14] arm64: dts: qcom: sc7180: Remove superfluous "input-enable"s from trogdor commit: e8df226339fa032c49f8db4281903930d018a22c [10/14] arm64: dts: qcom: sc7280: Remove superfluous "input-enable"s from idp-ec-h1 commit: 6d4794d658a0967a7f257f16d6a7a48afb8c8e05 [11/14] arm64: dts: qcom: sdm845: Remove superfluous "input-enable"s from cheza commit: 406fed87083578d07c7cea9483b85b51469594e0 [12/14] arm64: dts: qcom: sc7180: Fix trogdor qspi pin config commit: ab752f03e2feb3323dfd9c1ce161ac759ce09634 [13/14] arm64: dts: qcom: sc7280: Fix qspi pin config commit: 5f89df31096d67c244d8f36502f651ce701ddcde [14/14] arm64: dts: qcom: sdm845: Fix cheza qspi pin config commit: 9f5cdeb7031062a36e135ebb88bd99c03f32e5ee Best regards,
The main goal of this series is to do a better job of controling the pins related to the "Quad SPI" IP block on Qualcomm Chromebooks. This is essentially 'v2' of my previous attempt in the patch ("arm64: dts: qcom: sc7180: Fix trogdor qspi pull direction") [1] but since it's spiraled out a bit and there are no patches that are exactly the same I've reset to v1. The early patches in this series are just no-op cleanup patches that can be applied. They're not terribly critical but since they are "Fixes" I've listed them first. The next patch in the series is a very simple and (hopefully) non-controversial SPI patch. It can be applied independently if anything else. Next, we have a bunch of pinctrl patches (including the device tree bindings related to them). I dunno what folks are going to think about these. If everyone hates them, we can drop them and just change the later patches in the series to use "input-enable" instead of "output-disable". It feels ugly to me, but it maybe less upheval. Next I removed the now-deprecated "input-enable" property from all Chromebooks. None of them were necessary. Finally, I did what I really wanted to do in the first place: attempt to cleanup the pinctrl states of the Quad SPI. These patches have a hard requirement on the pinctrl change. [1] https://lore.kernel.org/r/20230213165743.1.I6f03f86546e6ce9abb1d24fd9ece663c3a5b950c@changeid Douglas Anderson (14): arm64: dts: sc7180: Rename qspi data12 as data23 arm64: dts: sc7280: Rename qspi data12 as data23 arm64: dts: sdm845: Rename qspi data12 as data23 arm64: dts: qcom: sc7180: Annotate l13a on trogdor to always-on spi: spi-qcom-qspi: Support pinctrl sleep states dt-bindings: pinctrl: qcom: tlmm should use output-disable, not input-enable dt-bindings: pinctrl: qcom: Add output-enable pinctrl: qcom: Support OUTPUT_ENABLE; deprecate INPUT_ENABLE arm64: dts: qcom: sc7180: Remove superfluous "input-enable"s from trogdor arm64: dts: qcom: sc7280: Remove superfluous "input-enable"s from idp-ec-h1 arm64: dts: qcom: sdm845: Remove superfluous "input-enable"s from cheza arm64: dts: qcom: sc7180: Fix trogdor qspi pin config arm64: dts: qcom: sc7280: Fix qspi pin config arm64: dts: qcom: sdm845: Fix cheza qspi pin config .../bindings/pinctrl/qcom,tlmm-common.yaml | 4 +- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 9 ++-- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 41 +++++++++++++------ arch/arm64/boot/dts/qcom/sc7180.dtsi | 11 +++-- .../boot/dts/qcom/sc7280-chrome-common.dtsi | 25 ++++++++++- .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 14 ++++--- .../arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 2 - arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 13 +++--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 11 +++-- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 37 ++++++++++++----- arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++-- drivers/pinctrl/qcom/pinctrl-msm.c | 36 +++++++++++++--- drivers/spi/spi-qcom-qspi.c | 5 +++ 13 files changed, 165 insertions(+), 54 deletions(-)