Amazon's Annapurna Labs Alpine v3 device-tree
Subsystems (3)
v4 cover Amazon's Annapurna Labs Alpine v3 device-tree
This series organize the Amazon's Annapurna Labs Alpine device tree bindings, device tree folder and adds new device tree for Alpine v3.
Changes since v3:
-----------------
- rebased and retested for tag Linux 5.6-rc2
Changes since v2:
-----------------
- Move up a level for DT node without mmio regs.
- Drop device_type from serial@fd883000 node.
- Minor change name of PCIe node to: pcie@fbd00000
Changes since v1:
-----------------
- Rename al,alpine DT binding to amazon,alpine
- Rename al folder to be amazon
- Update maintainers of amazon,alpine DT
- Add missing alpine-v2 DT binding
- Fix yaml schemas for alpine-v3-evp.dts:
- #size-cells:0:0: 0 is not one of [1, 2]
- arch-timer: interrupts: [[1, 13, 8, 1, 14, 8, 1, 11, 8, 1, 10, 8]] is too short
- Change compatible string of alpine-v3-evp to amazon,al
Hanna Hawa (5):
dt-bindings: arm: amazon: rename al,alpine DT binding to amazon,al
arm64: dts: amazon: rename al folder to be amazon
dt-bindings: arm: amazon: update maintainers of amazon,al DT bindings
dt-bindings: arm: amazon: add missing alpine-v2 DT binding
dt-bindings: arm: amazon: add Amazon Annapurna Labs Alpine V3
Ronen Krupnik (1):
arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support
.../devicetree/bindings/arm/al,alpine.yaml | 21 -
.../devicetree/bindings/arm/amazon,al.yaml | 33 ++
MAINTAINERS | 2 +-
arch/arm64/boot/dts/Makefile | 2 +-
arch/arm64/boot/dts/{al => amazon}/Makefile | 1 +
.../boot/dts/{al => amazon}/alpine-v2-evp.dts | 0
.../boot/dts/{al => amazon}/alpine-v2.dtsi | 0
arch/arm64/boot/dts/amazon/alpine-v3-evp.dts | 23 ++
arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 371 ++++++++++++++++++
9 files changed, 430 insertions(+), 23 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/al,alpine.yaml
create mode 100644 Documentation/devicetree/bindings/arm/amazon,al.yaml
rename arch/arm64/boot/dts/{al => amazon}/Makefile (64%)
rename arch/arm64/boot/dts/{al => amazon}/alpine-v2-evp.dts (100%)
rename arch/arm64/boot/dts/{al => amazon}/alpine-v2.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3-evp.dts
create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3.dtsiSignature · 1 line
2.17.1
PATCH v4 1/6 dt-bindings: arm: amazon: rename al,alpine DT binding to amazon,al
As preparation to add device tree binding for Amazon's Annapurna Labs Alpine v3 support. Rename al,alpine DT binding to amazon,al.
---
.../bindings/arm/{al,alpine.yaml => amazon,al.yaml} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename Documentation/devicetree/bindings/arm/{al,alpine.yaml => amazon,al.yaml} (74%)Documentation/devicetree/bindings/arm/amazon,al.yaml renamed from Documentation/devicetree/bindings/arm/al,alpine.yaml +2 -2
@@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 %YAML 1.2 --- -$id: http://devicetree.org/schemas/arm/al,alpine.yaml# +$id: http://devicetree.org/schemas/arm/amazon,al.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Annapurna Labs Alpine Platform Device Tree Bindings +title: Amazon's Annapurna Labs Alpine Platform Device Tree Bindings maintainers: - Tsahee Zidenberg <[email protected]>
Signature · 1 line
2.17.1
PATCH v4 2/6 arm64: dts: amazon: rename al folder to be amazon
In reply to Hanna HawaAs preparation to add device tree binding for Amazon's Annapurna Labs Alpine v3 support. Rename al device tree folder to be amazon.
---
MAINTAINERS | 2 +-
arch/arm64/boot/dts/Makefile | 2 +-
arch/arm64/boot/dts/{al => amazon}/Makefile | 0
arch/arm64/boot/dts/{al => amazon}/alpine-v2-evp.dts | 0
arch/arm64/boot/dts/{al => amazon}/alpine-v2.dtsi | 0
5 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm64/boot/dts/{al => amazon}/Makefile (100%)
rename arch/arm64/boot/dts/{al => amazon}/alpine-v2-evp.dts (100%)
rename arch/arm64/boot/dts/{al => amazon}/alpine-v2.dtsi (100%)MAINTAINERS +1 -1
@@ -1553,7 +1553,7 @@ L: [email protected] (moderated for non-subscribers) S: Maintained F: arch/arm/mach-alpine/ F: arch/arm/boot/dts/alpine* -F: arch/arm64/boot/dts/al/ +F: arch/arm64/boot/dts/amazon/* F: drivers/*/*alpine* ARM/ARTPEC MACHINE SUPPORT
arch/arm64/boot/dts/Makefile +1 -1
@@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 subdir-y += actions -subdir-y += al subdir-y += allwinner subdir-y += altera +subdir-y += amazon subdir-y += amd subdir-y += amlogic subdir-y += apm
arch/arm64/boot/dts/amazon/Makefile renamed from arch/arm64/boot/dts/al/Makefile +0 -0
arch/arm64/boot/dts/amazon/alpine-v2-evp.dts renamed from arch/arm64/boot/dts/al/alpine-v2-evp.dts +0 -0
arch/arm64/boot/dts/amazon/alpine-v2.dtsi renamed from arch/arm64/boot/dts/al/alpine-v2.dtsi +0 -0
Signature · 1 line
2.17.1
PATCH v4 3/6 dt-bindings: arm: amazon: update maintainers of amazon,al DT bindings
In reply to Hanna HawaUpdate maintainers of amazon,al DT bindings.
--- Documentation/devicetree/bindings/arm/amazon,al.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/arm/amazon,al.yaml +3 -2
@@ -7,8 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Amazon's Annapurna Labs Alpine Platform Device Tree Bindings maintainers: - - Tsahee Zidenberg <[email protected]> - - Antoine Tenart <[email protected]> + - Hanna Hawa <[email protected]> + - Talel Shenhar <[email protected]>, <[email protected]> + - Ronen Krupnik <[email protected]> properties: compatible:
Signature · 1 line
2.17.1
PATCH v4 4/6 dt-bindings: arm: amazon: add missing alpine-v2 DT binding
In reply to Hanna HawaAmazon Annapurna Labs Alpine family includes: Alpine-v1, Alpine-v2.
This patch adds the missing DT binding of Alpine-v2 in amazon,al.yaml.
--- .../devicetree/bindings/arm/amazon,al.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/arm/amazon,al.yaml +10 -5
@@ -13,10 +13,15 @@ maintainers: properties: compatible: - items: - - const: al,alpine - model: - items: - - const: "Annapurna Labs Alpine Dev Board" + oneOf: + - description: Boards with Alpine V1 SoC + items: + - const: al,alpine + + - description: Boards with Alpine V2 SoC + items: + - enum: + - al,alpine-v2-evp + - const: al,alpine-v2 ...
Signature · 1 line
2.17.1
PATCH v4 5/6 dt-bindings: arm: amazon: add Amazon Annapurna Labs Alpine V3
In reply to Hanna HawaThis patch adds DT bindings info for Amazon Annapurna Labs Alpine V3.
--- Documentation/devicetree/bindings/arm/amazon,al.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/amazon,al.yaml +6 -0
@@ -24,4 +24,10 @@ properties: - al,alpine-v2-evp - const: al,alpine-v2 + - description: Boards with Alpine V3 SoC + items: + - enum: + - amazon,al-alpine-v3-evp + - const: amazon,al-alpine-v3 + ...
Signature · 1 line
2.17.1
PATCH v4 6/6 arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support
In reply to Hanna HawaFrom: Ronen Krupnik <[email protected]>
This patch adds the initial support for the Amazon's Annapurna Labs Alpine v3 Soc and Evaluation Platform (EVP).
--- arch/arm64/boot/dts/amazon/Makefile | 1 + arch/arm64/boot/dts/amazon/alpine-v3-evp.dts | 23 ++ arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 371 +++++++++++++++++++ 3 files changed, 395 insertions(+) create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3-evp.dts create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3.dtsi
arch/arm64/boot/dts/amazon/Makefile +1 -0
@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb +dtb-$(CONFIG_ARCH_ALPINE) += alpine-v3-evp.dtb
arch/arm64/boot/dts/amazon/alpine-v3-evp.dts new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#include "alpine-v3.dtsi" + +/ { + model = "Amazon's Annapurna Labs Alpine v3 Evaluation Platform (EVP)"; + compatible = "amazon,al-alpine-v3-evp", "amazon,al-alpine-v3"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + status = "okay"; +};
arch/arm64/boot/dts/amazon/alpine-v3.dtsi new file +371 -0
371 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 6/6] arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support
Hello,
Sorry, I'm a bit late to the party...
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 297
Quoted 2 lines · Hanna Hawa
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +1
-0+ arch-timer {
Please use 'timer' instead.
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 320
Quoted 11 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +10
-0+ compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 0xd IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xe IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xb IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xa IRQ_TYPE_LEVEL_LOW>; + }; + gic: interrupt-controller@f0000000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <3>; + #address-cells = <0>;
No need for this.
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 326
Quoted 6 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +6
-0+ interrupt-controller; + reg = <0x0 0xf0800000 0 0x10000>, + <0x0 0xf0a00000 0 0x200000>, + <0x0 0xf0000000 0 0x2000>, + <0x0 0xf0010000 0 0x1000>, + <0x0 0xf0020000 0 0x2000>;
Please add comments here, see alpine-v2.dtsi (or other dtsi in arch/arm64).
Quoted 4 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +4
-0+ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; + }; + + msix: msix@fbe00000 {
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 340
Quoted 10 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +10
-0+ compatible = "al,alpine-msix"; + reg = <0x0 0xfbe00000 0x0 0x100000>; + interrupt-controller; + msi-controller; + al,msi-base-spi = <160>; + al,msi-num-spis = <800>; + interrupt-parent = <&gic>; + }; + + uart0: serial@fd883000 {
Looking at the Alpine v2 dtsi, this node was put in an io-fabric bus. It seems to me the Alpine v3 dtsi is very similar. Would it apply as well?
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 343
Quoted 3 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ compatible = "ns16550a"; + reg = <0x0 0xfd883000 0x0 0x1000>; + clock-frequency = <0>;
Is the frequency set to 0 on purpose? Or is it set by a firmware at boot time (if so please add a comment)?
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 346
Quoted 3 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>;
Since you're enabling this node explicitly in the dts, you can set it to disabled by default.
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 349
Quoted 3 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ }; + + pcie@fbd00000 {
Please order the nodes in increasing order.
Quoted 12 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +12
-0+ compatible = "pci-host-ecam-generic"; + device_type = "pci"; + #size-cells = <2>; + #address-cells = <3>; + #interrupt-cells = <1>; + reg = <0x0 0xfbd00000 0x0 0x100000>; + interrupt-map-mask = <0xf800 0 0 7>; + /* 8 x legacy interrupts for SATA only */ + interrupt-map = <0x4000 0 0 1 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>, + <0x4800 0 0 1 &gic 0 58 IRQ_TYPE_LEVEL_HIGH>, + <0x5000 0 0 1 &gic 0 59 IRQ_TYPE_LEVEL_HIGH>, + <0x5800 0 0 1 &gic 0 60 IRQ_TYPE_LEVEL_HIGH>,
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 371
Quoted 10 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +10
-0+ <0x6000 0 0 1 &gic 0 61 IRQ_TYPE_LEVEL_HIGH>, + <0x6800 0 0 1 &gic 0 62 IRQ_TYPE_LEVEL_HIGH>, + <0x7000 0 0 1 &gic 0 63 IRQ_TYPE_LEVEL_HIGH>, + <0x7800 0 0 1 &gic 0 64 IRQ_TYPE_LEVEL_HIGH>; + ranges = <0x02000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>; + bus-range = <0x00 0x00>; + msi-parent = <&msix>; + }; + }; +};
The rest of the series looks good.
Thanks!
Antoine
Signature · 3 lines
Antoine Ténart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [EXTERNAL][PATCH v4 6/6] arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support
Hi Antonie,
Thanks for reviewing,
Quoted 6 lines · Antoine Tenart
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Hello,
Quoted 7 lines
Sorry, I'm a bit late to the party...
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 297
Quoted 2 lines · Hanna Hawa
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +1
-0+ arch-timer {Please use 'timer' instead.
Will be fixed
Quoted 8 lines
Quoted 7 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +6
-0+ compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 0xd IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xe IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xb IRQ_TYPE_LEVEL_LOW>, + <GIC_PPI 0xa IRQ_TYPE_LEVEL_LOW>; + };
Quoted 6 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 320
Quoted 4 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +4
-0+ gic: interrupt-controller@f0000000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <3>; + #address-cells = <0>;No need for this.
Will be removed
Quoted 10 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 326
Quoted 7 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +6
-0+ interrupt-controller; + reg = <0x0 0xf0800000 0 0x10000>, + <0x0 0xf0a00000 0 0x200000>, + <0x0 0xf0000000 0 0x2000>, + <0x0 0xf0010000 0 0x1000>, + <0x0 0xf0020000 0 0x2000>;Please add comments here, see
alpine-v2.dtsi(or other dtsi inarch/arm64).
Will be added.
Quoted 10 lines
Quoted 10 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +9
-0+ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; + }; + + msix: msix@fbe00000 { + compatible = "al,alpine-msix"; + reg = <0x0 0xfbe00000 0x0 0x100000>; + interrupt-controller; + msi-controller; + al,msi-base-spi = <160>;
Quoted 8 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 340
Quoted 5 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +5
-0+ al,msi-num-spis = <800>; + interrupt-parent = <&gic>; + }; + + uart0: serial@fd883000 {Looking at the Alpine v2 dtsi, this node was put in an io-fabric bus. It seems to me the Alpine v3 dtsi is very similar. Would it apply as well?
V3 very similar to V2, will add to io-fabric bus and will add missing uart devices.
Quoted 7 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 343
Quoted 4 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ compatible = "ns16550a"; + reg = <0x0 0xfd883000 0x0 0x1000>; + clock-frequency = <0>;Is the frequency set to 0 on purpose? Or is it set by a firmware at boot time (if so please add a comment)?
It's updated by firmware, will add a comment.
Quoted 7 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 346
Quoted 4 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>;Since you're enabling this node explicitly in the dts, you can set it to disabled by default.
Ack
Quoted 6 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 349
Quoted 4 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +3
-0+ }; + + pcie@fbd00000 {Please order the nodes in increasing order.
Ack
Quoted 24 lines
Quoted 13 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +12
-0+ compatible = "pci-host-ecam-generic"; + device_type = "pci"; + #size-cells = <2>; + #address-cells = <3>; + #interrupt-cells = <1>; + reg = <0x0 0xfbd00000 0x0 0x100000>; + interrupt-map-mask = <0xf800 0 0 7>; + /* 8 x legacy interrupts for SATA only */ + interrupt-map = <0x4000 0 0 1 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>, + <0x4800 0 0 1 &gic 0 58 IRQ_TYPE_LEVEL_HIGH>, + <0x5000 0 0 1 &gic 0 59 IRQ_TYPE_LEVEL_HIGH>, + <0x5800 0 0 1 &gic 0 60 IRQ_TYPE_LEVEL_HIGH>,arch/arm64/boot/dts/amazon/alpine-v3.dtsi line 371
Quoted 10 lines
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +10
-0+ <0x6000 0 0 1 &gic 0 61 IRQ_TYPE_LEVEL_HIGH>, + <0x6800 0 0 1 &gic 0 62 IRQ_TYPE_LEVEL_HIGH>, + <0x7000 0 0 1 &gic 0 63 IRQ_TYPE_LEVEL_HIGH>, + <0x7800 0 0 1 &gic 0 64 IRQ_TYPE_LEVEL_HIGH>; + ranges = <0x02000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>; + bus-range = <0x00 0x00>; + msi-parent = <&msix>; + }; + }; +};
Quoted 1 line
The rest of the series looks good.
Thanks
Regards,
Hanna
Quoted 9 lines
Thanks!
Antoine--
Antoine Ténart, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com