* [PATCH] dt-bindings: nvmem: mediatek: remove duplicate mt8192 line
@ 2021-04-27 21:01 Arnd Bergmann
2021-04-28 6:12 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-04-27 21:01 UTC (permalink / raw)
To: Srinivas Kandagatla, Rob Herring, Matthias Brugger, Ryan Wu,
Greg Kroah-Hartman
Cc: soc, Arnd Bergmann, Fabien Parent, devicetree, linux-arm-kernel,
linux-mediatek, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The same patch was accidentally merged twice, resulting in a
duplicate line for the mt8192 SoC.
Fixes: f2674c0c7488 ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC")
Fixes: 2a1405a14c3a ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
index d479ad977e24..2f2895b1f06d 100644
--- a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
+++ b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
@@ -7,7 +7,6 @@ Required properties:
"mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
"mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
"mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
- "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
"mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
"mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
- reg: Should contain registers location and length
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dt-bindings: nvmem: mediatek: remove duplicate mt8192 line
2021-04-27 21:01 [PATCH] dt-bindings: nvmem: mediatek: remove duplicate mt8192 line Arnd Bergmann
@ 2021-04-28 6:12 ` Greg Kroah-Hartman
2021-04-28 9:48 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2021-04-28 6:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Srinivas Kandagatla, Rob Herring, Matthias Brugger, Ryan Wu, soc,
Arnd Bergmann, Fabien Parent, devicetree, linux-arm-kernel,
linux-mediatek, linux-kernel
On Tue, Apr 27, 2021 at 11:01:08PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The same patch was accidentally merged twice, resulting in a
> duplicate line for the mt8192 SoC.
>
> Fixes: f2674c0c7488 ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC")
> Fixes: 2a1405a14c3a ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
> index d479ad977e24..2f2895b1f06d 100644
> --- a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
> +++ b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
> @@ -7,7 +7,6 @@ Required properties:
> "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
> "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
> "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
> - "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
> "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
> "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
Shouldn't you drop the bottom one here to keep this in sorted order?
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dt-bindings: nvmem: mediatek: remove duplicate mt8192 line
2021-04-28 6:12 ` Greg Kroah-Hartman
@ 2021-04-28 9:48 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-04-28 9:48 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Srinivas Kandagatla, Rob Herring, Matthias Brugger, Ryan Wu,
SoC Team, Fabien Parent, DTML, Linux ARM,
moderated list:ARM/Mediatek SoC...,
Linux Kernel Mailing List
On Wed, Apr 28, 2021 at 8:12 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> > @@ -7,7 +7,6 @@ Required properties:
> > "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
> > "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
> > "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
> > - "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
> > "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
> > "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
>
> Shouldn't you drop the bottom one here to keep this in sorted order?
Indeed. For some reason I assumed they were meant to be in chronological
order, but you are right that the others are all sorted alphanumerically.
Fixed in the arm/fixes branch, it was the only commit there. Thanks!
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-28 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-27 21:01 [PATCH] dt-bindings: nvmem: mediatek: remove duplicate mt8192 line Arnd Bergmann
2021-04-28 6:12 ` Greg Kroah-Hartman
2021-04-28 9:48 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).