On 8/29/20 11:41 AM, Grygorii Strashko wrote:
Hi Santosh,

I've rebased on top of  linux-next and identified merge conflict of patch 3
with commit 6da45875fa17 ("arm64: dts: k3-am65: Update the RM resource types")
in -next.

---
This series adds support for the TI AM65x SR2.0 SoC Ringacc which has fixed
errata i2023 "RINGACC, UDMA: RINGACC and UDMA Ring State Interoperability
Issue after Channel Teardown". This errata also fixed for J271E SoC.
The SOC bus chipinfo data is used to identify the SoC and configure
i2023 errata W/A.

This changes made "ti,dma-ring-reset-quirk" DT property obsolete, so it's 
removed.

Changes in v2:
  - no functional changes
  - rebased on top of linux-next
  - added ask from Rob Herring

Thanks. Can you please followup DT acks for PRUSS series so that I can
apply PRUSS + $subject series.

v1: 
https://urldefense.com/v3/__https://lore.kernel.org/patchwork/cover/1284233/__;!!GqivPVa7Brio!PCmZ-nZZ6YQak-0T43bPZYI0gHsYL9k6N7S2gZEFbIr8BRKtv2BK01VejQzlBPBBgcfvCQ$
Grygorii Strashko (3):
   soc: ti: k3: ringacc: add am65x sr2.0 support
   bindings: soc: ti: soc: ringacc: remove ti,dma-ring-reset-quirk
   arm64: dts: ti: k3-am65: ringacc: drop ti,dma-ring-reset-quirk

  .../bindings/soc/ti/k3-ringacc.yaml           |  6 ----
  arch/arm64/boot/dts/ti/k3-am65-main.dtsi      |  1 -
  arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi       |  1 -
  drivers/soc/ti/k3-ringacc.c                   | 33 +++++++++++++++++--
  4 files changed, 30 insertions(+), 11 deletions(-)

Reply via email to