* [PATCH 1/7] ARM: dts: aspeed: Fix coprocessor interrupt controller node name
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 2/7] ARM: dts: aspeed: Specify correct generic compatible for CVIC Andrew Jeffery
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Squash schema warnings such as:
```
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: copro-interrupt-controller@1e6c2000: $nodename:0: 'copro-interrupt-controller@1e6c2000' does not match '^interrupt-controller(@[0-9a-f,]+)*$'
```
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 2 +-
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
index c669ec202085..267a0c8e828b 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
@@ -122,7 +122,7 @@ vic: interrupt-controller@1e6c0080 {
reg = <0x1e6c0080 0x80>;
};
- cvic: copro-interrupt-controller@1e6c2000 {
+ cvic: interrupt-controller@1e6c2000 {
compatible = "aspeed,ast2400-cvic", "aspeed-cvic";
valid-sources = <0x7fffffff>;
reg = <0x1e6c2000 0x80>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
index 6e05cbcce49c..4d805cf344a1 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
@@ -139,7 +139,7 @@ vic: interrupt-controller@1e6c0080 {
reg = <0x1e6c0080 0x80>;
};
- cvic: copro-interrupt-controller@1e6c2000 {
+ cvic: interrupt-controller@1e6c2000 {
compatible = "aspeed,ast2500-cvic", "aspeed-cvic";
valid-sources = <0xffffffff>;
copro-sw-interrupts = <1>;
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/7] ARM: dts: aspeed: Specify correct generic compatible for CVIC
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
2024-08-02 4:25 ` [PATCH 1/7] ARM: dts: aspeed: Fix coprocessor interrupt controller node name Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 3/7] ARM: dts: aspeed: Specify required properties for sram node Andrew Jeffery
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
The ASPEED CVIC binding documents `aspeed,cvic` as the required generic
compatible, but the devicetrees contained `aspeed-cvic`. Update the
devictrees to use `aspeed,cvic` as documented and as required by
the driver implementation. Presumably the bug was the result of some
incoherent thoughts while removing the SoC name at the time of
writing.
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 2 +-
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
index 267a0c8e828b..ec9563c629df 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
@@ -123,7 +123,7 @@ vic: interrupt-controller@1e6c0080 {
};
cvic: interrupt-controller@1e6c2000 {
- compatible = "aspeed,ast2400-cvic", "aspeed-cvic";
+ compatible = "aspeed,ast2400-cvic", "aspeed,cvic";
valid-sources = <0x7fffffff>;
reg = <0x1e6c2000 0x80>;
};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
index 4d805cf344a1..a846df1a65ff 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
@@ -140,7 +140,7 @@ vic: interrupt-controller@1e6c0080 {
};
cvic: interrupt-controller@1e6c2000 {
- compatible = "aspeed,ast2500-cvic", "aspeed-cvic";
+ compatible = "aspeed,ast2500-cvic", "aspeed,cvic";
valid-sources = <0xffffffff>;
copro-sw-interrupts = <1>;
reg = <0x1e6c2000 0x80>;
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/7] ARM: dts: aspeed: Specify required properties for sram node
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
2024-08-02 4:25 ` [PATCH 1/7] ARM: dts: aspeed: Fix coprocessor interrupt controller node name Andrew Jeffery
2024-08-02 4:25 ` [PATCH 2/7] ARM: dts: aspeed: Specify correct generic compatible for CVIC Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 4/7] ARM: dts: aspeed: Remove undocumented XDMA nodes Andrew Jeffery
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Squash warnings such as:
```
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: sram@1e720000: '#address-cells' is a required property
from schema $id: http://devicetree.org/schemas/sram/sram.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: sram@1e720000: '#size-cells' is a required property
from schema $id: http://devicetree.org/schemas/sram/sram.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: sram@1e720000: 'ranges' is a required property
from schema $id: http://devicetree.org/schemas/sram/sram.yaml#
```
Fixes: d44a1138cd82 ("arm/dts: Add Aspeed ast2400 device tree")
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 3 +++
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 3 +++
2 files changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
index ec9563c629df..78c967812492 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
@@ -230,6 +230,9 @@ adc: adc@1e6e9000 {
sram: sram@1e720000 {
compatible = "mmio-sram";
reg = <0x1e720000 0x8000>; // 32K
+ ranges;
+ #address-cells = <1>;
+ #size-cells = <1>;
};
video: video@1e700000 {
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
index a846df1a65ff..100380417f99 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
@@ -314,6 +314,9 @@ video: video@1e700000 {
sram: sram@1e720000 {
compatible = "mmio-sram";
reg = <0x1e720000 0x9000>; // 36K
+ ranges;
+ #address-cells = <1>;
+ #size-cells = <1>;
};
sdmmc: sd-controller@1e740000 {
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/7] ARM: dts: aspeed: Remove undocumented XDMA nodes
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
` (2 preceding siblings ...)
2024-08-02 4:25 ` [PATCH 3/7] ARM: dts: aspeed: Specify required properties for sram node Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 5/7] ARM: dts: aspeed: Clean up AST2500 pinctrl properties Andrew Jeffery
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
There's no binding defined for the device, so remove it from the
devicetrees until someone has the motivation to write one.
Squash warnings such as:
```
arch/arm/boot/dts/aspeed/aspeed-ast2500-evb.dtb: /ahb/apb@1e6e0000/xdma@1e6e7000: failed to match any schema with compatible: ['aspeed,ast2500-xdma']
```
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 5 -----
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 5 -----
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 5 -----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts | 5 -----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 5 -----
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 11 -----------
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 13 -------------
7 files changed, 49 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
index 6fdda42575df..7364adc6b80d 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
@@ -570,11 +570,6 @@ &wdt2 {
status = "okay";
};
-&xdma {
- status = "okay";
- memory-region = <&vga_memory>;
-};
-
&kcs2 {
status = "okay";
aspeed,lpc-io-reg = <0xca8 0xcac>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 214b2e6a4c6d..513077a1f4be 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -2486,11 +2486,6 @@ &wdt2 {
status = "okay";
};
-&xdma {
- status = "okay";
- memory-region = <&vga_memory>;
-};
-
&kcs2 {
status = "okay";
aspeed,lpc-io-reg = <0xca8 0xcac>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
index 5cb0094e21e0..0776b72c2199 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
@@ -1722,11 +1722,6 @@ &wdt2 {
status = "okay";
};
-&xdma {
- status = "okay";
- memory-region = <&vga_memory>;
-};
-
&kcs2 {
status = "okay";
aspeed,lpc-io-reg = <0xca8 0xcac>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
index 213023bc5aec..b31eb8e58c6b 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
@@ -870,11 +870,6 @@ &pinctrl {
<&pinctrl_lsirq_default>;
};
-&xdma {
- status = "okay";
- memory-region = <&vga_memory>;
-};
-
&kcs2 {
status = "okay";
aspeed,lpc-io-reg = <0xca8 0xcac>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
index a20a532fc280..7820bc829dff 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
@@ -696,9 +696,4 @@ &video {
memory-region = <&video_engine_memory>;
};
-&xdma {
- status = "okay";
- memory-region = <&vga_memory>;
-};
-
#include "ibm-power9-dual.dtsi"
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
index 100380417f99..57a699a7c149 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
@@ -281,17 +281,6 @@ gfx: display@1e6e6000 {
interrupts = <0x19>;
};
- xdma: xdma@1e6e7000 {
- compatible = "aspeed,ast2500-xdma";
- reg = <0x1e6e7000 0x100>;
- clocks = <&syscon ASPEED_CLK_GATE_BCLK>;
- resets = <&syscon ASPEED_RESET_XDMA>;
- interrupts-extended = <&vic 6>, <&scu_ic ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI>;
- aspeed,pcie-device = "bmc";
- aspeed,scu = <&syscon>;
- status = "disabled";
- };
-
adc: adc@1e6e9000 {
compatible = "aspeed,ast2500-adc";
reg = <0x1e6e9000 0xb0>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index 0c00882f111a..6505eebf91af 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -398,19 +398,6 @@ gfx: display@1e6e6000 {
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
};
- xdma: xdma@1e6e7000 {
- compatible = "aspeed,ast2600-xdma";
- reg = <0x1e6e7000 0x100>;
- clocks = <&syscon ASPEED_CLK_GATE_BCLK>;
- resets = <&syscon ASPEED_RESET_DEV_XDMA>, <&syscon ASPEED_RESET_RC_XDMA>;
- reset-names = "device", "root-complex";
- interrupts-extended = <&gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
- <&scu_ic0 ASPEED_AST2600_SCU_IC0_PCIE_PERST_LO_TO_HI>;
- aspeed,pcie-device = "bmc";
- aspeed,scu = <&syscon>;
- status = "disabled";
- };
-
adc0: adc@1e6e9000 {
compatible = "aspeed,ast2600-adc0";
reg = <0x1e6e9000 0x100>;
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/7] ARM: dts: aspeed: Clean up AST2500 pinctrl properties
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
` (3 preceding siblings ...)
2024-08-02 4:25 ` [PATCH 4/7] ARM: dts: aspeed: Remove undocumented XDMA nodes Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 6/7] ARM: dts: aspeed-g6: Use generic 'ethernet' for ftgmac100 nodes Andrew Jeffery
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Many platforms were specifying the `aspeed,external-nodes` property
required by the AST2500 pinctrl. However, its been specified in the
pinctrl node directly in aspeed-g5.dtsi for quite a long time now.
Remove the unnecessary override from all relevant platform dts files.
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 4 ----
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 2 --
arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts | 4 ----
13 files changed, 50 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
index 8ab5f301f926..e77f8192902d 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
@@ -672,10 +672,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
index 7c6af7f226e7..29c68c37e7f5 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
@@ -200,10 +200,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&gpio {
pin_gpio_c7 {
gpio-hog;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
index 8dee4faa9e07..0943e0bf1305 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
@@ -254,10 +254,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&vhub {
status = "okay";
};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
index 0dea014e4f30..78a5656ef75d 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
@@ -814,10 +814,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts
index 5a98a19f445e..7a78c34cff40 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts
@@ -123,10 +123,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts
index d5b7d28cda88..da55e7b29fac 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts
@@ -118,10 +118,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
index c0847636f20b..370738572a55 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
@@ -263,10 +263,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&gpio {
pin_gpio_b0 {
gpio-hog;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
index ac0d666ca10e..b1d0ff85d397 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
@@ -284,10 +284,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&ibt {
status = "okay";
};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
index 893e621ecab1..24df24ad9c80 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
@@ -289,10 +289,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts
index bbf864f84d37..a0e8c97e944a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts
@@ -938,10 +938,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
index 7820bc829dff..8b1e82c8cdfe 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
@@ -661,10 +661,6 @@ &gfx {
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
index 3d2d8db73ca6..9904f0a58cfa 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
@@ -466,8 +466,6 @@ &i2c13 {
};
&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-
pinctrl_gpioh_unbiased: gpioi_unbiased {
pins = "A8", "C7", "B7", "A7", "D7", "B6", "A6", "E7";
bias-disable;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts
index 50f3c6a5c0c8..b961dff388d1 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts
@@ -123,10 +123,6 @@ &gfx {
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/7] ARM: dts: aspeed-g6: Use generic 'ethernet' for ftgmac100 nodes
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
` (4 preceding siblings ...)
2024-08-02 4:25 ` [PATCH 5/7] ARM: dts: aspeed: Clean up AST2500 pinctrl properties Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-02 4:25 ` [PATCH 7/7] ARM: dts: aspeed-g6: Drop cells properties from ethernet nodes Andrew Jeffery
2024-08-09 7:06 ` [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Squash warnings such as:
```
arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dtb: ftgmac@1e670000: $nodename:0: 'ftgmac@1e670000' does not match '^ethernet(@.*)?$'
```
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index 6505eebf91af..ae8aa54508b2 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -231,7 +231,7 @@ mdio3: mdio@1e650018 {
resets = <&syscon ASPEED_RESET_MII>;
};
- mac0: ftgmac@1e660000 {
+ mac0: ethernet@1e660000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e660000 0x180>;
#address-cells = <1>;
@@ -241,7 +241,7 @@ mac0: ftgmac@1e660000 {
status = "disabled";
};
- mac1: ftgmac@1e680000 {
+ mac1: ethernet@1e680000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e680000 0x180>;
#address-cells = <1>;
@@ -251,7 +251,7 @@ mac1: ftgmac@1e680000 {
status = "disabled";
};
- mac2: ftgmac@1e670000 {
+ mac2: ethernet@1e670000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e670000 0x180>;
#address-cells = <1>;
@@ -261,7 +261,7 @@ mac2: ftgmac@1e670000 {
status = "disabled";
};
- mac3: ftgmac@1e690000 {
+ mac3: ethernet@1e690000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e690000 0x180>;
#address-cells = <1>;
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/7] ARM: dts: aspeed-g6: Drop cells properties from ethernet nodes
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
` (5 preceding siblings ...)
2024-08-02 4:25 ` [PATCH 6/7] ARM: dts: aspeed-g6: Use generic 'ethernet' for ftgmac100 nodes Andrew Jeffery
@ 2024-08-02 4:25 ` Andrew Jeffery
2024-08-09 7:06 ` [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-02 4:25 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
These are not specified in the binding and produce warnings such as
the following:
```
...
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi:254.27-262.5: Warning (avoid_unnecessary_addr_size): /ahb/ethernet@1e670000: unnecessary #address-cells/#size-cells without "ranges", "dma-ranges" or child "reg" property
...
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi:264.27-272.5: Warning (avoid_unnecessary_addr_size): /ahb/ethernet@1e690000: unnecessary #address-cells/#size-cells without "ranges", "dma-ranges" or child "reg" property
...
arch/arm/boot/dts/aspeed/aspeed-ast2600-evb-a1.dtb: ethernet@1e660000: Unevaluated properties are not allowed ('#address-cells', '#size-cells' were unexpected)
```
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index ae8aa54508b2..8ed715bd53aa 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -234,8 +234,6 @@ mdio3: mdio@1e650018 {
mac0: ethernet@1e660000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e660000 0x180>;
- #address-cells = <1>;
- #size-cells = <0>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>;
status = "disabled";
@@ -244,8 +242,6 @@ mac0: ethernet@1e660000 {
mac1: ethernet@1e680000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e680000 0x180>;
- #address-cells = <1>;
- #size-cells = <0>;
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>;
status = "disabled";
@@ -254,8 +250,6 @@ mac1: ethernet@1e680000 {
mac2: ethernet@1e670000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e670000 0x180>;
- #address-cells = <1>;
- #size-cells = <0>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&syscon ASPEED_CLK_GATE_MAC3CLK>;
status = "disabled";
@@ -264,8 +258,6 @@ mac2: ethernet@1e670000 {
mac3: ethernet@1e690000 {
compatible = "aspeed,ast2600-mac", "faraday,ftgmac100";
reg = <0x1e690000 0x180>;
- #address-cells = <1>;
- #size-cells = <0>;
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>;
status = "disabled";
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups
2024-08-02 4:25 [PATCH 0/7] ARM: dts: aspeed: Miscellaneous devicetree cleanups Andrew Jeffery
` (6 preceding siblings ...)
2024-08-02 4:25 ` [PATCH 7/7] ARM: dts: aspeed-g6: Drop cells properties from ethernet nodes Andrew Jeffery
@ 2024-08-09 7:06 ` Andrew Jeffery
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Jeffery @ 2024-08-09 7:06 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Eddie James
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
On Fri, 2024-08-02 at 13:55 +0930, Andrew Jeffery wrote:
> Hello,
>
> As mentioned elsewhere the Aspeed devicetrees are in a bit of a sad
> state. This series is a collection of fixes that make them a little
> less so.
>
> If there no concerns raised in the near future I'll queue them up for
> the BMC tree.
>
> Andrew
>
> ---
> Andrew Jeffery (7):
> ARM: dts: aspeed: Fix coprocessor interrupt controller node name
> ARM: dts: aspeed: Specify correct generic compatible for CVIC
> ARM: dts: aspeed: Specify required properties for sram node
> ARM: dts: aspeed: Remove undocumented XDMA nodes
> ARM: dts: aspeed: Clean up AST2500 pinctrl properties
> ARM: dts: aspeed-g6: Use generic 'ethernet' for ftgmac100 nodes
> ARM: dts: aspeed-g6: Drop cells properties from ethernet nodes
I've applied these to be picked up through the BMC tree.
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread