Add vendor prefixes for manufacturers of Aspeed SoC based BMC boards:
ASrock, ByteDance, Ingrasys, Inventec and Quanta. Move also bticino to
proper alphabetical place.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/vendor-prefixes.yaml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 495a01ced97e..169f11ce4cc5 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -141,6 +141,8 @@ patternProperties:
description: ASIX Electronics Corporation
"^aspeed,.*":
description: ASPEED Technology Inc.
+ "^asrock,.*":
+ description: ASRock Inc.
"^asus,.*":
description: AsusTek Computer Inc.
"^atlas,.*":
@@ -195,12 +197,14 @@ patternProperties:
description: Broadcom Corporation
"^bsh,.*":
description: BSH Hausgeraete GmbH
+ "^bticino,.*":
+ description: Bticino International
"^buffalo,.*":
description: Buffalo, Inc.
"^bur,.*":
description: B&R Industrial Automation GmbH
- "^bticino,.*":
- description: Bticino International
+ "^bytedance,.*":
+ description: ByteDance Ltd.
"^calamp,.*":
description: CalAmp Corp.
"^calaosystems,.*":
@@ -544,6 +548,8 @@ patternProperties:
description: Shenzhen Hugsun Technology Co. Ltd.
"^hwacom,.*":
description: HwaCom Systems Inc.
+ "^hxt,.*":
+ description: HXT Semiconductor
"^hycon,.*":
description: Hycon Technology Corp.
"^hydis,.*":
@@ -578,6 +584,8 @@ patternProperties:
description: Infineon Technologies
"^inforce,.*":
description: Inforce Computing
+ "^ingrasys,.*":
+ description: Ingrasys Technology Inc.
"^ivo,.*":
description: InfoVision Optoelectronics Kunshan Co. Ltd.
"^ingenic,.*":
@@ -598,6 +606,8 @@ patternProperties:
description: Inter Control Group
"^invensense,.*":
description: InvenSense Inc.
+ "^inventec,.*":
+ description: Inventec
"^inversepath,.*":
description: Inverse Path
"^iom,.*":
@@ -1010,6 +1020,8 @@ patternProperties:
description: Shenzhen QiShenglong Industrialist Co., Ltd.
"^qnap,.*":
description: QNAP Systems, Inc.
+ "^quanta,.*":
+ description: Quanta Computer Inc.
"^radxa,.*":
description: Radxa
"^raidsonic,.*":
--
2.34.1
The AST2600 EVB board should have dedicated compatible.
Fixes: 2ca5646b5c2f ("ARM: dts: aspeed: Add AST2600 and EVB")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/aspeed-ast2600-evb.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-ast2600-evb.dts b/arch/arm/boot/dts/aspeed-ast2600-evb.dts
index 5a6063bd4508..c698e6538269 100644
--- a/arch/arm/boot/dts/aspeed-ast2600-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2600-evb.dts
@@ -8,7 +8,7 @@
/ {
model = "AST2600 EVB";
- compatible = "aspeed,ast2600";
+ compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600";
aliases {
serial4 = &uart5;
--
2.34.1
The AST2600 EVB A1 board should have dedicated compatible.
Fixes: a72955180372 ("ARM: dts: aspeed: ast2600evb: Add dts file for A1 and A0")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts b/arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts
index dd7148060c4a..d0a5c2ff0fec 100644
--- a/arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts
+++ b/arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts
@@ -5,6 +5,7 @@
/ {
model = "AST2600 A1 EVB";
+ compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600";
/delete-node/regulator-vcc-sdhci0;
/delete-node/regulator-vcc-sdhci1;
--
2.34.1
The AST2500 EVB board should have dedicated compatible.
Fixes: 02440622656d ("arm/dst: Add Aspeed ast2500 device tree")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 1d24b394ea4c..a497dd135491 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -5,7 +5,7 @@
/ {
model = "AST2500 EVB";
- compatible = "aspeed,ast2500";
+ compatible = "aspeed,ast2500-evb", "aspeed,ast2500";
aliases {
serial4 = &uart5;
--
2.34.1
Document all compatibles used in existing upstreamed Aspeed AST2400,
AST2500 and AST2600 based boards.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/arm/aspeed/aspeed.yaml | 83 +++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 84 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
diff --git a/Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml b/Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
new file mode 100644
index 000000000000..f214b57d5ae1
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
@@ -0,0 +1,83 @@
+# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/aspeed/aspeed.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Aspeed SoC based boards
+
+maintainers:
+ - Joel Stanley <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ oneOf:
+ - description: AST2400 based boards
+ items:
+ - enum:
+ - facebook,galaxy100-bmc
+ - facebook,wedge100-bmc
+ - facebook,wedge40-bmc
+ - microsoft,olympus-bmc
+ - quanta,q71l-bmc
+ - tyan,palmetto-bmc
+ - yadro,vesnin-bmc
+ - const: aspeed,ast2400
+
+ - description: AST2500 based boards
+ items:
+ - enum:
+ - amd,ethanolx-bmc
+ - ampere,mtjade-bmc
+ - asrock,e3c246d4i-bmc
+ - asrock,romed8hm3-bmc
+ - bytedance,g220a-bmc
+ - facebook,cmm-bmc
+ - facebook,minipack-bmc
+ - facebook,tiogapass-bmc
+ - facebook,yamp-bmc
+ - facebook,yosemitev2-bmc
+ - facebook,wedge400-bmc
+ - hxt,stardragon4800-rep2-bmc
+ - ibm,mihawk-bmc
+ - ibm,mowgli-bmc
+ - ibm,romulus-bmc
+ - ibm,swift-bmc
+ - ibm,witherspoon-bmc
+ - ingrasys,zaius-bmc
+ - inspur,fp5280g2-bmc
+ - inspur,nf5280m6-bmc
+ - inspur,on5263m5-bmc
+ - intel,s2600wf-bmc
+ - inventec,lanyang-bmc
+ - lenovo,hr630-bmc
+ - lenovo,hr855xg2-bmc
+ - portwell,neptune-bmc
+ - qcom,centriq2400-rep-bmc
+ - supermicro,x11spi-bmc
+ - tyan,s7106-bmc
+ - tyan,s8036-bmc
+ - yadro,nicole-bmc
+ - yadro,vegman-n110-bmc
+ - yadro,vegman-rx20-bmc
+ - yadro,vegman-sx20-bmc
+ - const: aspeed,ast2500
+
+ - description: AST2600 based boards
+ items:
+ - enum:
+ - facebook,bletchley-bmc
+ - facebook,cloudripper-bmc
+ - facebook,elbert-bmc
+ - facebook,fuji-bmc
+ - ibm,everest-bmc
+ - ibm,rainier-bmc
+ - ibm,tacoma-bmc
+ - inventec,transformer-bmc
+ - nuvia,dc-scm-bmc
+ - quanta,s6q-bmc
+ - const: aspeed,ast2600
+
+additionalProperties: true
diff --git a/MAINTAINERS b/MAINTAINERS
index c71276d7752e..860017ff41a8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1896,6 +1896,7 @@ L: [email protected] (moderated for non-subscribers)
S: Supported
Q: https://patchwork.ozlabs.org/project/linux-aspeed/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
+F: Documentation/devicetree/bindings/arm/aspeed/
F: arch/arm/boot/dts/aspeed-*
F: arch/arm/mach-aspeed/
N: aspeed
--
2.34.1
On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
> Add vendor prefixes for manufacturers of Aspeed SoC based BMC boards:
> ASrock, ByteDance, Ingrasys, Inventec and Quanta. Move also bticino to
> proper alphabetical place.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Joel, Andrew,
Any comments on this patchset? Are you going to pick it up? If you
prefer me taking it, I can, but new boards depend on the bindings, so
this should rather go via your tree.
Best regards,
Krzysztof
On Sun, 29 May 2022 12:49:22 +0200, Krzysztof Kozlowski wrote:
> Add vendor prefixes for manufacturers of Aspeed SoC based BMC boards:
> ASrock, ByteDance, Ingrasys, Inventec and Quanta. Move also bticino to
> proper alphabetical place.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/vendor-prefixes.yaml | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
Applying this one to avoid any conflicts.
Rob
On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
> Document all compatibles used in existing upstreamed Aspeed AST2400,
> AST2500 and AST2600 based boards.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/arm/aspeed/aspeed.yaml | 83 +++++++++++++++++++
> MAINTAINERS | 1 +
> 2 files changed, 84 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
Joel, Andrew,
Any comments on the series? Rob applied only patch 1, so the rest is
supposed through Aspeed tree. Shall I pick them up and send to arm-soc?
Best regards,
Krzysztof
On 20/06/2022 13:06, Krzysztof Kozlowski wrote:
> On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
>> Document all compatibles used in existing upstreamed Aspeed AST2400,
>> AST2500 and AST2600 based boards.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> ---
>> .../bindings/arm/aspeed/aspeed.yaml | 83 +++++++++++++++++++
>> MAINTAINERS | 1 +
>> 2 files changed, 84 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
>
> Joel, Andrew,
>
> Any comments on the series? Rob applied only patch 1, so the rest is
> supposed through Aspeed tree. Shall I pick them up and send to arm-soc?
I'll grab the bindings and DTS. I'll keep it on separate branch, so I
can share to avoid conflicts. If anyone prefers to pick it up, let me
know so I will drop them from my tree.
Best regards,
Krzysztof
On Sun, 29 May 2022 12:49:25 +0200, Krzysztof Kozlowski wrote:
> The AST2500 EVB board should have dedicated compatible.
>
>
Applied, thanks!
[4/7] ARM: dts: ast2500-evb: fix board compatible
https://git.kernel.org/krzk/linux/c/30b276fca5c0644f3cb17bceb1bd6a626c670184
Best regards,
--
Krzysztof Kozlowski <[email protected]>
On Sun, 29 May 2022 12:49:23 +0200, Krzysztof Kozlowski wrote:
> Document all compatibles used in existing upstreamed Aspeed AST2400,
> AST2500 and AST2600 based boards.
>
>
Applied, thanks!
[2/7] dt-bindings: arm: aspeed: document board compatibles
https://git.kernel.org/krzk/linux-dt/c/ae8980247d5af8528145713e07f1338abc57a00d
Best regards,
--
Krzysztof Kozlowski <[email protected]>
On Sun, 29 May 2022 12:49:27 +0200, Krzysztof Kozlowski wrote:
> The AST2600 EVB A1 board should have dedicated compatible.
>
>
Applied, thanks!
[6/7] ARM: dts: ast2600-evb-a1: fix board compatible
https://git.kernel.org/krzk/linux/c/33c39140cc298e0d4e36083cb9a665a837773a60
Best regards,
--
Krzysztof Kozlowski <[email protected]>
On Sun, 29 May 2022 12:49:26 +0200, Krzysztof Kozlowski wrote:
> The AST2600 EVB board should have dedicated compatible.
>
>
Applied, thanks!
[5/7] ARM: dts: ast2600-evb: fix board compatible
https://git.kernel.org/krzk/linux/c/aa5e06208500a0db41473caebdee5a2e81d5a277
Best regards,
--
Krzysztof Kozlowski <[email protected]>
On Mon, 20 Jun 2022 at 11:06, Krzysztof Kozlowski
<[email protected]> wrote:
>
> On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
> > Document all compatibles used in existing upstreamed Aspeed AST2400,
> > AST2500 and AST2600 based boards.
> >
> > Signed-off-by: Krzysztof Kozlowski <[email protected]>
> > ---
> > .../bindings/arm/aspeed/aspeed.yaml | 83 +++++++++++++++++++
> > MAINTAINERS | 1 +
> > 2 files changed, 84 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
>
> Joel, Andrew,
>
> Any comments on the series? Rob applied only patch 1, so the rest is
> supposed through Aspeed tree. Shall I pick them up and send to arm-soc?
I will take a look at them when it's time to send patches for the next
kernel release.
They should go through the aspeed tree like the rest of the aspeed
device tree patches.
Thanks,
Joel
>
> Best regards,
> Krzysztof
On 23/06/2022 07:36, Joel Stanley wrote:
> On Mon, 20 Jun 2022 at 11:06, Krzysztof Kozlowski
> <[email protected]> wrote:
>>
>> On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
>>> Document all compatibles used in existing upstreamed Aspeed AST2400,
>>> AST2500 and AST2600 based boards.
>>>
>>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>>> ---
>>> .../bindings/arm/aspeed/aspeed.yaml | 83 +++++++++++++++++++
>>> MAINTAINERS | 1 +
>>> 2 files changed, 84 insertions(+)
>>> create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
>>
>> Joel, Andrew,
>>
>> Any comments on the series? Rob applied only patch 1, so the rest is
>> supposed through Aspeed tree. Shall I pick them up and send to arm-soc?
>
> I will take a look at them when it's time to send patches for the next
> kernel release.
But that's not how the next development works. Patches, if proper/good,
should be applied in some reasonable amount of time and then sit in
maintainers tree. This way the patches will be in linux-next, assuming
that maintainer correctly added it to linux-next. All other people can
then easily base their work on linux-next or maintainer's tree and
continue their development.
Waiting with the patches till time to intreract with arm-soc (usually
some late in the cycle, like rc5-rc6), not providing review, does not
allow other people to see accepted contributions and base the work on them.
Really, there is no single reason to hold on patches till there is time
to send them to arm-soc. It's the first time I hear something like this
about SoC or any other tree.
>
> They should go through the aspeed tree like the rest of the aspeed
> device tree patches.
Of course, but somehow they were not going...
Best regards,
Krzysztof
On Thu, 9 Jun 2022, at 18:20, Krzysztof Kozlowski wrote:
> On 29/05/2022 12:49, Krzysztof Kozlowski wrote:
>> Add vendor prefixes for manufacturers of Aspeed SoC based BMC boards:
>> ASrock, ByteDance, Ingrasys, Inventec and Quanta. Move also bticino to
>> proper alphabetical place.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> ---
>
> Joel, Andrew,
>
> Any comments on this patchset? Are you going to pick it up? If you
> prefer me taking it, I can, but new boards depend on the bindings, so
> this should rather go via your tree.
Apologies for not getting to this earlier, but I see Rob's applied it.
Andrew
On 21/07/2022 04:34, Andrew Jeffery wrote:
>> Any comments on this patchset? Are you going to pick it up? If you
>> prefer me taking it, I can, but new boards depend on the bindings, so
>> this should rather go via your tree.
>
> Apologies for not getting to this earlier, but I see Rob's applied it.
Rob took only the first patch - vendor-prefix. The DTS patches I sent to
arm-soc.
However the second bindings patch [1] will miss merge window as I did
not send it to arm-soc. I have it in my tree but I am not planning to
push it out before merge window.
[1]
https://lore.kernel.org/all/[email protected]/
Best regards,
Krzysztof
On 21/07/2022 08:30, Krzysztof Kozlowski wrote:
> On 21/07/2022 04:34, Andrew Jeffery wrote:
>>> Any comments on this patchset? Are you going to pick it up? If you
>>> prefer me taking it, I can, but new boards depend on the bindings, so
>>> this should rather go via your tree.
>>
>> Apologies for not getting to this earlier, but I see Rob's applied it.
>
> Rob took only the first patch - vendor-prefix. The DTS patches I sent to
> arm-soc.
>
> However the second bindings patch [1] will miss merge window as I did
> not send it to arm-soc. I have it in my tree but I am not planning to
> push it out before merge window.
>
I sent pull with the bindings now.
Best regards,
Krzysztof
On Sun, 29 May 2022, at 20:19, Krzysztof Kozlowski wrote:
> The AST2500 EVB board should have dedicated compatible.
>
> Fixes: 02440622656d ("arm/dst: Add Aspeed ast2500 device tree")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Andrew Jeffery <[email protected]>