diff for duplicates of <1492996197.25397.12.camel@buserror.net> diff --git a/a/1.txt b/N1/1.txt index 5487e59..5df7195 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,9 +5,9 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > > Signed-off-by: Roy Pledge <roy.pledge@nxp.com> > --- -> Documentation/devicetree/bindings/soc/fsl/bman.txt | 11 ++++++----- -> Documentation/devicetree/bindings/soc/fsl/qman.txt | 18 +++++++++++------- -> 2 files changed, 17 insertions(+), 12 deletions(-) +> ?Documentation/devicetree/bindings/soc/fsl/bman.txt | 11 ++++++----- +> ?Documentation/devicetree/bindings/soc/fsl/qman.txt | 18 +++++++++++------- +> ?2 files changed, 17 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt > b/Documentation/devicetree/bindings/soc/fsl/bman.txt @@ -15,9 +15,9 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > --- a/Documentation/devicetree/bindings/soc/fsl/bman.txt > +++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt > @@ -65,8 +65,8 @@ to the respective BMan instance -> BMan Private Memory Node -> -> BMan requires a contiguous range of physical memory used for the backing +> ?BMan Private Memory Node +> ? +> ?BMan requires a contiguous range of physical memory used for the backing > store > -for BMan Free Buffer Proxy Records (FBPR). This memory is > reserved/allocated as a @@ -25,34 +25,34 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > +for BMan Free Buffer Proxy Records (FBPR). This memory is > reserved/allocated as > +a node under the /reserved-memory node. -> -> The BMan FBPR memory node must be named "bman-fbpr" -> +> ? +> ?The BMan FBPR memory node must be named "bman-fbpr" +> ? > @@ -75,7 +75,8 @@ PROPERTIES -> - compatible -> Usage: required -> Value type: <stringlist> +> ?- compatible +> ? Usage: required +> ? Value type: <stringlist> > - Definition: Must inclide "fsl,bman-fbpr" > + Definition: PPC platforms: Must include "fsl,bman-fbpr" > + ARM platforms: Must include "shared-dma-pool" -> -> The following constraints are relevant to the FBPR private memory: -> - The size must be 2^(size + 1), with size = 11..33. That is 4 KiB +> ? +> ?The following constraints are relevant to the FBPR private memory: +> ? - The size must be 2^(size + 1), with size = 11..33. That is 4 KiB > to > @@ -100,10 +101,10 @@ The example below shows a BMan FBPR dynamic allocation > memory node -> ranges; -> -> bman_fbpr: bman-fbpr { +> ? ranges; +> ? +> ? bman_fbpr: bman-fbpr { > - compatible = "fsl,bman-fbpr"; > - alloc-ranges = <0 0 0x10 0>; > + compatible = "shared-mem-pool"; -> size = <0 0x1000000>; -> alignment = <0 0x1000000>; +> ? size = <0 0x1000000>; +> ? alignment = <0 0x1000000>; > + no-map; -> }; -> }; -> +> ? }; +> ? }; +> ? The requirement for using no-map with shared-mem-pool should be explicitly stated, not just in the example. diff --git a/a/content_digest b/N1/content_digest index fdf5d34..5459046 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01492634930-10765-1-git-send-email-roy.pledge@nxp.com\0" "ref\01492634930-10765-4-git-send-email-roy.pledge@nxp.com\0" - "From\0Scott Wood <oss@buserror.net>\0" - "Subject\0Re: [PATCH v2 03/11] dt-bindings: soc/fsl: Update reserved memory binding for QBMan\0" + "From\0oss@buserror.net (Scott Wood)\0" + "Subject\0[PATCH v2 03/11] dt-bindings: soc/fsl: Update reserved memory binding for QBMan\0" "Date\0Sun, 23 Apr 2017 20:09:57 -0500\0" - "To\0roy.pledge@nxp.com" - linuxppc-dev@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " robin.murphy@arm.com\0" - "Cc\0madalin.bucur@nxp.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote:\n" @@ -18,9 +13,9 @@ "> \n" "> Signed-off-by: Roy Pledge <roy.pledge@nxp.com>\n" "> ---\n" - "> \302\240Documentation/devicetree/bindings/soc/fsl/bman.txt | 11 ++++++-----\n" - "> \302\240Documentation/devicetree/bindings/soc/fsl/qman.txt | 18 +++++++++++-------\n" - "> \302\2402 files changed, 17 insertions(+), 12 deletions(-)\n" + "> ?Documentation/devicetree/bindings/soc/fsl/bman.txt | 11 ++++++-----\n" + "> ?Documentation/devicetree/bindings/soc/fsl/qman.txt | 18 +++++++++++-------\n" + "> ?2 files changed, 17 insertions(+), 12 deletions(-)\n" "> \n" "> diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt\n" "> b/Documentation/devicetree/bindings/soc/fsl/bman.txt\n" @@ -28,9 +23,9 @@ "> --- a/Documentation/devicetree/bindings/soc/fsl/bman.txt\n" "> +++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt\n" "> @@ -65,8 +65,8 @@ to the respective BMan instance\n" - "> \302\240BMan Private Memory Node\n" - "> \302\240\n" - "> \302\240BMan requires a contiguous range of physical memory used for the backing\n" + "> ?BMan Private Memory Node\n" + "> ?\n" + "> ?BMan requires a contiguous range of physical memory used for the backing\n" "> store\n" "> -for BMan Free Buffer Proxy Records (FBPR). This memory is\n" "> reserved/allocated as a\n" @@ -38,38 +33,38 @@ "> +for BMan Free Buffer Proxy Records (FBPR). This memory is\n" "> reserved/allocated as\n" "> +a node under the /reserved-memory node.\n" - "> \302\240\n" - "> \302\240The BMan FBPR memory node must be named \"bman-fbpr\"\n" - "> \302\240\n" + "> ?\n" + "> ?The BMan FBPR memory node must be named \"bman-fbpr\"\n" + "> ?\n" "> @@ -75,7 +75,8 @@ PROPERTIES\n" - "> \302\240- compatible\n" - "> \302\240\tUsage:\t\trequired\n" - "> \302\240\tValue type:\t<stringlist>\n" + "> ?- compatible\n" + "> ?\tUsage:\t\trequired\n" + "> ?\tValue type:\t<stringlist>\n" "> -\tDefinition:\tMust inclide \"fsl,bman-fbpr\"\n" "> +\tDefinition:\tPPC platforms: Must include \"fsl,bman-fbpr\"\n" "> +\t\t\tARM platforms: Must include \"shared-dma-pool\"\n" - "> \302\240\n" - "> \302\240The following constraints are relevant to the FBPR private memory:\n" - "> \302\240\t- The size must be 2^(size + 1), with size = 11..33. That is 4 KiB\n" + "> ?\n" + "> ?The following constraints are relevant to the FBPR private memory:\n" + "> ?\t- The size must be 2^(size + 1), with size = 11..33. That is 4 KiB\n" "> to\n" "> @@ -100,10 +101,10 @@ The example below shows a BMan FBPR dynamic allocation\n" "> memory node\n" - "> \302\240\t\tranges;\n" - "> \302\240\n" - "> \302\240\t\tbman_fbpr: bman-fbpr {\n" + "> ?\t\tranges;\n" + "> ?\n" + "> ?\t\tbman_fbpr: bman-fbpr {\n" "> -\t\t\tcompatible = \"fsl,bman-fbpr\";\n" "> -\t\t\talloc-ranges = <0 0 0x10 0>;\n" "> +\t\t\tcompatible = \"shared-mem-pool\";\n" - "> \302\240\t\t\tsize = <0 0x1000000>;\n" - "> \302\240\t\t\talignment = <0 0x1000000>;\n" + "> ?\t\t\tsize = <0 0x1000000>;\n" + "> ?\t\t\talignment = <0 0x1000000>;\n" "> +\t\t\tno-map;\n" - "> \302\240\t\t};\n" - "> \302\240\t};\n" - "> \302\240\n" + "> ?\t\t};\n" + "> ?\t};\n" + "> ?\n" "\n" "The requirement for using no-map with shared-mem-pool should be explicitly\n" "stated, not just in the example.\n" "\n" -Scott -1b88a3d5c7ac26a462aa85a4d3e3fc68bb26f20a71d55ed1e9c9ac1996bcf8b5 +ed30f987b30eec58920a626b33f1e56116713bacdf43562ef3bee045438b8ec2
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.