| Message ID | 20200420121403.aff9fb209ee0da7f20ed3ae2@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dts: uniphier: Add Akebi96 Board support | expand |
On Mon, Apr 20, 2020 at 12:14 PM Linaro <masami.hiramatsu@linaro.org> wrote: > > Add uniphier-ld20-akebi96 compatible string for > Akebi96 board support. > > Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> > --- > .../bindings/arm/socionext/uniphier.yaml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > index 113f93b9ae55..6caf1f9be390 100644 > --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > @@ -51,6 +51,7 @@ properties: > - description: LD20 SoC boards > items: > - enum: > + - socionext,uniphier-ld20-akebi96 > - socionext,uniphier-ld20-global > - socionext,uniphier-ld20-ref > - const: socionext,uniphier-ld20 > Your patch submission is still strange. https://patchwork.kernel.org/patch/11498025/ This patch is broken. Please make sure it can apply to the mainline code. The author files is also odd: From: Linaro <masami.hiramatsu@linaro.org>
Hi Yamada-san, 2020年4月20日(月) 18:26 Masahiro Yamada <masahiroy@kernel.org>: > > On Mon, Apr 20, 2020 at 12:14 PM Linaro <masami.hiramatsu@linaro.org> wrote: > > > > Add uniphier-ld20-akebi96 compatible string for > > Akebi96 board support. > > > > Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> > > --- > > .../bindings/arm/socionext/uniphier.yaml | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > > index 113f93b9ae55..6caf1f9be390 100644 > > --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > > +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > > @@ -51,6 +51,7 @@ properties: > > - description: LD20 SoC boards > > items: > > - enum: > > + - socionext,uniphier-ld20-akebi96 > > - socionext,uniphier-ld20-global > > - socionext,uniphier-ld20-ref > > - const: socionext,uniphier-ld20 > > > > Your patch submission is still strange. > > https://patchwork.kernel.org/patch/11498025/ > > This patch is broken. > > Please make sure it can apply to the mainline code. Ah, since it is based on the linux-nex. OK, I'll update it to the mainline kernel. > > > The author files is also odd: > From: Linaro <masami.hiramatsu@linaro.org> Oops, sorry, it was my mis-configure of MUA... OK, fixed it. Thank you!
Hiramatsu-san On Mon, Apr 20, 2020 at 6:31 PM Masami Hiramatsu > > Your patch submission is still strange. > > > > https://patchwork.kernel.org/patch/11498025/ > > > > This patch is broken. > > > > Please make sure it can apply to the mainline code. > > Ah, since it is based on the linux-nex. > OK, I'll update it to the mainline kernel. Oh, I did not notice the invasive reformating. Another way to merge this cleanly is to ask this to Rob Herring. Either is OK to me. -- Best Regards Masahiro Yamada
Hi Yamada-san, 2020年4月20日(月) 18:48 Masahiro Yamada <masahiroy@kernel.org>: > > Hiramatsu-san > > On Mon, Apr 20, 2020 at 6:31 PM Masami Hiramatsu > > > Your patch submission is still strange. > > > > > > https://patchwork.kernel.org/patch/11498025/ > > > > > > This patch is broken. > > > > > > Please make sure it can apply to the mainline code. > > > > Ah, since it is based on the linux-nex. > > OK, I'll update it to the mainline kernel. > > > Oh, I did not notice the invasive reformating. > > Another way to merge this cleanly is to ask this to Rob Herring. > Either is OK to me. Oh, let me update the series to fix the silly author line :( And anyway, I've prepared the mainline kernel patch. Since it is a minor merge conflict, I would like to send v2 for the mainline kernel. Rob, if you want a new version, please let me know. I can repost it :) Thank you,
diff --git a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml index 113f93b9ae55..6caf1f9be390 100644 --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml @@ -51,6 +51,7 @@ properties: - description: LD20 SoC boards items: - enum: + - socionext,uniphier-ld20-akebi96 - socionext,uniphier-ld20-global - socionext,uniphier-ld20-ref - const: socionext,uniphier-ld20
Add uniphier-ld20-akebi96 compatible string for Akebi96 board support. Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> --- .../bindings/arm/socionext/uniphier.yaml | 1 + 1 file changed, 1 insertion(+)