| Message ID | 20180116160618.27859-2-peda@axentia.se |
|---|---|
| State | Accepted |
| Delegated to: | Bartosz Golaszewski |
| Headers | show |
| Series | use correct compatibles for the nxp,se97b chips | expand |
2018-01-16 17:06 GMT+01:00 Peter Rosin <peda@axentia.se>: > Makes them easier to find. > > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt > index 1812c848e369..abfae1beca2b 100644 > --- a/Documentation/devicetree/bindings/eeprom/at24.txt > +++ b/Documentation/devicetree/bindings/eeprom/at24.txt > @@ -38,9 +38,9 @@ Required properties: > > "catalyst", > "microchip", > + "nxp", > "ramtron", > "renesas", > - "nxp", > "st", > > Some vendors use different model names for chips which are just > -- > 2.11.0 > Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>
On Tue, Jan 16, 2018 at 05:06:15PM +0100, Peter Rosin wrote: > Makes them easier to find. > > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This one should go into 4.16. I can apply after rc1 or apply to tree with at24.txt changes queued. Acked-by: Rob Herring <robh@kernel.org> Rob
2018-01-29 17:17 GMT+01:00 Rob Herring <robh@kernel.org>: > On Tue, Jan 16, 2018 at 05:06:15PM +0100, Peter Rosin wrote: >> Makes them easier to find. >> >> Signed-off-by: Peter Rosin <peda@axentia.se> >> --- >> Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > This one should go into 4.16. I can apply after rc1 or apply to tree > with at24.txt changes queued. > > Acked-by: Rob Herring <robh@kernel.org> > > Rob Wolfram, can you take this via the i2c tree for 4.16? Thanks, Bartosz
On Mon, Jan 29, 2018 at 05:56:52PM +0100, Bartosz Golaszewski wrote: > 2018-01-29 17:17 GMT+01:00 Rob Herring <robh@kernel.org>: > > On Tue, Jan 16, 2018 at 05:06:15PM +0100, Peter Rosin wrote: > >> Makes them easier to find. > >> > >> Signed-off-by: Peter Rosin <peda@axentia.se> > >> --- > >> Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > This one should go into 4.16. I can apply after rc1 or apply to tree > > with at24.txt changes queued. > > > > Acked-by: Rob Herring <robh@kernel.org> > > > > Rob > > Wolfram, > > can you take this via the i2c tree for 4.16? I missed this mail because I leave at24 patches to you now. Please send pull requests for patches I shall take. Least room for confusion (I hope).
2018-02-21 10:11 GMT+01:00 Wolfram Sang <wsa@the-dreams.de>: > On Mon, Jan 29, 2018 at 05:56:52PM +0100, Bartosz Golaszewski wrote: >> 2018-01-29 17:17 GMT+01:00 Rob Herring <robh@kernel.org>: >> > On Tue, Jan 16, 2018 at 05:06:15PM +0100, Peter Rosin wrote: >> >> Makes them easier to find. >> >> >> >> Signed-off-by: Peter Rosin <peda@axentia.se> >> >> --- >> >> Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- >> >> 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > This one should go into 4.16. I can apply after rc1 or apply to tree >> > with at24.txt changes queued. >> > >> > Acked-by: Rob Herring <robh@kernel.org> >> > >> > Rob >> >> Wolfram, >> >> can you take this via the i2c tree for 4.16? > > I missed this mail because I leave at24 patches to you now. > Please send pull requests for patches I shall take. Least room for > confusion (I hope). > Will do. What about this (http://patchwork.ozlabs.org/patch/867169/) one? It's part of a bigger series, do you want me to apply it to my tree and provide you with an immutable branch? Bart
> Will do. What about this (http://patchwork.ozlabs.org/patch/867169/) > one? It's part of a bigger series, do you want me to apply it to my > tree and provide you with an immutable branch? Well, I would accept it for 4.16 using the "plain new id" rule. So, if you add it on top of Peter's sorting patch, totally fine by me. If you want it in v4.17, ok, too. I'd think an immutable branch is not needed. There is a fallback property in the DTS. So at worst, there will be a DTS warning during the merge window which will be fixed at rc1 time. Unless I overlooked something.
2018-02-21 10:40 GMT+01:00 Wolfram Sang <wsa@the-dreams.de>: > >> Will do. What about this (http://patchwork.ozlabs.org/patch/867169/) >> one? It's part of a bigger series, do you want me to apply it to my >> tree and provide you with an immutable branch? > > Well, I would accept it for 4.16 using the "plain new id" rule. So, if > you add it on top of Peter's sorting patch, totally fine by me. > > If you want it in v4.17, ok, too. I'd think an immutable branch is not > needed. There is a fallback property in the DTS. So at worst, there will > be a DTS warning during the merge window which will be fixed at rc1 time. > > Unless I overlooked something. > Ok, I'll have some time during the weekend, so I'll send a PR for rc3. Bart
> Ok, I'll have some time during the weekend, so I'll send a PR for rc3.
Well, I am away this weekend, so I just sent out my pull request. But we
can make it for rc4, no problem.
2018-02-23 11:32 GMT+01:00 Wolfram Sang <wsa@the-dreams.de>: > >> Ok, I'll have some time during the weekend, so I'll send a PR for rc3. > > Well, I am away this weekend, so I just sent out my pull request. But we > can make it for rc4, no problem. > Yeah, I actually meant rc4. Bart
2018-01-16 17:06 GMT+01:00 Peter Rosin <peda@axentia.se>: > Makes them easier to find. > > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt > index 1812c848e369..abfae1beca2b 100644 > --- a/Documentation/devicetree/bindings/eeprom/at24.txt > +++ b/Documentation/devicetree/bindings/eeprom/at24.txt > @@ -38,9 +38,9 @@ Required properties: > > "catalyst", > "microchip", > + "nxp", > "ramtron", > "renesas", > - "nxp", > "st", > > Some vendors use different model names for chips which are just > -- > 2.11.0 > Applied to for-current. Thanks.
diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt index 1812c848e369..abfae1beca2b 100644 --- a/Documentation/devicetree/bindings/eeprom/at24.txt +++ b/Documentation/devicetree/bindings/eeprom/at24.txt @@ -38,9 +38,9 @@ Required properties: "catalyst", "microchip", + "nxp", "ramtron", "renesas", - "nxp", "st", Some vendors use different model names for chips which are just
Makes them easier to find. Signed-off-by: Peter Rosin <peda@axentia.se> --- Documentation/devicetree/bindings/eeprom/at24.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)