On Wed, Apr 20, 2022 at 10:26 PM Rob Herring <robh+dt@xxxxxxxxxx> wrote: > > On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@xxxxxxxxxxx> wrote: > > > > On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@xxxxxxxxxx wrote: > > > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@xxxxxxxxxx> wrote: > > >> > > >> On 11-04-22, 10:51, Zong Li wrote: > > >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@xxxxxxxxxx> wrote: > > >> > > > > >> > > On 28-03-22, 17:52, Zong Li wrote: > > >> > > > The PDMA driver currently assumes there are four channels by default, it > > >> > > > might cause the error if there is actually less than four channels. > > >> > > > Change that by getting number of channel dynamically from device tree. > > >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there > > >> > > > is no 'dma-channels' information in dts. > > >> > > > > >> > > Applied patch 1 & 4 to dmaengine-next, thanks > > >> > > > >> > Hi Vinod, > > >> > Thanks for your help and review. For patch 2 and 3, does it mean that > > >> > we should go through the riscv tree? > > >> > > >> Yes > > >> > > > > > > Hi Palmer, > > > Could you please help me to pick up the patch 2 and 3. Thanks :) > > > > Sorry about that, I forgot about this one. I just put them on for-next, > > there was a minor merge conflict but it looks pretty simple. > > Looks like you applied patch 1 too which Vinod already applied to the > dmaengine tree. And you changed the 1st line removing the "# " before > the SPDX tag which results in: Hi Palmer, Many thanks for helping me to pick them into riscv-tree, It seems like we need to pick patch 2 and 3 in riscv tree, instead of patch 1 and 2. :) > > make[1]: *** Deleting file > 'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts' > Traceback (most recent call last): > File "/usr/local/bin/dt-extract-example", line 52, in <module> > binding = yaml.load(open(args.yamlfile, encoding='utf-8').read()) > File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py", > line 434, in load > return constructor.get_single_data() > File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py", > line 119, in get_single_data > node = self.composer.get_single_node() > File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node > ruamel.yaml.composer.ComposerError: expected a single document in the stream > in "<unicode string>", line 1, column 1 > but found another document > in "<unicode string>", line 2, column 1 > make[1]: *** [Documentation/devicetree/bindings/Makefile:26: > Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts] > Error 1 > ./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1: > [error] missing document start "---" (document-start) > > > Rob