* [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
@ 2018-11-13 13:44 ` Marek Behún
0 siblings, 0 replies; 10+ messages in thread
From: Marek Behún @ 2018-11-13 13:44 UTC (permalink / raw)
To: linux-arm-kernel
This is a RFC, please do not merge.
This adds basic support for the Turris Mox board from CZ.NIC.
Turris Mox is as modular router based on the Armada 3720 SOC (same as
EspressoBin).
The basic module can be extended by different modules.
When those modules are connected, U-Boot has to let kernel know via
device-tree. Since modules can be connected in different order and
some modules can be connected multiple times (up to three 8-port
switch modules can be connected), using dtb overlays would result in
too files.
I therefore chose to put all the possible connected devices in one dts
and disable them. If U-Boot finds these modules, it fixes the device
tree accrodginly, by enabling some nodes (setting status to "okay") and
by setting some addresses and references.
For example there are 6 switch nodes - three for 8-port switch module
and three for 4-port switch module. This is because another switch
(either 8-port or 4-port) can be connected to a 8-port switch, in DSA,
and interface names have to be defined (from lan1 to lan24).
Another way (for defining switch nodes) would have to be either:
- including a file where switch nodes are defined, which would need
#defining lan interface names (and some other things), and #undefing
them after the #include
- defining a macro for switch nodes
- have a separate DTBs for each possible configuration (this would
result in too many DTBs)
- not defining these nodes in device-tree at all, instead creating
them in U-Boot when patching the device-tree (I actually tried this,
but the resulting code in U-Boot was horrible)
Please let me know if doing it this way is acceptable, or if I should
try something different (and if yes, what?).
Signed-off-by: Marek Beh?n <marek.behun@nic.cz>
Cc: Rob Herring <robh@kernel.org>
Cc: linux-kernel at vger.kernel.org
Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: Andrew Lunn <andrew@lunn.ch>
---
.../arm/marvell/armada-3720-turris-mox.txt | 6 +
MAINTAINERS | 1 +
arch/arm64/boot/dts/marvell/Makefile | 1 +
.../dts/marvell/armada-3720-turris-mox.dts | 838 ++++++++++++++++++
4 files changed, 846 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
new file mode 100644
index 000000000000..408fc07a9bbf
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
@@ -0,0 +1,6 @@
+CZ.NIC's Turris Mox SOHO router Device Tree Bindings
+----------------------------------------------------
+
+Required root node property:
+
+compatible: must contain "cznic,turris-mox"
diff --git a/MAINTAINERS b/MAINTAINERS
index f6e60e7f6c11..81b57260b110 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1348,6 +1348,7 @@ ARM/CZ.NIC TURRIS MOX SUPPORT
M: Marek Behun <marek.behun@nic.cz>
W: http://mox.turris.cz
S: Maintained
+F: arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
F: include/mfd/moxtet.h
F: drivers/gpio/gpio-moxtet.c
F: drivers/mfd/moxtet.c
diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
index 5633676fa9d0..51782b31b441 100644
--- a/arch/arm64/boot/dts/marvell/Makefile
+++ b/arch/arm64/boot/dts/marvell/Makefile
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
# Mvebu SoC Family
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
new file mode 100644
index 000000000000..1315c59ecef3
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -0,0 +1,838 @@
+// SPDX-License-Identifier: GPL-2.0+ or X11
+/*
+ * Device Tree file for CZ.NIC Turris Mox Board
+ * 2018 by Marek Behun <marek.behun@nic.cz>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include "armada-372x.dtsi"
+
+/ {
+ model = "CZ.NIC Turris Mox Board";
+ compatible = "cznic,turris-mox", "marvell,armada3720",
+ "marvell,armada3710";
+
+ aliases {
+ spi0 = &spi0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory at 0 {
+ device_type = "memory";
+ reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ red {
+ gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+
+ reset_button {
+ label = "reset";
+ linux,code = <BTN_MISC>;
+ gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
+ };
+ };
+
+ exp_usb3_vbus: usb3-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb3-vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
+ };
+
+ usb3_phy: usb3-phy {
+ compatible = "usb-nop-xceiv";
+ vcc-supply = <&exp_usb3_vbus>;
+ };
+
+ vsdc_reg: vsdc_reg {
+ compatible = "regulator-gpio";
+ regulator-name = "vsdc";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+
+ gpios = <&gpiosb 23 GPIO_ACTIVE_HIGH>;
+ gpios-states = <0>;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ enable-active-high;
+ };
+
+ vsdio_reg: vsdio_reg {
+ compatible = "regulator-gpio";
+ regulator-name = "vsdio";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+
+ gpios = <&gpiosb 22 GPIO_ACTIVE_HIGH>;
+ gpios-states = <0>;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ enable-active-high;
+ };
+
+ sdhci1_pwrseq: sdhci1_pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&gpionb 19 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+ };
+
+ sfp: sfp {
+ compatible = "sff,sfp+";
+ i2c-bus = <&i2c0>;
+ los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;
+ tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
+ mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
+ tx-disable-gpio = <&moxtet_sfp 3 GPIO_ACTIVE_HIGH>;
+ rate-select0-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
+ status = "disabled";
+ };
+};
+
+&pinctrl_nb {
+ spi_cs1_pins: spi-cs1-pins {
+ groups = "spi_cs1";
+ function = "spi";
+ };
+
+ sdio0_pins: sdio0-pins {
+ groups = "sdio0";
+ function = "sdio";
+ };
+};
+
+&pinctrl_sb {
+ sdio_sb_pins: sdio-sb-pins {
+ groups = "sdio_sb";
+ function = "sdio";
+ };
+
+ smi_pins: smi-pins {
+ groups = "smi";
+ function = "smi";
+ };
+
+ pcie_pins: pcie1-pins {
+ groups = "pcie1";
+ function = "gpio";
+ };
+};
+
+&i2c0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
+ status = "okay";
+
+ rtc at 6f {
+ compatible = "microchip,mcp7940x";
+ reg = <0x6f>;
+ };
+};
+
+&pcie0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie_pins>;
+ status = "okay";
+ max-link-speed = <2>;
+ reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
+
+ /* this shall be enabled by u-boot if the PCIe module is present */
+ status = "disabled";
+};
+
+&uart0 {
+ status = "okay";
+};
+
+ð0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&rgmii_pins>;
+ phy-mode = "rgmii-id";
+ phy = <&phy1>;
+ status = "okay";
+};
+
+ð1 {
+ phy-mode = "1000base-x";
+ managed = "in-band-status";
+};
+
+&mdio {
+ pinctrl-names = "default";
+ pinctrl-0 = <&smi_pins>;
+ status = "okay";
+
+ phy1: ethernet-phy at 1 {
+ reg = <1>;
+ };
+
+ switch0 at 10 {
+ compatible = "marvell,mv88e6190";
+ reg = <0x10 0>;
+ dsa,member = <0 0>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch0phy1: switch0phy1 at 1 {
+ reg = <0x1>;
+ };
+
+ switch0phy2: switch0phy2 at 2 {
+ reg = <0x2>;
+ };
+
+ switch0phy3: switch0phy3 at 3 {
+ reg = <0x3>;
+ };
+
+ switch0phy4: switch0phy4 at 4 {
+ reg = <0x4>;
+ };
+
+ switch0phy5: switch0phy5 at 5 {
+ reg = <0x5>;
+ };
+
+ switch0phy6: switch0phy6 at 6 {
+ reg = <0x6>;
+ };
+
+ switch0phy7: switch0phy7 at 7 {
+ reg = <0x7>;
+ };
+
+ switch0phy8: switch0phy8 at 8 {
+ reg = <0x8>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan1";
+ phy-handle = <&switch0phy1>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan2";
+ phy-handle = <&switch0phy2>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan3";
+ phy-handle = <&switch0phy3>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan4";
+ phy-handle = <&switch0phy4>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "lan5";
+ phy-handle = <&switch0phy5>;
+ };
+
+ port at 6 {
+ reg = <0x6>;
+ label = "lan6";
+ phy-handle = <&switch0phy6>;
+ };
+
+ port at 7 {
+ reg = <0x7>;
+ label = "lan7";
+ phy-handle = <&switch0phy7>;
+ };
+
+ port at 8 {
+ reg = <0x8>;
+ label = "lan8";
+ phy-handle = <&switch0phy8>;
+ };
+
+ port at 9 {
+ reg = <0x9>;
+ label = "cpu";
+ ethernet = <ð1>;
+ };
+
+ switch0port10: port at a {
+ reg = <0xa>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch1port9 &switch2port9>;
+ status = "disabled";
+ };
+
+ port-sfp at a {
+ reg = <0xa>;
+ label = "sfp";
+ sfp = <&sfp>;
+ phy-mode = "sgmii";
+ managed = "in-band-status";
+ status = "disabled";
+ };
+ };
+ };
+
+ switch0 at 2 {
+ compatible = "marvell,mv88e6085";
+ reg = <0x2 0>;
+ dsa,member = <0 0>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch0phy1_topaz: switch0phy1 at 11 {
+ reg = <0x11>;
+ };
+
+ switch0phy2_topaz: switch0phy2 at 12 {
+ reg = <0x12>;
+ };
+
+ switch0phy3_topaz: switch0phy3 at 13 {
+ reg = <0x13>;
+ };
+
+ switch0phy4_topaz: switch0phy4 at 14 {
+ reg = <0x14>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan1";
+ phy-handle = <&switch0phy1_topaz>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan2";
+ phy-handle = <&switch0phy2_topaz>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan3";
+ phy-handle = <&switch0phy3_topaz>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan4";
+ phy-handle = <&switch0phy4_topaz>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "cpu";
+ ethernet = <ð1>;
+ };
+ };
+ };
+
+ switch1 at 11 {
+ compatible = "marvell,mv88e6190";
+ reg = <0x11 0>;
+ dsa,member = <0 1>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch1phy1: switch1phy1 at 1 {
+ reg = <0x1>;
+ };
+
+ switch1phy2: switch1phy2 at 2 {
+ reg = <0x2>;
+ };
+
+ switch1phy3: switch1phy3 at 3 {
+ reg = <0x3>;
+ };
+
+ switch1phy4: switch1phy4 at 4 {
+ reg = <0x4>;
+ };
+
+ switch1phy5: switch1phy5 at 5 {
+ reg = <0x5>;
+ };
+
+ switch1phy6: switch1phy6 at 6 {
+ reg = <0x6>;
+ };
+
+ switch1phy7: switch1phy7 at 7 {
+ reg = <0x7>;
+ };
+
+ switch1phy8: switch1phy8 at 8 {
+ reg = <0x8>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan9";
+ phy-handle = <&switch1phy1>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan10";
+ phy-handle = <&switch1phy2>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan11";
+ phy-handle = <&switch1phy3>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan12";
+ phy-handle = <&switch1phy4>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "lan13";
+ phy-handle = <&switch1phy5>;
+ };
+
+ port at 6 {
+ reg = <0x6>;
+ label = "lan14";
+ phy-handle = <&switch1phy6>;
+ };
+
+ port at 7 {
+ reg = <0x7>;
+ label = "lan15";
+ phy-handle = <&switch1phy7>;
+ };
+
+ port at 8 {
+ reg = <0x8>;
+ label = "lan16";
+ phy-handle = <&switch1phy8>;
+ };
+
+ switch1port9: port at 9 {
+ reg = <0x9>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch0port10>;
+ };
+
+ switch1port10: port at a {
+ reg = <0xa>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch2port9>;
+ status = "disabled";
+ };
+
+ port-sfp at a {
+ reg = <0xa>;
+ label = "sfp";
+ sfp = <&sfp>;
+ phy-mode = "sgmii";
+ managed = "in-band-status";
+ status = "disabled";
+ };
+ };
+ };
+
+ switch1 at 2 {
+ compatible = "marvell,mv88e6085";
+ reg = <0x2 0>;
+ dsa,member = <0 1>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch1phy1_topaz: switch1phy1 at 11 {
+ reg = <0x11>;
+ };
+
+ switch1phy2_topaz: switch1phy2 at 12 {
+ reg = <0x12>;
+ };
+
+ switch1phy3_topaz: switch1phy3 at 13 {
+ reg = <0x13>;
+ };
+
+ switch1phy4_topaz: switch1phy4 at 14 {
+ reg = <0x14>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan9";
+ phy-handle = <&switch1phy1_topaz>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan10";
+ phy-handle = <&switch1phy2_topaz>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan11";
+ phy-handle = <&switch1phy3_topaz>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan12";
+ phy-handle = <&switch1phy4_topaz>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch0port10>;
+ };
+ };
+ };
+
+ switch2 at 12 {
+ compatible = "marvell,mv88e6190";
+ reg = <0x12 0>;
+ dsa,member = <0 2>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch2phy1: switch2phy1 at 1 {
+ reg = <0x1>;
+ };
+
+ switch2phy2: switch2phy2 at 2 {
+ reg = <0x2>;
+ };
+
+ switch2phy3: switch2phy3 at 3 {
+ reg = <0x3>;
+ };
+
+ switch2phy4: switch2phy4 at 4 {
+ reg = <0x4>;
+ };
+
+ switch2phy5: switch2phy5 at 5 {
+ reg = <0x5>;
+ };
+
+ switch2phy6: switch2phy6 at 6 {
+ reg = <0x6>;
+ };
+
+ switch2phy7: switch2phy7 at 7 {
+ reg = <0x7>;
+ };
+
+ switch2phy8: switch2phy8 at 8 {
+ reg = <0x8>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan17";
+ phy-handle = <&switch2phy1>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan18";
+ phy-handle = <&switch2phy2>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan19";
+ phy-handle = <&switch2phy3>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan20";
+ phy-handle = <&switch2phy4>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "lan21";
+ phy-handle = <&switch2phy5>;
+ };
+
+ port at 6 {
+ reg = <0x6>;
+ label = "lan22";
+ phy-handle = <&switch2phy6>;
+ };
+
+ port at 7 {
+ reg = <0x7>;
+ label = "lan23";
+ phy-handle = <&switch2phy7>;
+ };
+
+ port at 8 {
+ reg = <0x8>;
+ label = "lan24";
+ phy-handle = <&switch2phy8>;
+ };
+
+ switch2port9: port at 9 {
+ reg = <0x9>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch1port10 &switch0port10>;
+ };
+
+ port-sfp at a {
+ reg = <0xa>;
+ label = "sfp";
+ sfp = <&sfp>;
+ phy-mode = "sgmii";
+ managed = "in-band-status";
+ status = "disabled";
+ };
+ };
+ };
+
+ switch2 at 2 {
+ compatible = "marvell,mv88e6085";
+ reg = <0x2 0>;
+ dsa,member = <0 2>;
+ interrupt-parent = <&gpiosb>;
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+ status = "disabled";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch2phy1_topaz: switch2phy1 at 11 {
+ reg = <0x11>;
+ };
+
+ switch2phy2_topaz: switch2phy2 at 12 {
+ reg = <0x12>;
+ };
+
+ switch2phy3_topaz: switch2phy3 at 13 {
+ reg = <0x13>;
+ };
+
+ switch2phy4_topaz: switch2phy4 at 14 {
+ reg = <0x14>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 1 {
+ reg = <0x1>;
+ label = "lan17";
+ phy-handle = <&switch2phy1_topaz>;
+ };
+
+ port at 2 {
+ reg = <0x2>;
+ label = "lan18";
+ phy-handle = <&switch2phy2_topaz>;
+ };
+
+ port at 3 {
+ reg = <0x3>;
+ label = "lan19";
+ phy-handle = <&switch2phy3_topaz>;
+ };
+
+ port at 4 {
+ reg = <0x4>;
+ label = "lan20";
+ phy-handle = <&switch2phy4_topaz>;
+ };
+
+ port at 5 {
+ reg = <0x5>;
+ label = "dsa";
+ phy-mode = "2500base-x";
+ link = <&switch1port10 &switch0port10>;
+ };
+ };
+ };
+
+};
+
+&sdhci0 {
+ wp-inverted;
+ bus-width = <4>;
+ cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
+ vqmmc-supply = <&vsdc_reg>;
+ marvell,pad-type = "sd";
+ status = "okay";
+};
+
+&sdhci1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdio0_pins &sdio_sb_pins>;
+ non-removable;
+ bus-width = <4>;
+ marvell,pad-type = "sd";
+ vqmmc-supply = <&vsdio_reg>;
+ mmc-pwrseq = <&sdhci1_pwrseq>;
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi_quad_pins &spi_cs1_pins>;
+ assigned-clocks = <&nb_periph_clk 7>;
+ assigned-clock-parents = <&tbg 1>;
+ assigned-clock-rates = <20000000>;
+
+ spi-flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
+
+ partition at 0 {
+ label = "secure-firmware";
+ reg = <0x0 0x20000>;
+ };
+
+ partition at 20000 {
+ label = "u-boot";
+ reg = <0x20000 0x160000>;
+ };
+
+ partition at 180000 {
+ label = "u-boot-env";
+ reg = <0x180000 0x10000>;
+ };
+
+ partition at 190000 {
+ label = "Rescue system";
+ reg = <0x190000 0x660000>;
+ };
+
+ partition at 7f0000 {
+ label = "dtb";
+ reg = <0x7f0000 0x10000>;
+ };
+ };
+
+ moxtet at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "cznic,moxtet";
+ reg = <1>;
+ devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
+ spi-max-frequency = <10000000>;
+ spi-cpol;
+ spi-cpha;
+
+ moxtet_sfp: moxtet-sfp at 0 {
+ compatible = "cznic,moxtet-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ reg = <0>;
+ moxtet,id = <1>;
+ moxtet,input-mask = <0x7>;
+ moxtet,output-mask = <0x3>;
+ status = "disabled";
+ };
+ };
+};
+
+&usb2 {
+ status = "okay";
+};
+
+&usb3 {
+ status = "okay";
+ usb-phy = <&usb3_phy>;
+};
--
2.18.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
2018-11-13 13:44 ` Marek Behún
@ 2018-12-04 20:37 ` Rob Herring
-1 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2018-12-04 20:37 UTC (permalink / raw)
To: Marek Behún
Cc: devicetree, linux-kernel, Gregory CLEMENT, linux-arm-kernel, Andrew Lunn
On Tue, Nov 13, 2018 at 02:44:08PM +0100, Marek Behún wrote:
> This is a RFC, please do not merge.
>
> This adds basic support for the Turris Mox board from CZ.NIC.
>
> Turris Mox is as modular router based on the Armada 3720 SOC (same as
> EspressoBin).
>
> The basic module can be extended by different modules.
> When those modules are connected, U-Boot has to let kernel know via
> device-tree. Since modules can be connected in different order and
> some modules can be connected multiple times (up to three 8-port
> switch modules can be connected), using dtb overlays would result in
> too files.
>
> I therefore chose to put all the possible connected devices in one dts
> and disable them. If U-Boot finds these modules, it fixes the device
> tree accrodginly, by enabling some nodes (setting status to "okay") and
> by setting some addresses and references.
Given it is a whole hierarchy of nodes, might be cleaner if u-boot
removes the whole sub-tree of disable nodes.
> For example there are 6 switch nodes - three for 8-port switch module
> and three for 4-port switch module. This is because another switch
> (either 8-port or 4-port) can be connected to a 8-port switch, in DSA,
> and interface names have to be defined (from lan1 to lan24).
>
> Another way (for defining switch nodes) would have to be either:
> - including a file where switch nodes are defined, which would need
> #defining lan interface names (and some other things), and #undefing
> them after the #include
> - defining a macro for switch nodes
> - have a separate DTBs for each possible configuration (this would
> result in too many DTBs)
> - not defining these nodes in device-tree at all, instead creating
> them in U-Boot when patching the device-tree (I actually tried this,
> but the resulting code in U-Boot was horrible)
>
> Please let me know if doing it this way is acceptable, or if I should
> try something different (and if yes, what?).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Cc: Rob Herring <robh@kernel.org>
> Cc: linux-kernel@vger.kernel.org
> Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Andrew Lunn <andrew@lunn.ch>
> ---
> .../arm/marvell/armada-3720-turris-mox.txt | 6 +
> MAINTAINERS | 1 +
> arch/arm64/boot/dts/marvell/Makefile | 1 +
> .../dts/marvell/armada-3720-turris-mox.dts | 838 ++++++++++++++++++
> 4 files changed, 846 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
>
> diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> new file mode 100644
> index 000000000000..408fc07a9bbf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> @@ -0,0 +1,6 @@
> +CZ.NIC's Turris Mox SOHO router Device Tree Bindings
> +----------------------------------------------------
> +
> +Required root node property:
> +
> +compatible: must contain "cznic,turris-mox"
This should also contain the SoC compatible. Please add this to where
that is defined instead of a new file.
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f6e60e7f6c11..81b57260b110 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1348,6 +1348,7 @@ ARM/CZ.NIC TURRIS MOX SUPPORT
> M: Marek Behun <marek.behun@nic.cz>
> W: http://mox.turris.cz
> S: Maintained
> +F: arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> F: include/mfd/moxtet.h
> F: drivers/gpio/gpio-moxtet.c
> F: drivers/mfd/moxtet.c
> diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
> index 5633676fa9d0..51782b31b441 100644
> --- a/arch/arm64/boot/dts/marvell/Makefile
> +++ b/arch/arm64/boot/dts/marvell/Makefile
> @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
> # Mvebu SoC Family
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
> +dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> new file mode 100644
> index 000000000000..1315c59ecef3
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -0,0 +1,838 @@
> +// SPDX-License-Identifier: GPL-2.0+ or X11
> +/*
> + * Device Tree file for CZ.NIC Turris Mox Board
> + * 2018 by Marek Behun <marek.behun@nic.cz>
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include "armada-372x.dtsi"
> +
> +/ {
> + model = "CZ.NIC Turris Mox Board";
> + compatible = "cznic,turris-mox", "marvell,armada3720",
> + "marvell,armada3710";
> +
> + aliases {
> + spi0 = &spi0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory@0 {
> + device_type = "memory";
> + reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + red {
> + gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> +
> + reset_button {
reset {
Don't use '_' in node names. Building with W=2 will tell you this. You
chould build with W=1 and fix any warnings this file adds.
> + label = "reset";
> + linux,code = <BTN_MISC>;
> + gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
> + debounce-interval = <60>;
> + };
> + };
> +
> + exp_usb3_vbus: usb3-vbus {
> + compatible = "regulator-fixed";
> + regulator-name = "usb3-vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
> + };
> +
> + usb3_phy: usb3-phy {
> + compatible = "usb-nop-xceiv";
> + vcc-supply = <&exp_usb3_vbus>;
> + };
> +
> + vsdc_reg: vsdc_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdc";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 23 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + vsdio_reg: vsdio_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdio";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 22 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + sdhci1_pwrseq: sdhci1_pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&gpionb 19 GPIO_ACTIVE_HIGH>;
> + status = "okay";
> + };
> +
> + sfp: sfp {
> + compatible = "sff,sfp+";
> + i2c-bus = <&i2c0>;
> + los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;
> + tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
> + mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
> + tx-disable-gpio = <&moxtet_sfp 3 GPIO_ACTIVE_HIGH>;
> + rate-select0-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> + };
> +};
> +
> +&pinctrl_nb {
> + spi_cs1_pins: spi-cs1-pins {
> + groups = "spi_cs1";
> + function = "spi";
> + };
> +
> + sdio0_pins: sdio0-pins {
> + groups = "sdio0";
> + function = "sdio";
> + };
> +};
> +
> +&pinctrl_sb {
> + sdio_sb_pins: sdio-sb-pins {
> + groups = "sdio_sb";
> + function = "sdio";
> + };
> +
> + smi_pins: smi-pins {
> + groups = "smi";
> + function = "smi";
> + };
> +
> + pcie_pins: pcie1-pins {
> + groups = "pcie1";
> + function = "gpio";
> + };
> +};
> +
> +&i2c0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c1_pins>;
> + status = "okay";
> +
> + rtc@6f {
> + compatible = "microchip,mcp7940x";
> + reg = <0x6f>;
> + };
> +};
> +
> +&pcie0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_pins>;
> + status = "okay";
> + max-link-speed = <2>;
> + reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
reset-gpios is the preferred form.
> +
> + /* this shall be enabled by u-boot if the PCIe module is present */
> + status = "disabled";
> +};
> +
> +&uart0 {
> + status = "okay";
> +};
> +
> +ð0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&rgmii_pins>;
> + phy-mode = "rgmii-id";
> + phy = <&phy1>;
> + status = "okay";
> +};
> +
> +ð1 {
> + phy-mode = "1000base-x";
> + managed = "in-band-status";
> +};
> +
> +&mdio {
> + pinctrl-names = "default";
> + pinctrl-0 = <&smi_pins>;
> + status = "okay";
> +
> + phy1: ethernet-phy@1 {
> + reg = <1>;
> + };
> +
> + switch0@10 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x10 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1: switch0phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch0phy2: switch0phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch0phy3: switch0phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch0phy4: switch0phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch0phy5: switch0phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch0phy6: switch0phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch0phy7: switch0phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch0phy8: switch0phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan5";
> + phy-handle = <&switch0phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan6";
> + phy-handle = <&switch0phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan7";
> + phy-handle = <&switch0phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan8";
> + phy-handle = <&switch0phy8>;
> + };
> +
> + port@9 {
> + reg = <0x9>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> +
> + switch0port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port9 &switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch0@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1_topaz: switch0phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch0phy2_topaz: switch0phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch0phy3_topaz: switch0phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch0phy4_topaz: switch0phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> + };
> + };
> +
> + switch1@11 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x11 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1: switch1phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch1phy2: switch1phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch1phy3: switch1phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch1phy4: switch1phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch1phy5: switch1phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch1phy6: switch1phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch1phy7: switch1phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch1phy8: switch1phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan13";
> + phy-handle = <&switch1phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan14";
> + phy-handle = <&switch1phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan15";
> + phy-handle = <&switch1phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan16";
> + phy-handle = <&switch1phy8>;
> + };
> +
> + switch1port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> +
> + switch1port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch1@2 {
Ideally, we shouldn't have this switch0, switch1, etc.
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1_topaz: switch1phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch1phy2_topaz: switch1phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch1phy3_topaz: switch1phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch1phy4_topaz: switch1phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> + };
> + };
> +
> + switch2@12 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x12 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1: switch2phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch2phy2: switch2phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch2phy3: switch2phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch2phy4: switch2phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch2phy5: switch2phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch2phy6: switch2phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch2phy7: switch2phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch2phy8: switch2phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan21";
> + phy-handle = <&switch2phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan22";
> + phy-handle = <&switch2phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan23";
> + phy-handle = <&switch2phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan24";
> + phy-handle = <&switch2phy8>;
> + };
> +
> + switch2port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch2@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1_topaz: switch2phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch2phy2_topaz: switch2phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch2phy3_topaz: switch2phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch2phy4_topaz: switch2phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> + };
> + };
> +
> +};
> +
> +&sdhci0 {
> + wp-inverted;
> + bus-width = <4>;
> + cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
> + vqmmc-supply = <&vsdc_reg>;
> + marvell,pad-type = "sd";
> + status = "okay";
> +};
> +
> +&sdhci1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdio0_pins &sdio_sb_pins>;
> + non-removable;
> + bus-width = <4>;
> + marvell,pad-type = "sd";
> + vqmmc-supply = <&vsdio_reg>;
> + mmc-pwrseq = <&sdhci1_pwrseq>;
> + status = "okay";
> +};
> +
> +&spi0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi_quad_pins &spi_cs1_pins>;
> + assigned-clocks = <&nb_periph_clk 7>;
> + assigned-clock-parents = <&tbg 1>;
> + assigned-clock-rates = <20000000>;
> +
> + spi-flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <20000000>;
> +
> + partition@0 {
All these under a 'partitions' node is preferred.
> + label = "secure-firmware";
> + reg = <0x0 0x20000>;
> + };
> +
> + partition@20000 {
> + label = "u-boot";
> + reg = <0x20000 0x160000>;
> + };
> +
> + partition@180000 {
> + label = "u-boot-env";
> + reg = <0x180000 0x10000>;
> + };
> +
> + partition@190000 {
> + label = "Rescue system";
> + reg = <0x190000 0x660000>;
> + };
> +
> + partition@7f0000 {
> + label = "dtb";
> + reg = <0x7f0000 0x10000>;
> + };
> + };
> +
> + moxtet@1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "cznic,moxtet";
All this node needs to be documented.
> + reg = <1>;
> + devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
Not documented. reset-gpios is preferred for GPIO reset lines.
> + spi-max-frequency = <10000000>;
> + spi-cpol;
> + spi-cpha;
> +
> + moxtet_sfp: moxtet-sfp@0 {
> + compatible = "cznic,moxtet-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + reg = <0>;
> + moxtet,id = <1>;
> + moxtet,input-mask = <0x7>;
> + moxtet,output-mask = <0x3>;
> + status = "disabled";
> + };
> + };
> +};
> +
> +&usb2 {
> + status = "okay";
> +};
> +
> +&usb3 {
> + status = "okay";
> + usb-phy = <&usb3_phy>;
> +};
> --
> 2.18.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
@ 2018-12-04 20:37 ` Rob Herring
0 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2018-12-04 20:37 UTC (permalink / raw)
To: Marek Behún
Cc: devicetree, Gregory CLEMENT, linux-kernel, linux-arm-kernel, Andrew Lunn
On Tue, Nov 13, 2018 at 02:44:08PM +0100, Marek Behún wrote:
> This is a RFC, please do not merge.
>
> This adds basic support for the Turris Mox board from CZ.NIC.
>
> Turris Mox is as modular router based on the Armada 3720 SOC (same as
> EspressoBin).
>
> The basic module can be extended by different modules.
> When those modules are connected, U-Boot has to let kernel know via
> device-tree. Since modules can be connected in different order and
> some modules can be connected multiple times (up to three 8-port
> switch modules can be connected), using dtb overlays would result in
> too files.
>
> I therefore chose to put all the possible connected devices in one dts
> and disable them. If U-Boot finds these modules, it fixes the device
> tree accrodginly, by enabling some nodes (setting status to "okay") and
> by setting some addresses and references.
Given it is a whole hierarchy of nodes, might be cleaner if u-boot
removes the whole sub-tree of disable nodes.
> For example there are 6 switch nodes - three for 8-port switch module
> and three for 4-port switch module. This is because another switch
> (either 8-port or 4-port) can be connected to a 8-port switch, in DSA,
> and interface names have to be defined (from lan1 to lan24).
>
> Another way (for defining switch nodes) would have to be either:
> - including a file where switch nodes are defined, which would need
> #defining lan interface names (and some other things), and #undefing
> them after the #include
> - defining a macro for switch nodes
> - have a separate DTBs for each possible configuration (this would
> result in too many DTBs)
> - not defining these nodes in device-tree at all, instead creating
> them in U-Boot when patching the device-tree (I actually tried this,
> but the resulting code in U-Boot was horrible)
>
> Please let me know if doing it this way is acceptable, or if I should
> try something different (and if yes, what?).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Cc: Rob Herring <robh@kernel.org>
> Cc: linux-kernel@vger.kernel.org
> Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Andrew Lunn <andrew@lunn.ch>
> ---
> .../arm/marvell/armada-3720-turris-mox.txt | 6 +
> MAINTAINERS | 1 +
> arch/arm64/boot/dts/marvell/Makefile | 1 +
> .../dts/marvell/armada-3720-turris-mox.dts | 838 ++++++++++++++++++
> 4 files changed, 846 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
>
> diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> new file mode 100644
> index 000000000000..408fc07a9bbf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> @@ -0,0 +1,6 @@
> +CZ.NIC's Turris Mox SOHO router Device Tree Bindings
> +----------------------------------------------------
> +
> +Required root node property:
> +
> +compatible: must contain "cznic,turris-mox"
This should also contain the SoC compatible. Please add this to where
that is defined instead of a new file.
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f6e60e7f6c11..81b57260b110 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1348,6 +1348,7 @@ ARM/CZ.NIC TURRIS MOX SUPPORT
> M: Marek Behun <marek.behun@nic.cz>
> W: http://mox.turris.cz
> S: Maintained
> +F: arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> F: include/mfd/moxtet.h
> F: drivers/gpio/gpio-moxtet.c
> F: drivers/mfd/moxtet.c
> diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
> index 5633676fa9d0..51782b31b441 100644
> --- a/arch/arm64/boot/dts/marvell/Makefile
> +++ b/arch/arm64/boot/dts/marvell/Makefile
> @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
> # Mvebu SoC Family
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
> +dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> new file mode 100644
> index 000000000000..1315c59ecef3
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -0,0 +1,838 @@
> +// SPDX-License-Identifier: GPL-2.0+ or X11
> +/*
> + * Device Tree file for CZ.NIC Turris Mox Board
> + * 2018 by Marek Behun <marek.behun@nic.cz>
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include "armada-372x.dtsi"
> +
> +/ {
> + model = "CZ.NIC Turris Mox Board";
> + compatible = "cznic,turris-mox", "marvell,armada3720",
> + "marvell,armada3710";
> +
> + aliases {
> + spi0 = &spi0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory@0 {
> + device_type = "memory";
> + reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + red {
> + gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> +
> + reset_button {
reset {
Don't use '_' in node names. Building with W=2 will tell you this. You
chould build with W=1 and fix any warnings this file adds.
> + label = "reset";
> + linux,code = <BTN_MISC>;
> + gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
> + debounce-interval = <60>;
> + };
> + };
> +
> + exp_usb3_vbus: usb3-vbus {
> + compatible = "regulator-fixed";
> + regulator-name = "usb3-vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
> + };
> +
> + usb3_phy: usb3-phy {
> + compatible = "usb-nop-xceiv";
> + vcc-supply = <&exp_usb3_vbus>;
> + };
> +
> + vsdc_reg: vsdc_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdc";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 23 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + vsdio_reg: vsdio_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdio";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 22 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + sdhci1_pwrseq: sdhci1_pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&gpionb 19 GPIO_ACTIVE_HIGH>;
> + status = "okay";
> + };
> +
> + sfp: sfp {
> + compatible = "sff,sfp+";
> + i2c-bus = <&i2c0>;
> + los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;
> + tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
> + mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
> + tx-disable-gpio = <&moxtet_sfp 3 GPIO_ACTIVE_HIGH>;
> + rate-select0-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> + };
> +};
> +
> +&pinctrl_nb {
> + spi_cs1_pins: spi-cs1-pins {
> + groups = "spi_cs1";
> + function = "spi";
> + };
> +
> + sdio0_pins: sdio0-pins {
> + groups = "sdio0";
> + function = "sdio";
> + };
> +};
> +
> +&pinctrl_sb {
> + sdio_sb_pins: sdio-sb-pins {
> + groups = "sdio_sb";
> + function = "sdio";
> + };
> +
> + smi_pins: smi-pins {
> + groups = "smi";
> + function = "smi";
> + };
> +
> + pcie_pins: pcie1-pins {
> + groups = "pcie1";
> + function = "gpio";
> + };
> +};
> +
> +&i2c0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c1_pins>;
> + status = "okay";
> +
> + rtc@6f {
> + compatible = "microchip,mcp7940x";
> + reg = <0x6f>;
> + };
> +};
> +
> +&pcie0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_pins>;
> + status = "okay";
> + max-link-speed = <2>;
> + reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
reset-gpios is the preferred form.
> +
> + /* this shall be enabled by u-boot if the PCIe module is present */
> + status = "disabled";
> +};
> +
> +&uart0 {
> + status = "okay";
> +};
> +
> +ð0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&rgmii_pins>;
> + phy-mode = "rgmii-id";
> + phy = <&phy1>;
> + status = "okay";
> +};
> +
> +ð1 {
> + phy-mode = "1000base-x";
> + managed = "in-band-status";
> +};
> +
> +&mdio {
> + pinctrl-names = "default";
> + pinctrl-0 = <&smi_pins>;
> + status = "okay";
> +
> + phy1: ethernet-phy@1 {
> + reg = <1>;
> + };
> +
> + switch0@10 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x10 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1: switch0phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch0phy2: switch0phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch0phy3: switch0phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch0phy4: switch0phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch0phy5: switch0phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch0phy6: switch0phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch0phy7: switch0phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch0phy8: switch0phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan5";
> + phy-handle = <&switch0phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan6";
> + phy-handle = <&switch0phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan7";
> + phy-handle = <&switch0phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan8";
> + phy-handle = <&switch0phy8>;
> + };
> +
> + port@9 {
> + reg = <0x9>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> +
> + switch0port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port9 &switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch0@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1_topaz: switch0phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch0phy2_topaz: switch0phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch0phy3_topaz: switch0phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch0phy4_topaz: switch0phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> + };
> + };
> +
> + switch1@11 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x11 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1: switch1phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch1phy2: switch1phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch1phy3: switch1phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch1phy4: switch1phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch1phy5: switch1phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch1phy6: switch1phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch1phy7: switch1phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch1phy8: switch1phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan13";
> + phy-handle = <&switch1phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan14";
> + phy-handle = <&switch1phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan15";
> + phy-handle = <&switch1phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan16";
> + phy-handle = <&switch1phy8>;
> + };
> +
> + switch1port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> +
> + switch1port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch1@2 {
Ideally, we shouldn't have this switch0, switch1, etc.
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1_topaz: switch1phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch1phy2_topaz: switch1phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch1phy3_topaz: switch1phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch1phy4_topaz: switch1phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> + };
> + };
> +
> + switch2@12 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x12 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1: switch2phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch2phy2: switch2phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch2phy3: switch2phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch2phy4: switch2phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch2phy5: switch2phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch2phy6: switch2phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch2phy7: switch2phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch2phy8: switch2phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan21";
> + phy-handle = <&switch2phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan22";
> + phy-handle = <&switch2phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan23";
> + phy-handle = <&switch2phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan24";
> + phy-handle = <&switch2phy8>;
> + };
> +
> + switch2port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch2@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1_topaz: switch2phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch2phy2_topaz: switch2phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch2phy3_topaz: switch2phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch2phy4_topaz: switch2phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> + };
> + };
> +
> +};
> +
> +&sdhci0 {
> + wp-inverted;
> + bus-width = <4>;
> + cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
> + vqmmc-supply = <&vsdc_reg>;
> + marvell,pad-type = "sd";
> + status = "okay";
> +};
> +
> +&sdhci1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdio0_pins &sdio_sb_pins>;
> + non-removable;
> + bus-width = <4>;
> + marvell,pad-type = "sd";
> + vqmmc-supply = <&vsdio_reg>;
> + mmc-pwrseq = <&sdhci1_pwrseq>;
> + status = "okay";
> +};
> +
> +&spi0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi_quad_pins &spi_cs1_pins>;
> + assigned-clocks = <&nb_periph_clk 7>;
> + assigned-clock-parents = <&tbg 1>;
> + assigned-clock-rates = <20000000>;
> +
> + spi-flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <20000000>;
> +
> + partition@0 {
All these under a 'partitions' node is preferred.
> + label = "secure-firmware";
> + reg = <0x0 0x20000>;
> + };
> +
> + partition@20000 {
> + label = "u-boot";
> + reg = <0x20000 0x160000>;
> + };
> +
> + partition@180000 {
> + label = "u-boot-env";
> + reg = <0x180000 0x10000>;
> + };
> +
> + partition@190000 {
> + label = "Rescue system";
> + reg = <0x190000 0x660000>;
> + };
> +
> + partition@7f0000 {
> + label = "dtb";
> + reg = <0x7f0000 0x10000>;
> + };
> + };
> +
> + moxtet@1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "cznic,moxtet";
All this node needs to be documented.
> + reg = <1>;
> + devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
Not documented. reset-gpios is preferred for GPIO reset lines.
> + spi-max-frequency = <10000000>;
> + spi-cpol;
> + spi-cpha;
> +
> + moxtet_sfp: moxtet-sfp@0 {
> + compatible = "cznic,moxtet-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + reg = <0>;
> + moxtet,id = <1>;
> + moxtet,input-mask = <0x7>;
> + moxtet,output-mask = <0x3>;
> + status = "disabled";
> + };
> + };
> +};
> +
> +&usb2 {
> + status = "okay";
> +};
> +
> +&usb3 {
> + status = "okay";
> + usb-phy = <&usb3_phy>;
> +};
> --
> 2.18.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
2018-12-04 20:37 ` Rob Herring
@ 2018-12-13 4:08 ` Marek Behun
-1 siblings, 0 replies; 10+ messages in thread
From: Marek Behun @ 2018-12-13 4:08 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, linux-kernel, Gregory CLEMENT, linux-arm-kernel, Andrew Lunn
Hi Rob
On Tue, 4 Dec 2018 14:37:06 -0600
Rob Herring <robh@kernel.org> wrote:
> > +
> > + switch1@2 {
>
> Ideally, we shouldn't have this switch0, switch1, etc.
I can rename peridot switches (switch0@10, switch1@11, switch2@12 to
swtich@10, switch@11, switch@12), but I cannot rename Topaz to
switch@2. Topaz always has MDIO address 2, because there can be only
one, but it can be connected either directly or after the first or
second peridot. Therefore I have three different nodes, each describing
different connection to the previous switch/cpu.
How should I rename it?
Marek
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
@ 2018-12-13 4:08 ` Marek Behun
0 siblings, 0 replies; 10+ messages in thread
From: Marek Behun @ 2018-12-13 4:08 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, Gregory CLEMENT, linux-kernel, linux-arm-kernel, Andrew Lunn
Hi Rob
On Tue, 4 Dec 2018 14:37:06 -0600
Rob Herring <robh@kernel.org> wrote:
> > +
> > + switch1@2 {
>
> Ideally, we shouldn't have this switch0, switch1, etc.
I can rename peridot switches (switch0@10, switch1@11, switch2@12 to
swtich@10, switch@11, switch@12), but I cannot rename Topaz to
switch@2. Topaz always has MDIO address 2, because there can be only
one, but it can be connected either directly or after the first or
second peridot. Therefore I have three different nodes, each describing
different connection to the previous switch/cpu.
How should I rename it?
Marek
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
2018-11-13 13:44 ` Marek Behún
@ 2019-01-18 14:35 ` Gregory CLEMENT
-1 siblings, 0 replies; 10+ messages in thread
From: Gregory CLEMENT @ 2019-01-18 14:35 UTC (permalink / raw)
To: Marek Behún
Cc: devicetree, Rob Herring, Andrew Lunn, linux-kernel, linux-arm-kernel
Hi Marek,
On mar., nov. 13 2018, Marek Behún <marek.behun@nic.cz> wrote:
> This is a RFC, please do not merge.
>
> This adds basic support for the Turris Mox board from CZ.NIC.
>
> Turris Mox is as modular router based on the Armada 3720 SOC (same as
> EspressoBin).
>
> The basic module can be extended by different modules.
> When those modules are connected, U-Boot has to let kernel know via
> device-tree. Since modules can be connected in different order and
> some modules can be connected multiple times (up to three 8-port
> switch modules can be connected), using dtb overlays would result in
> too files.
What do you mean by too many files?
The dtb overlays seems really matches your situation.
Usually we have one dtb part by module and then we mix them together.
Gregory
>
> I therefore chose to put all the possible connected devices in one dts
> and disable them. If U-Boot finds these modules, it fixes the device
> tree accrodginly, by enabling some nodes (setting status to "okay") and
> by setting some addresses and references.
>
> For example there are 6 switch nodes - three for 8-port switch module
> and three for 4-port switch module. This is because another switch
> (either 8-port or 4-port) can be connected to a 8-port switch, in DSA,
> and interface names have to be defined (from lan1 to lan24).
>
> Another way (for defining switch nodes) would have to be either:
> - including a file where switch nodes are defined, which would need
> #defining lan interface names (and some other things), and #undefing
> them after the #include
> - defining a macro for switch nodes
> - have a separate DTBs for each possible configuration (this would
> result in too many DTBs)
> - not defining these nodes in device-tree at all, instead creating
> them in U-Boot when patching the device-tree (I actually tried this,
> but the resulting code in U-Boot was horrible)
>
> Please let me know if doing it this way is acceptable, or if I should
> try something different (and if yes, what?).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Cc: Rob Herring <robh@kernel.org>
> Cc: linux-kernel@vger.kernel.org
> Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Andrew Lunn <andrew@lunn.ch>
> ---
> .../arm/marvell/armada-3720-turris-mox.txt | 6 +
> MAINTAINERS | 1 +
> arch/arm64/boot/dts/marvell/Makefile | 1 +
> .../dts/marvell/armada-3720-turris-mox.dts | 838 ++++++++++++++++++
> 4 files changed, 846 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
>
> diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> new file mode 100644
> index 000000000000..408fc07a9bbf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> @@ -0,0 +1,6 @@
> +CZ.NIC's Turris Mox SOHO router Device Tree Bindings
> +----------------------------------------------------
> +
> +Required root node property:
> +
> +compatible: must contain "cznic,turris-mox"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f6e60e7f6c11..81b57260b110 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1348,6 +1348,7 @@ ARM/CZ.NIC TURRIS MOX SUPPORT
> M: Marek Behun <marek.behun@nic.cz>
> W: http://mox.turris.cz
> S: Maintained
> +F: arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> F: include/mfd/moxtet.h
> F: drivers/gpio/gpio-moxtet.c
> F: drivers/mfd/moxtet.c
> diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
> index 5633676fa9d0..51782b31b441 100644
> --- a/arch/arm64/boot/dts/marvell/Makefile
> +++ b/arch/arm64/boot/dts/marvell/Makefile
> @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
> # Mvebu SoC Family
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
> +dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> new file mode 100644
> index 000000000000..1315c59ecef3
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -0,0 +1,838 @@
> +// SPDX-License-Identifier: GPL-2.0+ or X11
> +/*
> + * Device Tree file for CZ.NIC Turris Mox Board
> + * 2018 by Marek Behun <marek.behun@nic.cz>
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include "armada-372x.dtsi"
> +
> +/ {
> + model = "CZ.NIC Turris Mox Board";
> + compatible = "cznic,turris-mox", "marvell,armada3720",
> + "marvell,armada3710";
> +
> + aliases {
> + spi0 = &spi0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory@0 {
> + device_type = "memory";
> + reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + red {
> + gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> +
> + reset_button {
> + label = "reset";
> + linux,code = <BTN_MISC>;
> + gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
> + debounce-interval = <60>;
> + };
> + };
> +
> + exp_usb3_vbus: usb3-vbus {
> + compatible = "regulator-fixed";
> + regulator-name = "usb3-vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
> + };
> +
> + usb3_phy: usb3-phy {
> + compatible = "usb-nop-xceiv";
> + vcc-supply = <&exp_usb3_vbus>;
> + };
> +
> + vsdc_reg: vsdc_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdc";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 23 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + vsdio_reg: vsdio_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdio";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 22 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + sdhci1_pwrseq: sdhci1_pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&gpionb 19 GPIO_ACTIVE_HIGH>;
> + status = "okay";
> + };
> +
> + sfp: sfp {
> + compatible = "sff,sfp+";
> + i2c-bus = <&i2c0>;
> + los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;
> + tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
> + mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
> + tx-disable-gpio = <&moxtet_sfp 3 GPIO_ACTIVE_HIGH>;
> + rate-select0-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> + };
> +};
> +
> +&pinctrl_nb {
> + spi_cs1_pins: spi-cs1-pins {
> + groups = "spi_cs1";
> + function = "spi";
> + };
> +
> + sdio0_pins: sdio0-pins {
> + groups = "sdio0";
> + function = "sdio";
> + };
> +};
> +
> +&pinctrl_sb {
> + sdio_sb_pins: sdio-sb-pins {
> + groups = "sdio_sb";
> + function = "sdio";
> + };
> +
> + smi_pins: smi-pins {
> + groups = "smi";
> + function = "smi";
> + };
> +
> + pcie_pins: pcie1-pins {
> + groups = "pcie1";
> + function = "gpio";
> + };
> +};
> +
> +&i2c0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c1_pins>;
> + status = "okay";
> +
> + rtc@6f {
> + compatible = "microchip,mcp7940x";
> + reg = <0x6f>;
> + };
> +};
> +
> +&pcie0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_pins>;
> + status = "okay";
> + max-link-speed = <2>;
> + reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
> +
> + /* this shall be enabled by u-boot if the PCIe module is present */
> + status = "disabled";
> +};
> +
> +&uart0 {
> + status = "okay";
> +};
> +
> +ð0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&rgmii_pins>;
> + phy-mode = "rgmii-id";
> + phy = <&phy1>;
> + status = "okay";
> +};
> +
> +ð1 {
> + phy-mode = "1000base-x";
> + managed = "in-band-status";
> +};
> +
> +&mdio {
> + pinctrl-names = "default";
> + pinctrl-0 = <&smi_pins>;
> + status = "okay";
> +
> + phy1: ethernet-phy@1 {
> + reg = <1>;
> + };
> +
> + switch0@10 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x10 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1: switch0phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch0phy2: switch0phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch0phy3: switch0phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch0phy4: switch0phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch0phy5: switch0phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch0phy6: switch0phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch0phy7: switch0phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch0phy8: switch0phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan5";
> + phy-handle = <&switch0phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan6";
> + phy-handle = <&switch0phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan7";
> + phy-handle = <&switch0phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan8";
> + phy-handle = <&switch0phy8>;
> + };
> +
> + port@9 {
> + reg = <0x9>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> +
> + switch0port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port9 &switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch0@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1_topaz: switch0phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch0phy2_topaz: switch0phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch0phy3_topaz: switch0phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch0phy4_topaz: switch0phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> + };
> + };
> +
> + switch1@11 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x11 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1: switch1phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch1phy2: switch1phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch1phy3: switch1phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch1phy4: switch1phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch1phy5: switch1phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch1phy6: switch1phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch1phy7: switch1phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch1phy8: switch1phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan13";
> + phy-handle = <&switch1phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan14";
> + phy-handle = <&switch1phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan15";
> + phy-handle = <&switch1phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan16";
> + phy-handle = <&switch1phy8>;
> + };
> +
> + switch1port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> +
> + switch1port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch1@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1_topaz: switch1phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch1phy2_topaz: switch1phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch1phy3_topaz: switch1phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch1phy4_topaz: switch1phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> + };
> + };
> +
> + switch2@12 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x12 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1: switch2phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch2phy2: switch2phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch2phy3: switch2phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch2phy4: switch2phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch2phy5: switch2phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch2phy6: switch2phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch2phy7: switch2phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch2phy8: switch2phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan21";
> + phy-handle = <&switch2phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan22";
> + phy-handle = <&switch2phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan23";
> + phy-handle = <&switch2phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan24";
> + phy-handle = <&switch2phy8>;
> + };
> +
> + switch2port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch2@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1_topaz: switch2phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch2phy2_topaz: switch2phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch2phy3_topaz: switch2phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch2phy4_topaz: switch2phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> + };
> + };
> +
> +};
> +
> +&sdhci0 {
> + wp-inverted;
> + bus-width = <4>;
> + cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
> + vqmmc-supply = <&vsdc_reg>;
> + marvell,pad-type = "sd";
> + status = "okay";
> +};
> +
> +&sdhci1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdio0_pins &sdio_sb_pins>;
> + non-removable;
> + bus-width = <4>;
> + marvell,pad-type = "sd";
> + vqmmc-supply = <&vsdio_reg>;
> + mmc-pwrseq = <&sdhci1_pwrseq>;
> + status = "okay";
> +};
> +
> +&spi0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi_quad_pins &spi_cs1_pins>;
> + assigned-clocks = <&nb_periph_clk 7>;
> + assigned-clock-parents = <&tbg 1>;
> + assigned-clock-rates = <20000000>;
> +
> + spi-flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <20000000>;
> +
> + partition@0 {
> + label = "secure-firmware";
> + reg = <0x0 0x20000>;
> + };
> +
> + partition@20000 {
> + label = "u-boot";
> + reg = <0x20000 0x160000>;
> + };
> +
> + partition@180000 {
> + label = "u-boot-env";
> + reg = <0x180000 0x10000>;
> + };
> +
> + partition@190000 {
> + label = "Rescue system";
> + reg = <0x190000 0x660000>;
> + };
> +
> + partition@7f0000 {
> + label = "dtb";
> + reg = <0x7f0000 0x10000>;
> + };
> + };
> +
> + moxtet@1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "cznic,moxtet";
> + reg = <1>;
> + devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
> + spi-max-frequency = <10000000>;
> + spi-cpol;
> + spi-cpha;
> +
> + moxtet_sfp: moxtet-sfp@0 {
> + compatible = "cznic,moxtet-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + reg = <0>;
> + moxtet,id = <1>;
> + moxtet,input-mask = <0x7>;
> + moxtet,output-mask = <0x3>;
> + status = "disabled";
> + };
> + };
> +};
> +
> +&usb2 {
> + status = "okay";
> +};
> +
> +&usb3 {
> + status = "okay";
> + usb-phy = <&usb3_phy>;
> +};
> --
> 2.18.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
@ 2019-01-18 14:35 ` Gregory CLEMENT
0 siblings, 0 replies; 10+ messages in thread
From: Gregory CLEMENT @ 2019-01-18 14:35 UTC (permalink / raw)
To: Marek Behún
Cc: devicetree, Andrew Lunn, linux-kernel, linux-arm-kernel, Rob Herring
Hi Marek,
On mar., nov. 13 2018, Marek Behún <marek.behun@nic.cz> wrote:
> This is a RFC, please do not merge.
>
> This adds basic support for the Turris Mox board from CZ.NIC.
>
> Turris Mox is as modular router based on the Armada 3720 SOC (same as
> EspressoBin).
>
> The basic module can be extended by different modules.
> When those modules are connected, U-Boot has to let kernel know via
> device-tree. Since modules can be connected in different order and
> some modules can be connected multiple times (up to three 8-port
> switch modules can be connected), using dtb overlays would result in
> too files.
What do you mean by too many files?
The dtb overlays seems really matches your situation.
Usually we have one dtb part by module and then we mix them together.
Gregory
>
> I therefore chose to put all the possible connected devices in one dts
> and disable them. If U-Boot finds these modules, it fixes the device
> tree accrodginly, by enabling some nodes (setting status to "okay") and
> by setting some addresses and references.
>
> For example there are 6 switch nodes - three for 8-port switch module
> and three for 4-port switch module. This is because another switch
> (either 8-port or 4-port) can be connected to a 8-port switch, in DSA,
> and interface names have to be defined (from lan1 to lan24).
>
> Another way (for defining switch nodes) would have to be either:
> - including a file where switch nodes are defined, which would need
> #defining lan interface names (and some other things), and #undefing
> them after the #include
> - defining a macro for switch nodes
> - have a separate DTBs for each possible configuration (this would
> result in too many DTBs)
> - not defining these nodes in device-tree at all, instead creating
> them in U-Boot when patching the device-tree (I actually tried this,
> but the resulting code in U-Boot was horrible)
>
> Please let me know if doing it this way is acceptable, or if I should
> try something different (and if yes, what?).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Cc: Rob Herring <robh@kernel.org>
> Cc: linux-kernel@vger.kernel.org
> Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Andrew Lunn <andrew@lunn.ch>
> ---
> .../arm/marvell/armada-3720-turris-mox.txt | 6 +
> MAINTAINERS | 1 +
> arch/arm64/boot/dts/marvell/Makefile | 1 +
> .../dts/marvell/armada-3720-turris-mox.dts | 838 ++++++++++++++++++
> 4 files changed, 846 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
>
> diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> new file mode 100644
> index 000000000000..408fc07a9bbf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/armada-3720-turris-mox.txt
> @@ -0,0 +1,6 @@
> +CZ.NIC's Turris Mox SOHO router Device Tree Bindings
> +----------------------------------------------------
> +
> +Required root node property:
> +
> +compatible: must contain "cznic,turris-mox"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f6e60e7f6c11..81b57260b110 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1348,6 +1348,7 @@ ARM/CZ.NIC TURRIS MOX SUPPORT
> M: Marek Behun <marek.behun@nic.cz>
> W: http://mox.turris.cz
> S: Maintained
> +F: arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> F: include/mfd/moxtet.h
> F: drivers/gpio/gpio-moxtet.c
> F: drivers/mfd/moxtet.c
> diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
> index 5633676fa9d0..51782b31b441 100644
> --- a/arch/arm64/boot/dts/marvell/Makefile
> +++ b/arch/arm64/boot/dts/marvell/Makefile
> @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
> # Mvebu SoC Family
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
> +dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> new file mode 100644
> index 000000000000..1315c59ecef3
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -0,0 +1,838 @@
> +// SPDX-License-Identifier: GPL-2.0+ or X11
> +/*
> + * Device Tree file for CZ.NIC Turris Mox Board
> + * 2018 by Marek Behun <marek.behun@nic.cz>
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include "armada-372x.dtsi"
> +
> +/ {
> + model = "CZ.NIC Turris Mox Board";
> + compatible = "cznic,turris-mox", "marvell,armada3720",
> + "marvell,armada3710";
> +
> + aliases {
> + spi0 = &spi0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory@0 {
> + device_type = "memory";
> + reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + red {
> + gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> +
> + reset_button {
> + label = "reset";
> + linux,code = <BTN_MISC>;
> + gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
> + debounce-interval = <60>;
> + };
> + };
> +
> + exp_usb3_vbus: usb3-vbus {
> + compatible = "regulator-fixed";
> + regulator-name = "usb3-vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
> + };
> +
> + usb3_phy: usb3-phy {
> + compatible = "usb-nop-xceiv";
> + vcc-supply = <&exp_usb3_vbus>;
> + };
> +
> + vsdc_reg: vsdc_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdc";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 23 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + vsdio_reg: vsdio_reg {
> + compatible = "regulator-gpio";
> + regulator-name = "vsdio";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> +
> + gpios = <&gpiosb 22 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1
> + 3300000 0x0>;
> + enable-active-high;
> + };
> +
> + sdhci1_pwrseq: sdhci1_pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&gpionb 19 GPIO_ACTIVE_HIGH>;
> + status = "okay";
> + };
> +
> + sfp: sfp {
> + compatible = "sff,sfp+";
> + i2c-bus = <&i2c0>;
> + los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;
> + tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
> + mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
> + tx-disable-gpio = <&moxtet_sfp 3 GPIO_ACTIVE_HIGH>;
> + rate-select0-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> + };
> +};
> +
> +&pinctrl_nb {
> + spi_cs1_pins: spi-cs1-pins {
> + groups = "spi_cs1";
> + function = "spi";
> + };
> +
> + sdio0_pins: sdio0-pins {
> + groups = "sdio0";
> + function = "sdio";
> + };
> +};
> +
> +&pinctrl_sb {
> + sdio_sb_pins: sdio-sb-pins {
> + groups = "sdio_sb";
> + function = "sdio";
> + };
> +
> + smi_pins: smi-pins {
> + groups = "smi";
> + function = "smi";
> + };
> +
> + pcie_pins: pcie1-pins {
> + groups = "pcie1";
> + function = "gpio";
> + };
> +};
> +
> +&i2c0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c1_pins>;
> + status = "okay";
> +
> + rtc@6f {
> + compatible = "microchip,mcp7940x";
> + reg = <0x6f>;
> + };
> +};
> +
> +&pcie0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_pins>;
> + status = "okay";
> + max-link-speed = <2>;
> + reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
> +
> + /* this shall be enabled by u-boot if the PCIe module is present */
> + status = "disabled";
> +};
> +
> +&uart0 {
> + status = "okay";
> +};
> +
> +ð0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&rgmii_pins>;
> + phy-mode = "rgmii-id";
> + phy = <&phy1>;
> + status = "okay";
> +};
> +
> +ð1 {
> + phy-mode = "1000base-x";
> + managed = "in-band-status";
> +};
> +
> +&mdio {
> + pinctrl-names = "default";
> + pinctrl-0 = <&smi_pins>;
> + status = "okay";
> +
> + phy1: ethernet-phy@1 {
> + reg = <1>;
> + };
> +
> + switch0@10 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x10 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1: switch0phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch0phy2: switch0phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch0phy3: switch0phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch0phy4: switch0phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch0phy5: switch0phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch0phy6: switch0phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch0phy7: switch0phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch0phy8: switch0phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan5";
> + phy-handle = <&switch0phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan6";
> + phy-handle = <&switch0phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan7";
> + phy-handle = <&switch0phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan8";
> + phy-handle = <&switch0phy8>;
> + };
> +
> + port@9 {
> + reg = <0x9>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> +
> + switch0port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port9 &switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch0@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 0>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch0phy1_topaz: switch0phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch0phy2_topaz: switch0phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch0phy3_topaz: switch0phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch0phy4_topaz: switch0phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan1";
> + phy-handle = <&switch0phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan2";
> + phy-handle = <&switch0phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan3";
> + phy-handle = <&switch0phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan4";
> + phy-handle = <&switch0phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "cpu";
> + ethernet = <ð1>;
> + };
> + };
> + };
> +
> + switch1@11 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x11 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1: switch1phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch1phy2: switch1phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch1phy3: switch1phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch1phy4: switch1phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch1phy5: switch1phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch1phy6: switch1phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch1phy7: switch1phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch1phy8: switch1phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan13";
> + phy-handle = <&switch1phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan14";
> + phy-handle = <&switch1phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan15";
> + phy-handle = <&switch1phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan16";
> + phy-handle = <&switch1phy8>;
> + };
> +
> + switch1port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> +
> + switch1port10: port@a {
> + reg = <0xa>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch2port9>;
> + status = "disabled";
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch1@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 1>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch1phy1_topaz: switch1phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch1phy2_topaz: switch1phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch1phy3_topaz: switch1phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch1phy4_topaz: switch1phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan9";
> + phy-handle = <&switch1phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan10";
> + phy-handle = <&switch1phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan11";
> + phy-handle = <&switch1phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan12";
> + phy-handle = <&switch1phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch0port10>;
> + };
> + };
> + };
> +
> + switch2@12 {
> + compatible = "marvell,mv88e6190";
> + reg = <0x12 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1: switch2phy1@1 {
> + reg = <0x1>;
> + };
> +
> + switch2phy2: switch2phy2@2 {
> + reg = <0x2>;
> + };
> +
> + switch2phy3: switch2phy3@3 {
> + reg = <0x3>;
> + };
> +
> + switch2phy4: switch2phy4@4 {
> + reg = <0x4>;
> + };
> +
> + switch2phy5: switch2phy5@5 {
> + reg = <0x5>;
> + };
> +
> + switch2phy6: switch2phy6@6 {
> + reg = <0x6>;
> + };
> +
> + switch2phy7: switch2phy7@7 {
> + reg = <0x7>;
> + };
> +
> + switch2phy8: switch2phy8@8 {
> + reg = <0x8>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "lan21";
> + phy-handle = <&switch2phy5>;
> + };
> +
> + port@6 {
> + reg = <0x6>;
> + label = "lan22";
> + phy-handle = <&switch2phy6>;
> + };
> +
> + port@7 {
> + reg = <0x7>;
> + label = "lan23";
> + phy-handle = <&switch2phy7>;
> + };
> +
> + port@8 {
> + reg = <0x8>;
> + label = "lan24";
> + phy-handle = <&switch2phy8>;
> + };
> +
> + switch2port9: port@9 {
> + reg = <0x9>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> +
> + port-sfp@a {
> + reg = <0xa>;
> + label = "sfp";
> + sfp = <&sfp>;
> + phy-mode = "sgmii";
> + managed = "in-band-status";
> + status = "disabled";
> + };
> + };
> + };
> +
> + switch2@2 {
> + compatible = "marvell,mv88e6085";
> + reg = <0x2 0>;
> + dsa,member = <0 2>;
> + interrupt-parent = <&gpiosb>;
> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
> + status = "disabled";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + switch2phy1_topaz: switch2phy1@11 {
> + reg = <0x11>;
> + };
> +
> + switch2phy2_topaz: switch2phy2@12 {
> + reg = <0x12>;
> + };
> +
> + switch2phy3_topaz: switch2phy3@13 {
> + reg = <0x13>;
> + };
> +
> + switch2phy4_topaz: switch2phy4@14 {
> + reg = <0x14>;
> + };
> + };
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <0x1>;
> + label = "lan17";
> + phy-handle = <&switch2phy1_topaz>;
> + };
> +
> + port@2 {
> + reg = <0x2>;
> + label = "lan18";
> + phy-handle = <&switch2phy2_topaz>;
> + };
> +
> + port@3 {
> + reg = <0x3>;
> + label = "lan19";
> + phy-handle = <&switch2phy3_topaz>;
> + };
> +
> + port@4 {
> + reg = <0x4>;
> + label = "lan20";
> + phy-handle = <&switch2phy4_topaz>;
> + };
> +
> + port@5 {
> + reg = <0x5>;
> + label = "dsa";
> + phy-mode = "2500base-x";
> + link = <&switch1port10 &switch0port10>;
> + };
> + };
> + };
> +
> +};
> +
> +&sdhci0 {
> + wp-inverted;
> + bus-width = <4>;
> + cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
> + vqmmc-supply = <&vsdc_reg>;
> + marvell,pad-type = "sd";
> + status = "okay";
> +};
> +
> +&sdhci1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdio0_pins &sdio_sb_pins>;
> + non-removable;
> + bus-width = <4>;
> + marvell,pad-type = "sd";
> + vqmmc-supply = <&vsdio_reg>;
> + mmc-pwrseq = <&sdhci1_pwrseq>;
> + status = "okay";
> +};
> +
> +&spi0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi_quad_pins &spi_cs1_pins>;
> + assigned-clocks = <&nb_periph_clk 7>;
> + assigned-clock-parents = <&tbg 1>;
> + assigned-clock-rates = <20000000>;
> +
> + spi-flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <20000000>;
> +
> + partition@0 {
> + label = "secure-firmware";
> + reg = <0x0 0x20000>;
> + };
> +
> + partition@20000 {
> + label = "u-boot";
> + reg = <0x20000 0x160000>;
> + };
> +
> + partition@180000 {
> + label = "u-boot-env";
> + reg = <0x180000 0x10000>;
> + };
> +
> + partition@190000 {
> + label = "Rescue system";
> + reg = <0x190000 0x660000>;
> + };
> +
> + partition@7f0000 {
> + label = "dtb";
> + reg = <0x7f0000 0x10000>;
> + };
> + };
> +
> + moxtet@1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "cznic,moxtet";
> + reg = <1>;
> + devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
> + spi-max-frequency = <10000000>;
> + spi-cpol;
> + spi-cpha;
> +
> + moxtet_sfp: moxtet-sfp@0 {
> + compatible = "cznic,moxtet-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + reg = <0>;
> + moxtet,id = <1>;
> + moxtet,input-mask = <0x7>;
> + moxtet,output-mask = <0x3>;
> + status = "disabled";
> + };
> + };
> +};
> +
> +&usb2 {
> + status = "okay";
> +};
> +
> +&usb3 {
> + status = "okay";
> + usb-phy = <&usb3_phy>;
> +};
> --
> 2.18.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
2019-01-18 14:35 ` Gregory CLEMENT
@ 2019-01-21 13:12 ` Marek Behún
-1 siblings, 0 replies; 10+ messages in thread
From: Marek Behún @ 2019-01-21 13:12 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: devicetree, Rob Herring, Andrew Lunn, linux-kernel, linux-arm-kernel
On Fri, 18 Jan 2019 15:35:35 +0100
Gregory CLEMENT <gregory.clement@bootlin.com> wrote:
> > The basic module can be extended by different modules.
> > When those modules are connected, U-Boot has to let kernel know via
> > device-tree. Since modules can be connected in different order and
> > some modules can be connected multiple times (up to three 8-port
> > switch modules can be connected), using dtb overlays would result in
> > too files.
>
> What do you mean by too many files?
>
> The dtb overlays seems really matches your situation.
> Usually we have one dtb part by module and then we mix them together.
>
> Gregory
Hi Gregory,
the problem is that in some cases here some even if you have the same
module, some parameters have to be different depending on which
position the module is in the topology and what type of module is
before it.
For example up to three switch modules can be connected one after
another, and although physically they are the same, their dtb
parameters (MDIO address and whether they are connected to CPU or
another switch module) are different. So if I wanter to use overlays
without dtb modification from u-boot, I would have to have three
overlays for Peridot module, for topologies:
peridot
peridot-peridot
peridot-peridot-peridot
three for Topaz module:
topaz
peridot-topaz
peridot-peridot-topaz
and four for SFP module:
sfp
peridot-sfp
peridot-peridot-sfp
peridot-peridot-peridot-sfp
For the PCIe and USB module this is not the case, only one overlay for
each. But I thought (and still think) that in this case it is more
elegant to just enable the modules in U-Boot than to use so many
different overlays. And since I already thought up this solution for
SFP and switch modules, I used it for the PCIe and USB modules as well,
instead of mixing overlays there.
I am of course willing to rewrite this to use overlays, if you guys are
unwilling to merge it done this way, but I think this solution is
better.
Also, I would like to have the dts definitions for all modules
officially supported by Mox to have in the kernel, and if this was done
via overlays, it would not be merged, or am I wrong? Are there overlay
dts sources for some device in the kernel?
Marek
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH RFC] ARM64: dts: marvell: Add DTS file for Turris Mox
@ 2019-01-21 13:12 ` Marek Behún
0 siblings, 0 replies; 10+ messages in thread
From: Marek Behún @ 2019-01-21 13:12 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: devicetree, Andrew Lunn, linux-kernel, linux-arm-kernel, Rob Herring
On Fri, 18 Jan 2019 15:35:35 +0100
Gregory CLEMENT <gregory.clement@bootlin.com> wrote:
> > The basic module can be extended by different modules.
> > When those modules are connected, U-Boot has to let kernel know via
> > device-tree. Since modules can be connected in different order and
> > some modules can be connected multiple times (up to three 8-port
> > switch modules can be connected), using dtb overlays would result in
> > too files.
>
> What do you mean by too many files?
>
> The dtb overlays seems really matches your situation.
> Usually we have one dtb part by module and then we mix them together.
>
> Gregory
Hi Gregory,
the problem is that in some cases here some even if you have the same
module, some parameters have to be different depending on which
position the module is in the topology and what type of module is
before it.
For example up to three switch modules can be connected one after
another, and although physically they are the same, their dtb
parameters (MDIO address and whether they are connected to CPU or
another switch module) are different. So if I wanter to use overlays
without dtb modification from u-boot, I would have to have three
overlays for Peridot module, for topologies:
peridot
peridot-peridot
peridot-peridot-peridot
three for Topaz module:
topaz
peridot-topaz
peridot-peridot-topaz
and four for SFP module:
sfp
peridot-sfp
peridot-peridot-sfp
peridot-peridot-peridot-sfp
For the PCIe and USB module this is not the case, only one overlay for
each. But I thought (and still think) that in this case it is more
elegant to just enable the modules in U-Boot than to use so many
different overlays. And since I already thought up this solution for
SFP and switch modules, I used it for the PCIe and USB modules as well,
instead of mixing overlays there.
I am of course willing to rewrite this to use overlays, if you guys are
unwilling to merge it done this way, but I think this solution is
better.
Also, I would like to have the dts definitions for all modules
officially supported by Mox to have in the kernel, and if this was done
via overlays, it would not be merged, or am I wrong? Are there overlay
dts sources for some device in the kernel?
Marek
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread