ARM: gemini: add two more board
v2 cover ARM: gemini: add two more board
I have two boards with a SL3516 SoC. Both are NAS box.
Changes since v1:
- ssi1328 use now redboot-fis partitions
- added pinctrl as asked by Linus Walleij
Corentin Labbe (5):
ARM: dts: gemini: add labels for USB, IDE, flash and ethernet
dt-bindings: add vendor prefix for edimax
dt-bindings: add vendor prefix for ssi
ARM: gemini: add device tree for edimax NS2502
ARM: gemini: add device tree for ssi1328
.../devicetree/bindings/vendor-prefixes.yaml | 4 + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/gemini-ns2502.dts | 148 ++++++++++++++++++ arch/arm/boot/dts/gemini-ssi1328.dts | 138 ++++++++++++++++ arch/arm/boot/dts/gemini.dtsi | 12 +- 5 files changed, 298 insertions(+), 6 deletions(-) create mode 100644 arch/arm/boot/dts/gemini-ns2502.dts create mode 100644 arch/arm/boot/dts/gemini-ssi1328.dts
Signature · 1 line
2.31.1
PATCH v2 1/5 ARM: dts: gemini: add labels for USB, IDE, flash and ethernet
Adding label will help simplify boards's dts.
--- arch/arm/boot/dts/gemini.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/gemini.dtsi +6 -6
@@ -16,7 +16,7 @@ soc { compatible = "simple-bus"; interrupt-parent = <&intcon>; - flash@30000000 { + flash: flash@30000000 { compatible = "cortina,gemini-flash", "cfi-flash"; syscon = <&syscon>; pinctrl-names = "default";
@@ -322,7 +322,7 @@ pci_intc: interrupt-controller { }; }; - ethernet@60000000 { + ethernet: ethernet@60000000 { compatible = "cortina,gemini-ethernet"; reg = <0x60000000 0x4000>, /* Global registers, queue */ <0x60004000 0x2000>, /* V-bit */
@@ -365,7 +365,7 @@ crypto: crypto@62000000 { clocks = <&syscon GEMINI_CLK_GATE_SECURITY>; }; - ide@63000000 { + ide0: ide@63000000 { compatible = "cortina,gemini-pata", "faraday,ftide010"; reg = <0x63000000 0x1000>; interrupts = <4 IRQ_TYPE_EDGE_RISING>;
@@ -378,7 +378,7 @@ ide@63000000 { #size-cells = <0>; }; - ide@63400000 { + ide1: ide@63400000 { compatible = "cortina,gemini-pata", "faraday,ftide010"; reg = <0x63400000 0x1000>; interrupts = <5 IRQ_TYPE_EDGE_RISING>;
@@ -421,7 +421,7 @@ display-controller@6a000000 { status = "disabled"; }; - usb@68000000 { + usb0: usb@68000000 { compatible = "cortina,gemini-usb", "faraday,fotg210"; reg = <0x68000000 0x1000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
@@ -442,7 +442,7 @@ usb@68000000 { status = "disabled"; }; - usb@69000000 { + usb1: usb@69000000 { compatible = "cortina,gemini-usb", "faraday,fotg210"; reg = <0x69000000 0x1000>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.31.1
PATCH v2 2/5 dt-bindings: add vendor prefix for edimax
In reply to Corentin LabbeAdd vendor prefix for EDIMAX Technology Co., Ltd (https://www.edimax.com/)
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -333,6 +333,8 @@ patternProperties: description: EBV Elektronik "^eckelmann,.*": description: Eckelmann AG + "^edimax,.*": + description: EDIMAX Technology Co., Ltd "^edt,.*": description: Emerging Display Technologies "^eeti,.*":
Signature · 1 line
2.31.1
Re: [PATCH v2 2/5] dt-bindings: add vendor prefix for edimax
Quoted 7 lines · Corentin Labbe
Add vendor prefix for EDIMAX Technology Co., Ltd (https://www.edimax.com/)
Signed-off-by Corentin Labbe <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
PATCH v2 3/5 dt-bindings: add vendor prefix for ssi
In reply to Corentin LabbeAdd vendor prefix for SSI Computer Corp (https://www.ssi.com.tw/)
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -1090,6 +1090,8 @@ patternProperties: description: Spansion Inc. "^sprd,.*": description: Spreadtrum Communications Inc. + "^ssi,.*": + description: SSI Computer Corp "^sst,.*": description: Silicon Storage Technology, Inc. "^sstar,.*":
Signature · 1 line
2.31.1
Re: [PATCH v2 3/5] dt-bindings: add vendor prefix for ssi
Quoted 7 lines · Corentin Labbe
Add vendor prefix for SSI Computer Corp (https://www.ssi.com.tw/)
Signed-off-by Corentin Labbe <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
PATCH v2 4/5 ARM: gemini: add device tree for edimax NS2502
In reply to Corentin LabbeThe edimax NS2502 is a NAS box running a SL3516 SoC.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/gemini-ns2502.dts | 148 ++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 arch/arm/boot/dts/gemini-ns2502.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -217,6 +217,7 @@ dtb-$(CONFIG_ARCH_GEMINI) += \ gemini-dlink-dir-685.dtb \ gemini-dlink-dns-313.dtb \ gemini-nas4220b.dtb \ + gemini-ns2502.dtb \ gemini-rut1xx.dtb \ gemini-sl93512r.dtb \ gemini-sq201.dtb \
arch/arm/boot/dts/gemini-ns2502.dts new file +148 -0
148 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v2 5/5 ARM: gemini: add device tree for ssi1328
In reply to Corentin LabbeThe SSI 1328 is a NAS box running a SL3516 SoC.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/gemini-ssi1328.dts | 138 +++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 arch/arm/boot/dts/gemini-ssi1328.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -221,6 +221,7 @@ dtb-$(CONFIG_ARCH_GEMINI) += \ gemini-rut1xx.dtb \ gemini-sl93512r.dtb \ gemini-sq201.dtb \ + gemini-ssi1328.dtb \ gemini-wbd111.dtb \ gemini-wbd222.dtb dtb-$(CONFIG_ARCH_HI3xxx) += \
arch/arm/boot/dts/gemini-ssi1328.dts new file +138 -0
138 lines not on this page · raw message
Signature · 1 line
2.31.1
Rob Herring
maintainerRe: [PATCH v2 5/5] ARM: gemini: add device tree for ssi1328
Quoted 27 lines · Corentin Labbe
The SSI 1328 is a NAS box running a SL3516 SoC.
Signed-off-by Corentin Labbe <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/gemini-ssi1328.dts | 138 +++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 arch/arm/boot/dts/gemini-ssi1328.dtsarch/arm/boot/dts/Makefile +1
-0@@ -221,6 +221,7 @@ dtb-$(CONFIG_ARCH_GEMINI) += \ gemini-rut1xx.dtb \ gemini-sl93512r.dtb \ gemini-sq201.dtb \ + gemini-ssi1328.dtb \ gemini-wbd111.dtb \ gemini-wbd222.dtb dtb-$(CONFIG_ARCH_HI3xxx) += \arch/arm/boot/dts/gemini-ssi1328.dts new file +0
-0
arch/arm/boot/dts/gemini-ssi1328.dts line 1
Quoted 1 line
arch/arm/boot/dts/gemini-ssi1328.dts new file +1
-0@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0
Dual license? No one runs BSD or other OS on these devices?
arch/arm/boot/dts/gemini-ssi1328.dts line 9
Quoted 8 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +8
-0+/* + * Copyright (C) 2021 Corentin Labbe <[email protected]> + * Device Tree file for SSI 1328 + */ + +/dts-v1/; + +#include "gemini.dtsi"
Though the license should match this file.
arch/arm/boot/dts/gemini-ssi1328.dts line 13
Quoted 4 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +4
-0+ +/ { + model = "SSI 1328"; + compatible = "ssi,1328", "cortina,gemini";
Where's ssi,1328 documented?
Quoted 6 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +6
-0+ #address-cells = <1>; + #size-cells = <1>; + + memory@0 { + /* 128 MB */ + device_type = "memory";
arch/arm/boot/dts/gemini-ssi1328.dts line 29
Quoted 10 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +10
-0+ reg = <0x00000000 0x8000000>; + }; + + aliases { + mdio-gpio0 = &mdio0; + }; + + chosen { + bootargs = "console=ttyS0,19200n8 initrd=0x900000,9M"; + stdout-path = &uart0;
Don't need both 'console' and stdout-path. (console should be removed)
Quoted 113 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +109
-0+ }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + /* LAN Marvell 88E1118 */ + phy0: ethernet-phy@1 { + reg = <1>; + device_type = "ethernet-phy"; + /* We lack the knowledge of necessary GPIO to achieve + * Gigabit + */ + max-speed = <100>; + }; + /* WAN ICPlus IP101A */ + phy1: ethernet-phy@2 { + reg = <2>; + device_type = "ethernet-phy"; + }; + }; +}; + +ðernet { + status = "okay"; + ethernet-port@0 { + phy-mode = "rgmii"; + phy-handle = <&phy0>; + }; + ethernet-port@1 { + phy-mode = "rgmii"; + phy-handle = <&phy1>; + }; +}; + +&flash { + status = "okay"; + /* 32MB of flash */ + reg = <0x30000000 0x03200000>; + + pinctrl-names = "enabled", "disabled"; + pinctrl-0 = <&pflash_default_pins>; + pinctrl-1 = <&pflash_disabled_pins>; + + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x7F>; + }; +}; + +&gpio0 { + pinctrl-names = "default"; + pinctrl-0 = <&gpio0_default_pins>; +}; + +&ide0 { + status = "okay"; +}; + +&ide1 { + status = "okay"; +}; + +&sata { + cortina,gemini-ata-muxmode = <0>; + cortina,gemini-enable-sata-bridge; + status = "okay"; +}; + +&syscon { + pinctrl { + /* + * gpio0agrp cover line 0-4 + * gpio0bgrp cover line 5 + */ + gpio0_default_pins: pinctrl-gpio0 { + mux { + function = "gpio0"; + groups = "gpio0agrp", "gpio0bgrp"; + }; + }; + pflash_disabled_pins: pinctrl-pflash-disabled { + mux { + function = "gpio0"; + groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp", + "gpio0kgrp"; + }; + }; + pinctrl-gmii { + /* This platform use both the ethernet ports */ + mux { + function = "gmii"; + groups = "gmii_gmac0_grp", "gmii_gmac1_grp"; + }; + }; + }; +}; + +&usb0 { + status = "okay"; +}; + +&usb1 { + status = "okay"; +};Signature · 1 line
2.31.1
Re: [PATCH v2 5/5] ARM: gemini: add device tree for ssi1328
Thanks Rob,
I fixed some issues while applying.
Quoted 4 lines · Rob Herring
arch/arm/boot/dts/gemini-ssi1328.dts line 13
Quoted 2 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +2
-0+ model = "SSI 1328"; + compatible = "ssi,1328", "cortina,gemini";Where's ssi,1328 documented?
I'll take a sweep and add all of the new machines.
Quoted 5 lines
arch/arm/boot/dts/gemini-ssi1328.dts line 29
Quoted 3 lines
arch/arm/boot/dts/gemini-ssi1328.dts new file +3
-0+ chosen { + bootargs = "console=ttyS0,19200n8 initrd=0x900000,9M"; + stdout-path = &uart0;Don't need both 'console' and stdout-path. (console should be removed)
How does one specify a default baudrate using that method?
Yours,
Linus Walleij
Quoted 6 lines · Corentin Labbe
I have two boards with a SL3516 SoC. Both are NAS box.
Changes since v1:
- ssi1328 use now redboot-fis partitions
- added pinctrl as asked by Linus Walleij
Quoted 6 lines
Corentin Labbe (5):
ARM: dts: gemini: add labels for USB, IDE, flash and ethernet
dt-bindings: add vendor prefix for edimax
dt-bindings: add vendor prefix for ssi
ARM: gemini: add device tree for edimax NS2502
ARM: gemini: add device tree for ssi1328
Thanks Corentin!
All patches applied for v5.15, I saw that the NS2502 does not make use of the redboot FIS partition table but that's no big deal, you can send a separate patch to fix that when you can test it.
Yours,
Linus Walleij