From: Arnd Bergmann <arnd@arndb.de> To: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <djbw@fb.com>, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Viresh Kumar <viresh.kumar@linaro.org>, Olof Johansson <olof@lixom.net>, linux-kernel@vger.kernel.org, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH 0/4] dw_dmac: introduce generic DMA binding for DT Date: Fri, 15 Feb 2013 19:21:48 +0100 [thread overview] Message-ID: <1360952512-971558-1-git-send-email-arnd@arndb.de> (raw) Hi Vinod, As Andy pointed out today, we don't have a good solution for the dw_dmac DT binding in linux-next yet. I have posted my series once before and then got distracted after getting feedback from Viresh, Andy and Russell. I have now updated my earlier patch based on the feedback and rebased on your tree without any of the arm-soc patches mixed in. Unfortunately the patches have never been tested on real hardware so I don't think it's a good idea to use them in v3.9 on the spear platform. However, your dma-slave tree still contains Viresh's earlier patches, causing a few problems: * With those patches, the spear3xx platform currently does not build. (this one would be easy to fix though) * There is a conflict between those patches and my spear multiplatform series, which I have not yet queued up for 3.9 because of this, since that would have meant that Stephen Rothwell would have to discard either the arm-soc tree or the dma-slave tree from linux-next. * I really don't want the broken binding to appear in 3.9. I believe the best way out at this point is this series, which first first reverts the patch f9965aa2 "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" from your tree and then adds my update. This will give us the right DT binding for dw-dmac but no in-tree users, which means that nothing should break if I get it slightly wrong. Please apply the first two patches from these set, and optionally the two patches that based on this convert the pl011 uart and pl022 spi controller drivers. I can then decide with Olof whether or not to take the spear multiplatform changes that no longer conflict with the dma slave tree as a "late" branch into 3.9 or wait until 3.10, but that is something you don't need to worry about then. Also the conversion of spear to use the new binding (patch 5 of my original series) can go through the arm-soc tree for 3.10 after the ST folks have tested that it works. Arnd Arnd Bergmann (4): Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" dmaengine: dw_dmac: move to generic DMA binding spi: pl022: use generic DMA slave configuration if possible serial: pl011: use generic DMA slave configuration if possible .../devicetree/bindings/arm/primecell.txt | 19 ++- Documentation/devicetree/bindings/dma/snps-dma.txt | 70 ++++++----- Documentation/devicetree/bindings/serial/pl011.txt | 17 +++ .../devicetree/bindings/spi/spi_pl022.txt | 36 ++++++ arch/arm/boot/dts/spear1340.dtsi | 19 --- arch/arm/boot/dts/spear13xx.dtsi | 38 ------ arch/arm/mach-spear13xx/include/mach/spear.h | 2 + arch/arm/mach-spear13xx/spear1310.c | 5 +- arch/arm/mach-spear13xx/spear1340.c | 33 +++-- arch/arm/mach-spear13xx/spear13xx.c | 55 ++++++++- drivers/dma/dw_dmac.c | 137 ++++++++++----------- drivers/dma/dw_dmac_regs.h | 8 +- drivers/spi/spi-pl022.c | 43 ++++++- drivers/tty/serial/amba-pl011.c | 62 ++++++---- include/linux/dw_dmac.h | 5 - 15 files changed, 333 insertions(+), 216 deletions(-) create mode 100644 Documentation/devicetree/bindings/serial/pl011.txt -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 0/4] dw_dmac: introduce generic DMA binding for DT Date: Fri, 15 Feb 2013 19:21:48 +0100 [thread overview] Message-ID: <1360952512-971558-1-git-send-email-arnd@arndb.de> (raw) Hi Vinod, As Andy pointed out today, we don't have a good solution for the dw_dmac DT binding in linux-next yet. I have posted my series once before and then got distracted after getting feedback from Viresh, Andy and Russell. I have now updated my earlier patch based on the feedback and rebased on your tree without any of the arm-soc patches mixed in. Unfortunately the patches have never been tested on real hardware so I don't think it's a good idea to use them in v3.9 on the spear platform. However, your dma-slave tree still contains Viresh's earlier patches, causing a few problems: * With those patches, the spear3xx platform currently does not build. (this one would be easy to fix though) * There is a conflict between those patches and my spear multiplatform series, which I have not yet queued up for 3.9 because of this, since that would have meant that Stephen Rothwell would have to discard either the arm-soc tree or the dma-slave tree from linux-next. * I really don't want the broken binding to appear in 3.9. I believe the best way out at this point is this series, which first first reverts the patch f9965aa2 "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" from your tree and then adds my update. This will give us the right DT binding for dw-dmac but no in-tree users, which means that nothing should break if I get it slightly wrong. Please apply the first two patches from these set, and optionally the two patches that based on this convert the pl011 uart and pl022 spi controller drivers. I can then decide with Olof whether or not to take the spear multiplatform changes that no longer conflict with the dma slave tree as a "late" branch into 3.9 or wait until 3.10, but that is something you don't need to worry about then. Also the conversion of spear to use the new binding (patch 5 of my original series) can go through the arm-soc tree for 3.10 after the ST folks have tested that it works. Arnd Arnd Bergmann (4): Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" dmaengine: dw_dmac: move to generic DMA binding spi: pl022: use generic DMA slave configuration if possible serial: pl011: use generic DMA slave configuration if possible .../devicetree/bindings/arm/primecell.txt | 19 ++- Documentation/devicetree/bindings/dma/snps-dma.txt | 70 ++++++----- Documentation/devicetree/bindings/serial/pl011.txt | 17 +++ .../devicetree/bindings/spi/spi_pl022.txt | 36 ++++++ arch/arm/boot/dts/spear1340.dtsi | 19 --- arch/arm/boot/dts/spear13xx.dtsi | 38 ------ arch/arm/mach-spear13xx/include/mach/spear.h | 2 + arch/arm/mach-spear13xx/spear1310.c | 5 +- arch/arm/mach-spear13xx/spear1340.c | 33 +++-- arch/arm/mach-spear13xx/spear13xx.c | 55 ++++++++- drivers/dma/dw_dmac.c | 137 ++++++++++----------- drivers/dma/dw_dmac_regs.h | 8 +- drivers/spi/spi-pl022.c | 43 ++++++- drivers/tty/serial/amba-pl011.c | 62 ++++++---- include/linux/dw_dmac.h | 5 - 15 files changed, 333 insertions(+), 216 deletions(-) create mode 100644 Documentation/devicetree/bindings/serial/pl011.txt -- 1.8.1.2
next reply other threads:[~2013-02-15 18:21 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-15 18:21 Arnd Bergmann [this message] 2013-02-15 18:21 ` [PATCH 0/4] dw_dmac: introduce generic DMA binding for DT Arnd Bergmann 2013-02-15 18:21 ` [PATCH 1/4] Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" Arnd Bergmann 2013-02-15 18:21 ` Arnd Bergmann 2013-02-15 18:21 ` [PATCH 2/4] dmaengine: dw_dmac: move to generic DMA binding Arnd Bergmann 2013-02-15 18:21 ` Arnd Bergmann 2013-02-15 18:21 ` Arnd Bergmann 2013-02-16 3:26 ` Viresh Kumar 2013-02-16 3:26 ` Viresh Kumar 2013-02-16 10:07 ` Arnd Bergmann 2013-02-16 10:07 ` Arnd Bergmann 2013-02-16 10:07 ` Arnd Bergmann 2013-02-16 10:51 ` Russell King - ARM Linux 2013-02-16 10:51 ` Russell King - ARM Linux 2013-02-16 10:51 ` Russell King - ARM Linux 2013-02-16 13:43 ` Arnd Bergmann 2013-02-16 13:43 ` Arnd Bergmann 2013-02-16 11:13 ` Andy Shevchenko 2013-02-16 11:13 ` Andy Shevchenko 2013-02-16 11:13 ` Andy Shevchenko 2013-02-16 14:00 ` Arnd Bergmann 2013-02-16 14:00 ` Arnd Bergmann 2013-02-16 14:00 ` Arnd Bergmann 2013-02-16 14:53 ` Andy Shevchenko 2013-02-16 14:53 ` Andy Shevchenko 2013-02-16 22:21 ` [PATCHv3 " Arnd Bergmann 2013-02-16 22:21 ` Arnd Bergmann 2013-02-16 22:21 ` Arnd Bergmann 2013-02-16 22:54 ` Andy Shevchenko 2013-02-16 22:54 ` Andy Shevchenko 2013-02-16 23:24 ` [PATCHv4 " Arnd Bergmann 2013-02-16 23:24 ` Arnd Bergmann 2013-02-16 23:24 ` Arnd Bergmann 2013-02-16 23:28 ` [PATCHv3 " Arnd Bergmann 2013-02-16 23:28 ` Arnd Bergmann 2013-02-16 22:23 ` [BONUS PATCH] dmaengine: dw_dmac: simplify master selection Arnd Bergmann 2013-02-16 22:23 ` Arnd Bergmann 2013-02-15 18:21 ` [PATCH 3/4] spi: pl022: use generic DMA slave configuration if possible Arnd Bergmann 2013-02-15 18:21 ` Arnd Bergmann 2013-02-15 18:21 ` [PATCH 4/4] serial: pl011: " Arnd Bergmann 2013-02-15 18:21 ` Arnd Bergmann 2013-02-16 3:26 ` [PATCH 0/4] dw_dmac: introduce generic DMA binding for DT Viresh Kumar 2013-02-16 3:26 ` Viresh Kumar 2013-02-16 3:26 ` Viresh Kumar 2013-02-20 8:03 ` Vinod Koul 2013-02-20 8:03 ` Vinod Koul 2013-02-20 9:50 ` Arnd Bergmann 2013-02-20 9:50 ` Arnd Bergmann 2013-02-20 9:50 ` Arnd Bergmann 2013-02-20 9:58 ` Vinod Koul 2013-02-20 9:58 ` Vinod Koul 2013-02-20 11:10 ` Arnd Bergmann 2013-02-20 11:10 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1360952512-971558-1-git-send-email-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=andriy.shevchenko@linux.intel.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=djbw@fb.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=olof@lixom.net \ --cc=vinod.koul@intel.com \ --cc=viresh.kumar@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.