Add Chameleon v3 devicetree
v2 cover Add Chameleon v3 devicetree
The Google Chameleon v3 is a board made for testing both video and audio interfaces of external devices. It acts as a base board for the Mercury+ AA1 module.
socfpga_arria10_mercury_aa1.dtsi and socfpga_arria10_chameleonv3.dts have also been sent to u-boot:
https://lists.denx.de/pipermail/u-boot/2022-May/485107.html
https://lists.denx.de/pipermail/u-boot/2022-May/485111.html
v2 changes:
- split first patch into three
- move sdmmc-ecc node to socfpga_arria10.dtsi (instead of removing it entirely)
- use generic names for dts node names
- keep the enclustra,mercury-aa1 compatible
Paweł Anikiel (5):
ARM: dts: socfpga: Change Mercury+ AA1 dts to dtsi
ARM: dts: socfpga: Move sdmmc-ecc node to Arria 10 dts
ARM: dts: socfpga: Add atsha204a node to Mercury+ AA1 dts
ARM: dts: socfpga: Add Google Chameleon v3 devicetree
dt-bindings: altera: Add Chameleon v3 board
.../devicetree/bindings/arm/altera.yaml | 1 +
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/socfpga_arria10.dtsi | 10 +++
.../boot/dts/socfpga_arria10_chameleonv3.dts | 90 +++++++++++++++++++
...1.dts => socfpga_arria10_mercury_aa1.dtsi} | 49 ++--------
5 files changed, 110 insertions(+), 42 deletions(-)
create mode 100644 arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
rename arch/arm/boot/dts/{socfpga_arria10_mercury_aa1.dts => socfpga_arria10_mercury_aa1.dtsi} (70%)Signature · 1 line
2.36.1.255.ge46751e96f-goog
PATCH v2 1/5 ARM: dts: socfpga: Change Mercury+ AA1 dts to dtsi
The Mercury+ AA1 is not a standalone board, rather it's a module with an Arria 10 SoC. Remove status = "okay" and i2c aliases, as they are routed to the base board and should be enabled from there.
---
arch/arm/boot/dts/Makefile | 1 -
...1.dts => socfpga_arria10_mercury_aa1.dtsi} | 28 -------------------
2 files changed, 29 deletions(-)
rename arch/arm/boot/dts/{socfpga_arria10_mercury_aa1.dts => socfpga_arria10_mercury_aa1.dtsi} (84%)arch/arm/boot/dts/Makefile +0 -1
@@ -1146,7 +1146,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ - socfpga_arria10_mercury_aa1.dtb \ socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_sdmmc.dtb \
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi renamed from arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts +0 -28
@@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -/dts-v1/; #include "socfpga_arria10.dtsi"
@@ -11,8 +10,6 @@ / { aliases { ethernet0 = &gmac0; serial1 = &uart1; - i2c0 = &i2c0; - i2c1 = &i2c1; }; memory@0 {
@@ -43,7 +40,6 @@ &gmac0 { phy-addr = <0xffffffff>; /* probe for phy addr */ max-frame-size = <3800>; - status = "okay"; phy-handle = <&phy3>;
@@ -69,22 +65,8 @@ phy3: ethernet-phy@3 { }; }; -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&gpio2 { - status = "okay"; -}; - &i2c1 { - status = "okay"; isl12022: isl12022@6f { - status = "okay"; compatible = "isil,isl12022"; reg = <0x6f>; };
@@ -92,7 +74,6 @@ isl12022: isl12022@6f { /* Following mappings are taken from arria10 socdk dts */ &mmc { - status = "okay"; cap-sd-highspeed; broken-cd; bus-width = <4>;
@@ -101,12 +82,3 @@ &mmc { &osc1 { clock-frequency = <33330000>; }; - -&uart1 { - status = "okay"; -}; - -&usb0 { - status = "okay"; - dr_mode = "host"; -};
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 1/5] ARM: dts: socfpga: Change Mercury+ AA1 dts to dtsi
Quoted 5 lines · Paweł Anikiel
The Mercury+ AA1 is not a standalone board, rather it's a module with an Arria 10 SoC. Remove status = "okay" and i2c aliases, as they are routed to the base board and should be enabled from there.
Signed-off-by Paweł Anikiel <[email protected]>
Best regards,
Krzysztof
PATCH v2 2/5 ARM: dts: socfpga: Move sdmmc-ecc node to Arria 10 dts
In reply to Paweł AnikielThe ecc manager is a part of the Arria 10 SoC, move it to the correct dts.
--- arch/arm/boot/dts/socfpga_arria10.dtsi | 10 ++++++++++ arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-)
arch/arm/boot/dts/socfpga_arria10.dtsi +10 -0
@@ -736,6 +736,16 @@ emac0-tx-ecc@ff8c0c00 { <37 IRQ_TYPE_LEVEL_HIGH>; }; + sdmmca-ecc@ff8c2c00 { + compatible = "altr,socfpga-sdmmc-ecc"; + reg = <0xff8c2c00 0x400>; + altr,ecc-parent = <&mmc>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, + <47 IRQ_TYPE_LEVEL_HIGH>, + <16 IRQ_TYPE_LEVEL_HIGH>, + <48 IRQ_TYPE_LEVEL_HIGH>; + }; + dma-ecc@ff8c8000 { compatible = "altr,socfpga-dma-ecc"; reg = <0xff8c8000 0x400>;
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi +0 -12
@@ -23,18 +23,6 @@ chosen { }; }; -&eccmgr { - sdmmca-ecc@ff8c2c00 { - compatible = "altr,socfpga-sdmmc-ecc"; - reg = <0xff8c2c00 0x400>; - altr,ecc-parent = <&mmc>; - interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, - <47 IRQ_TYPE_LEVEL_HIGH>, - <16 IRQ_TYPE_LEVEL_HIGH>, - <48 IRQ_TYPE_LEVEL_HIGH>; - }; -}; - &gmac0 { phy-mode = "rgmii"; phy-addr = <0xffffffff>; /* probe for phy addr */
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 2/5] ARM: dts: socfpga: Move sdmmc-ecc node to Arria 10 dts
Quoted 4 lines · Paweł Anikiel
The ecc manager is a part of the Arria 10 SoC, move it to the correct dts.
Signed-off-by Paweł Anikiel <[email protected]>
Best regards,
Krzysztof
PATCH v2 3/5 ARM: dts: socfpga: Add atsha204a node to Mercury+ AA1 dts
In reply to Paweł AnikielAdd atsha204a node to Mercury+ AA1 dts
--- arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi +8 -1
@@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 - +/* + * Copyright 2022 Google LLC + */ #include "socfpga_arria10.dtsi" / {
@@ -54,6 +56,11 @@ phy3: ethernet-phy@3 { }; &i2c1 { + atsha204a: crypto@64 { + compatible = "atmel,atsha204a"; + reg = <0x64>; + }; + isl12022: isl12022@6f { compatible = "isil,isl12022"; reg = <0x6f>;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 3/5] ARM: dts: socfpga: Add atsha204a node to Mercury+ AA1 dts
Quoted 12 lines · Paweł Anikiel
Add atsha204a node to Mercury+ AA1 dts
Signed-off-by Paweł Anikiel <[email protected]>--- arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi +0
-0
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi line 4
Quoted 5 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi +3
-1@@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 - +/* + * Copyright 2022 Google LLC + */
Usually we keep here a blank line.
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi line 6
Quoted 2 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi +0
-0#include "socfpga_arria10.dtsi"
Best regards,
Krzysztof
PATCH v2 4/5 ARM: dts: socfpga: Add Google Chameleon v3 devicetree
In reply to Paweł AnikielAdd devicetree for the Google Chameleon v3 board.
--- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/socfpga_arria10_chameleonv3.dts | 90 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -1146,6 +1146,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ + socfpga_arria10_chameleonv3.dtb \ socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_sdmmc.dtb \
arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 4/5] ARM: dts: socfpga: Add Google Chameleon v3 devicetree
Quoted 3 lines · Paweł Anikiel
Add devicetree for the Google Chameleon v3 board.
Signed-off-by Paweł Anikiel <[email protected]>
Best regards,
Krzysztof
PATCH v2 5/5 dt-bindings: altera: Add Chameleon v3 board
In reply to Paweł AnikielAdd Chameleon v3 to Arria 10 boards.
--- Documentation/devicetree/bindings/arm/altera.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/altera.yaml +1 -0
@@ -26,6 +26,7 @@ properties: - enum: - altr,socfpga-arria10-socdk - enclustra,mercury-aa1 + - google,chameleon-v3 - const: altr,socfpga-arria10 - const: altr,socfpga
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 5/5] dt-bindings: altera: Add Chameleon v3 board
Quoted 12 lines · Paweł Anikiel
Add Chameleon v3 to Arria 10 boards.
Signed-off-by Paweł Anikiel <[email protected]>--- Documentation/devicetree/bindings/arm/altera.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/arm/altera.yaml +0
-0
Documentation/devicetree/bindings/arm/altera.yaml properties: · line 29
Quoted 4 lines
Documentation/devicetree/bindings/arm/altera.yaml +1
-0@@ -26,6 +26,7 @@ properties: - enum: - altr,socfpga-arria10-socdk - enclustra,mercury-aa1 + - google,chameleon-v3
This won't work like that. You need separate group. Please install dtschema and run make dtbs_check.
Best regards,
Krzysztof
Arnd Bergmann
maintainerQuoted 9 lines · Paweł Anikiel
The Google Chameleon v3 is a board made for testing both video and audio interfaces of external devices. It acts as a base board for the Mercury+ AA1 module.
socfpga_arria10_mercury_aa1.dtsiandsocfpga_arria10_chameleonv3.dtshave also been sent to u-boot:
https://lists.denx.de/pipermail/u-boot/2022-May/485107.html
https://lists.denx.de/pipermail/u-boot/2022-May/485111.html
Hi Paweł,
The patches look ok to me, but I think you should be sending them to Dinh Nguyen for merging through the socfpga tree instead of directly going to [email protected].
Arnd
This series was applied to soc/soc.git (for-next) by Dinh Nguyen <[email protected]>:
Hello:
This series was applied to soc/soc.git (for-next)
by Dinh Nguyen <[email protected]>:
Quoted 10 lines · On Wed, 1 Jun 2022 17:46:42 +0200 you wrote:
The Google Chameleon v3 is a board made for testing both video and audio interfaces of external devices. It acts as a base board for the Mercury+ AA1 module.
socfpga_arria10_mercury_aa1.dtsiandsocfpga_arria10_chameleonv3.dtshave also been sent to u-boot:
https://lists.denx.de/pipermail/u-boot/2022-May/485107.html
https://lists.denx.de/pipermail/u-boot/2022-May/485111.html[...]
Here is the summary with links:
- [v2,1/5] ARM: dts: socfpga: Change Mercury+ AA1 dts to dtsi
https://git.kernel.org/soc/soc/c/7e0ed53b074c - [v2,2/5] ARM: dts: socfpga: Move sdmmc-ecc node to Arria 10 dts https://git.kernel.org/soc/soc/c/cfdb455d1a54 - [v2,3/5] ARM: dts: socfpga: Add atsha204a node to Mercury+ AA1 dts (no matching commit) - [v2,4/5] ARM: dts: socfpga: Add Google Chameleon v3 devicetree https://git.kernel.org/soc/soc/c/15596df74e58
- [v2,5/5] dt-bindings: altera: Add Chameleon v3 board (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html