arm: dts: Aspeed SoC device-tree update
Subsystems (2)
v2 cover arm: dts: Aspeed SoC device-tree update
This series fixes a few things in some Aspeed BMC device trees:
- Fix an error in a memory reserve address on Romulus systems
- Update AST2400 and AST2500 device-trees to add a label to the SRAM node and add the coprocessor interrupts controller node along with a binding.
PATCH v2 1/4 arm: dts: Fix error in Aspeed OpenPower Romulus device-tree
The reserved memory for the VGA frame buffer is at the wrong address for this system.
---
--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +2 -2
@@ -21,9 +21,9 @@ #size-cells = <1>; ranges; - vga_memory: framebuffer at bf000000 { + vga_memory: framebuffer at 9f000000 { no-map; - reg = <0xbf000000 0x01000000>; /* 16M */ + reg = <0x9f000000 0x01000000>; /* 16M */ }; flash_memory: region at 98000000 {
Signature · 1 line
2.17.1
PATCH v2 1/4 arm: dts: Fix error in Aspeed OpenPower Romulus device-tree
Quoted 4 lines · Benjamin Herrenschmidt
The reserved memory for the VGA frame buffer is at the wrong address for this system.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
Note: These are pre-reqs for subsequent work, so if they are accepted, I will put them in the fsi tree that I send to Greg (though it can also be in an ARM soc tree).
Let me know if you prefer that I create a topic branch to pull on both sides on k.org
Quoted 20 lines
--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +2
-2@@ -21,9 +21,9 @@ #size-cells = <1>; ranges; - vga_memory: framebuffer at bf000000 { + vga_memory: framebuffer at 9f000000 { no-map; - reg = <0xbf000000 0x01000000>; /* 16M */ + reg = <0x9f000000 0x01000000>; /* 16M */ }; flash_memory: region at 98000000 {
PATCH v2 2/4 dt-bindings: misc: Aspeed coprocessor interrupt controller
In reply to Benjamin HerrenschmidtAdd the device-tree binding definition for the AST2400 and AST2500 coprocessor interrupt controller
--- .../devicetree/bindings/misc/aspeed,cvic.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txt
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +35 -0
@@ -0,0 +1,35 @@ +* Aspeed AST2400 and AST2500 coprocessor interrupt controller + +This file describes the bindings for the interrupt controller present +in the AST2400 and AST2500 BMC SoCs which provides interrupt to the +ColdFire coprocessor. + +It is not a normal interrupt controller and it would be rather +inconvenient to create an interrupt tree for it as it somewhat shares +some of the same sources as the main ARM interrupt controller but with +different numbers. + +The AST2500 supports a SW generated interrupt + +Required properties: +- reg: address and length of the register for the device. +- compatible: "aspeed,cvic" and one of: + "aspeed,ast2400-cvic" + or + "aspeed,ast2500-cvic" + +- valid-sources: One cell, bitmap of supported sources for the implementation + +Optional properties; +- copro-sw-interrupts: List of interrupt numbers that can be used as + SW interrupts from the ARM to the coprocessor. + (AST2500 only) + +Example: + + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + };
Signature · 1 line
2.17.1
Joel Stanley
maintainerPATCH v2 2/4 dt-bindings: misc: Aspeed coprocessor interrupt controller
Documentation/devicetree/bindings/misc/aspeed,cvic.txt
Quoted 14 lines · Benjamin Herrenschmidt
Add the device-tree binding definition for the AST2400 and AST2500 coprocessor interrupt controller
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- .../devicetree/bindings/misc/aspeed,cvic.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txtDocumentation/devicetree/bindings/misc/aspeed,cvic.txt new file +0
-0
Is there a reason you didn't put this in bindings/interrupt-controller?
Aside from that this looks good.
Quoted 39 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +35
-1@@ -0,0 +1,35 @@ +* Aspeed AST2400 and AST2500 coprocessor interrupt controller + +This file describes the bindings for the interrupt controller present +in the AST2400 and AST2500 BMC SoCs which provides interrupt to the +ColdFire coprocessor. + +It is not a normal interrupt controller and it would be rather +inconvenient to create an interrupt tree for it as it somewhat shares +some of the same sources as the main ARM interrupt controller but with +different numbers. + +The AST2500 supports a SW generated interrupt + +Required properties: +- reg: address and length of the register for the device. +- compatible: "aspeed,cvic" and one of: + "aspeed,ast2400-cvic" + or + "aspeed,ast2500-cvic" + +- valid-sources: One cell, bitmap of supported sources for the implementation + +Optional properties; +- copro-sw-interrupts: List of interrupt numbers that can be used as + SW interrupts from the ARM to the coprocessor. + (AST2500 only) + +Example: + + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + }; --2.17.1
PATCH v2 2/4 dt-bindings: misc: Aspeed coprocessor interrupt controller
Quoted 11 lines · Joel Stanley
Quoted 9 lines · Benjamin Herrenschmidt
Add the device-tree binding definition for the AST2400 and AST2500 coprocessor interrupt controller
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- .../devicetree/bindings/misc/aspeed,cvic.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txt
Quoted 7 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt
Quoted 5 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +0
-0Is there a reason you didn't put this in bindings/interrupt-controller?
Well, I don't call it interrupt-controller anymore, it's not an interrupt controller for the main CPU so I decided to leave it out.
If you (or somebody) has strong feeling about it, I can call it interrupt-controller again and move it back there :)
Quoted 41 lines
Aside from that this looks good.
Quoted 39 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +35
-1@@ -0,0 +1,35 @@ +* Aspeed AST2400 and AST2500 coprocessor interrupt controller + +This file describes the bindings for the interrupt controller present +in the AST2400 and AST2500 BMC SoCs which provides interrupt to the +ColdFire coprocessor. + +It is not a normal interrupt controller and it would be rather +inconvenient to create an interrupt tree for it as it somewhat shares +some of the same sources as the main ARM interrupt controller but with +different numbers. + +The AST2500 supports a SW generated interrupt + +Required properties: +- reg: address and length of the register for the device. +- compatible: "aspeed,cvic" and one of: + "aspeed,ast2400-cvic" + or + "aspeed,ast2500-cvic" + +- valid-sources: One cell, bitmap of supported sources for the implementation + +Optional properties; +- copro-sw-interrupts: List of interrupt numbers that can be used as + SW interrupts from the ARM to the coprocessor. + (AST2500 only) + +Example: + + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + }; --2.17.1
Rob Herring
maintainerPATCH v2 2/4 dt-bindings: misc: Aspeed coprocessor interrupt controller
In reply to Benjamin HerrenschmidtQuoted 26 lines · Benjamin Herrenschmidt
Add the device-tree binding definition for the AST2400 and AST2500 coprocessor interrupt controller
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- .../devicetree/bindings/misc/aspeed,cvic.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txtDocumentation/devicetree/bindings/misc/aspeed,cvic.txt new file +11
-0@@ -0,0 +1,35 @@ +* Aspeed AST2400 and AST2500 coprocessor interrupt controller + +This file describes the bindings for the interrupt controller present +in the AST2400 and AST2500 BMC SoCs which provides interrupt to the +ColdFire coprocessor. + +It is not a normal interrupt controller and it would be rather +inconvenient to create an interrupt tree for it as it somewhat shares +some of the same sources as the main ARM interrupt controller but with +different numbers. +
Documentation/devicetree/bindings/misc/aspeed,cvic.txt line 21
Quoted 10 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +10
-0+The AST2500 supports a SW generated interrupt + +Required properties: +- reg: address and length of the register for the device. +- compatible: "aspeed,cvic" and one of: + "aspeed,ast2400-cvic" + or + "aspeed,ast2500-cvic" + +- valid-sources: One cell, bitmap of supported sources for the implementation
aspeed,valid-sources
This could use a better description. I thought this was which bits to use for s/w irq, but then I read the next property...
Alternatively, why can't this be implied by the compatible?
Quoted 22 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +14
-0+ +Optional properties; +- copro-sw-interrupts: List of interrupt numbers that can be used as + SW interrupts from the ARM to the coprocessor. + (AST2500 only) + +Example: + + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + };Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/4 dt-bindings: misc: Aspeed coprocessor interrupt controller
Quoted 40 lines · Rob Herring
Quoted 26 lines · Benjamin Herrenschmidt
Add the device-tree binding definition for the AST2400 and AST2500 coprocessor interrupt controller
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- .../devicetree/bindings/misc/aspeed,cvic.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txtDocumentation/devicetree/bindings/misc/aspeed,cvic.txt new file +11
-0@@ -0,0 +1,35 @@ +* Aspeed AST2400 and AST2500 coprocessor interrupt controller + +This file describes the bindings for the interrupt controller present +in the AST2400 and AST2500 BMC SoCs which provides interrupt to the +ColdFire coprocessor. + +It is not a normal interrupt controller and it would be rather +inconvenient to create an interrupt tree for it as it somewhat shares +some of the same sources as the main ARM interrupt controller but with +different numbers. +Documentation/devicetree/bindings/misc/aspeed,cvic.txt line 21
Quoted 10 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +10
-0+The AST2500 supports a SW generated interrupt + +Required properties: +- reg: address and length of the register for the device. +- compatible: "aspeed,cvic" and one of: + "aspeed,ast2400-cvic" + or + "aspeed,ast2500-cvic" + +- valid-sources: One cell, bitmap of supported sources for the implementationaspeed,valid-sources
Quoted 4 lines
This could use a better description. I thought this was which bits to use for s/w irq, but then I read the next property...
Alternatively, why can't this be implied by the compatible?
It could, I'm happy to drop it, I don't actually use it in SW.
Cheers,
Ben.
Quoted 22 lines
Quoted 22 lines
Documentation/devicetree/bindings/misc/aspeed,cvic.txt new file +14
-0+ +Optional properties; +- copro-sw-interrupts: List of interrupt numbers that can be used as + SW interrupts from the ARM to the coprocessor. + (AST2500 only) + +Example: + + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + };Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/4 arm: dts: Update AST2500 device-tree
In reply to Benjamin HerrenschmidtAdd the missing node for the CVIC (the coprocessor interrupt controller) and add a label to the SRAM node so it can be referenced from the board device-tree file.
--- arch/arm/boot/dts/aspeed-g5.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g5.dtsi +8 -1
@@ -127,6 +127,13 @@ reg = <0x1e6c0080 0x80>; }; + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2500-cvic", "aspeed-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + }; + mac0: ethernet at 1e660000 { compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>;
@@ -211,7 +218,7 @@ status = "disabled"; }; - sram at 1e720000 { + sram: sram at 1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K };
Signature · 1 line
2.17.1
PATCH v2 4/4 arm: dts: Update AST2400 device-tree
In reply to Benjamin HerrenschmidtAdd the missing node for the CVIC (the coprocessor interrupt controller) and add a label to the SRAM node so it can be referenced from the board device-tree file.
--- arch/arm/boot/dts/aspeed-g4.dtsi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g4.dtsi +7 -1
@@ -92,6 +92,12 @@ reg = <0x1e6c0080 0x80>; }; + cvic: copro-interrupt-controller at 1e6c2000 { + compatible = "aspeed,ast2400-cvic", "aspeed-cvic"; + valid-sources = <0x7fffffff>; + reg = <0x1e6c2000 0x80>; + }; + mac0: ethernet at 1e660000 { compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>;
@@ -161,7 +167,7 @@ status = "disabled"; }; - sram at 1e720000 { + sram: sram at 1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K };
Signature · 1 line
2.17.1