* [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-10 13:57 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-10 13:57 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org> --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index f0a48ea78659..ae9fce9fed03 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -67,6 +67,7 @@ creative Creative Technology Ltd crystalfontz Crystalfontz America, Inc. cubietech Cubietech, Ltd. cypress Cypress Semiconductor Corporation +cznic CZ.NIC, z.s.p.o. dallas Maxim Integrated Products (formerly Dallas Semiconductor) davicom DAVICOM Semiconductor, Inc. delta Delta Electronics, Inc. -- 2.10.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-10 13:57 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-10 13:57 UTC (permalink / raw) To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth Cc: Martin Strbačka, Tomas Hlavacek, Rob Herring, Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r Signed-off-by: Uwe Kleine-König <uwe-rXY34ruvC2xidJT2blvkqNi2O/JbrIOy@public.gmane.org> --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index f0a48ea78659..ae9fce9fed03 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -67,6 +67,7 @@ creative Creative Technology Ltd crystalfontz Crystalfontz America, Inc. cubietech Cubietech, Ltd. cypress Cypress Semiconductor Corporation +cznic CZ.NIC, z.s.p.o. dallas Maxim Integrated Products (formerly Dallas Semiconductor) davicom DAVICOM Semiconductor, Inc. delta Delta Electronics, Inc. -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/2] ARM: dts: add support for Turris Omnia @ 2016-11-10 13:57 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-10 13:57 UTC (permalink / raw) To: linux-arm-kernel This machine is an open hardware router by cz.nic driven by a Marvell Armada 385. Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org> --- Compared to the (implict) v1, the following was changed: - disable rtc - change compatible to cznic,turris-omnia The following components are working: - WAN port - eMMC - UART0 - USB - mSATA Wireless fails to probe, didn't debug this up to now. I already see the DSA devices (with an additional change not included here), but sending and receiving doesn't work yet. SFP is missing as I cannot test it. UART1 is untested, but I'd be surprised if it didn't work. IMHO it makes sense to add the current state and fix the remaining stuff incrementally. Best regards Uwe --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-385-turris-omnia.dts | 257 ++++++++++++++++++++++++++ 2 files changed, 258 insertions(+) create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index befcd2619902..f1d3b9ff257e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -920,6 +920,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ + armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ armada-388-db.dtb \ armada-388-gp.dtb \ diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts new file mode 100644 index 000000000000..28e45d816120 --- /dev/null +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -0,0 +1,257 @@ +/* + * Device Tree file for the Turris Omnia + * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf + * + * Copyright (C) 2016 Uwe Kleine-K?nig <uwe@kleine-koenig.org> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without + * any warranty of any kind, whether express or implied. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include "armada-385.dtsi" + +/ { + model = "Turris Omnia"; + compatible = "cznic,turris-omnia", "marvell,armada385", "marvell,armada380"; + + chosen { + stdout-path = &uart0; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; /* 1024 MB */ + }; + + soc { + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; + + internal-regs { + + /* USB part of the eSATA/USB 2.0 port */ + usb at 58000 { + status = "okay"; + }; + + rtc at a3800 { + /* + * There are several errata for this device + * still unimplemented. Without some love it only reports + * 2016-12-19 22:00:24. So disable for now. + */ + status = "disabled"; + }; + + sata at a8000 { + status = "okay"; + }; + + sdhci at d8000 { + pinctrl-names = "default"; + pinctrl-0 = <&sdhci_pins>; + status = "okay"; + + bus-width = <8>; + no-1-8-v; + non-removable; + }; + + usb3 at f0000 { + status = "okay"; + }; + + usb3 at f8000 { + status = "okay"; + }; + }; + + pcie-controller { + status = "okay"; + + pcie at 1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + + pcie at 2,0 { + /* Port 2, Lane 0 */ + status = "okay"; + }; + + pcie at 3,0 { + /* Port 3, Lane 0 */ + status = "okay"; + }; + }; + }; +}; + +ð0 { + pinctrl-names = "default"; + pinctrl-0 = <&ge0_rgmii_pins>; + status = "okay"; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +ð1 { + pinctrl-names = "default"; + pinctrl-0 = <&ge1_rgmii_pins>; + status = "okay"; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +/* WAN port */ +ð2 { + status = "okay"; + phy-mode = "sgmii"; + phy = <&phy1>; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; + + i2cmux at 70 { + compatible = "nxp,pca9547"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x70>; + status = "okay"; + + i2c at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "okay"; + + /* STM32F0 at address 0x2a */ + /* leds device at address 0x2b */ + + eeprom at 54 { + /* holds configuration about RAM, evaluated by bootloader */ + compatible = "at,24c64"; + reg = <0x54>; + }; + }; + + i2c at 5 { + #address-cells = <1>; + #size-cells = <0>; + reg = <5>; + + /* ATSHA204A at address 0x64 */ + }; + + i2c at 6 { + #address-cells = <1>; + #size-cells = <0>; + reg = <6>; + + /* exposed on pin header */ + }; + }; +}; + +&mdio { + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; + status = "okay"; + + phy1: phy at 1 { + status = "okay"; + compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + + /* There is a Switch (MV88E7176) at address 0x10 */ +}; + +&pinctrl { + spi0cs1_pins: spi0-pins-0cs1 { + marvell,pins = "mpp26"; + marvell,function = "spi0"; + }; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins &spi0cs1_pins>; + status = "okay"; + + spi-nor at 0 { + compatible = "spansion,s25fl164k", "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition at 0 { + reg = <0x0 0x00100000>; + label = "U-Boot"; + }; + + partition at 1 { + reg = <0x00100000 0x00700000>; + label = "Rescue system"; + }; + }; + + /* @1 is on pin header */ +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; +}; -- 2.10.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/2] ARM: dts: add support for Turris Omnia @ 2016-11-10 13:57 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-10 13:57 UTC (permalink / raw) To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth Cc: Martin Strbačka, Tomas Hlavacek, Rob Herring, Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r This machine is an open hardware router by cz.nic driven by a Marvell Armada 385. Signed-off-by: Uwe Kleine-König <uwe-rXY34ruvC2xidJT2blvkqNi2O/JbrIOy@public.gmane.org> --- Compared to the (implict) v1, the following was changed: - disable rtc - change compatible to cznic,turris-omnia The following components are working: - WAN port - eMMC - UART0 - USB - mSATA Wireless fails to probe, didn't debug this up to now. I already see the DSA devices (with an additional change not included here), but sending and receiving doesn't work yet. SFP is missing as I cannot test it. UART1 is untested, but I'd be surprised if it didn't work. IMHO it makes sense to add the current state and fix the remaining stuff incrementally. Best regards Uwe --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-385-turris-omnia.dts | 257 ++++++++++++++++++++++++++ 2 files changed, 258 insertions(+) create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index befcd2619902..f1d3b9ff257e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -920,6 +920,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ + armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ armada-388-db.dtb \ armada-388-gp.dtb \ diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts new file mode 100644 index 000000000000..28e45d816120 --- /dev/null +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -0,0 +1,257 @@ +/* + * Device Tree file for the Turris Omnia + * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf + * + * Copyright (C) 2016 Uwe Kleine-König <uwe-rXY34ruvC2xidJT2blvkqNi2O/JbrIOy@public.gmane.org> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without + * any warranty of any kind, whether express or implied. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include "armada-385.dtsi" + +/ { + model = "Turris Omnia"; + compatible = "cznic,turris-omnia", "marvell,armada385", "marvell,armada380"; + + chosen { + stdout-path = &uart0; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; /* 1024 MB */ + }; + + soc { + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; + + internal-regs { + + /* USB part of the eSATA/USB 2.0 port */ + usb@58000 { + status = "okay"; + }; + + rtc@a3800 { + /* + * There are several errata for this device + * still unimplemented. Without some love it only reports + * 2016-12-19 22:00:24. So disable for now. + */ + status = "disabled"; + }; + + sata@a8000 { + status = "okay"; + }; + + sdhci@d8000 { + pinctrl-names = "default"; + pinctrl-0 = <&sdhci_pins>; + status = "okay"; + + bus-width = <8>; + no-1-8-v; + non-removable; + }; + + usb3@f0000 { + status = "okay"; + }; + + usb3@f8000 { + status = "okay"; + }; + }; + + pcie-controller { + status = "okay"; + + pcie@1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + + pcie@2,0 { + /* Port 2, Lane 0 */ + status = "okay"; + }; + + pcie@3,0 { + /* Port 3, Lane 0 */ + status = "okay"; + }; + }; + }; +}; + +ð0 { + pinctrl-names = "default"; + pinctrl-0 = <&ge0_rgmii_pins>; + status = "okay"; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +ð1 { + pinctrl-names = "default"; + pinctrl-0 = <&ge1_rgmii_pins>; + status = "okay"; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +/* WAN port */ +ð2 { + status = "okay"; + phy-mode = "sgmii"; + phy = <&phy1>; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; + + i2cmux@70 { + compatible = "nxp,pca9547"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x70>; + status = "okay"; + + i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "okay"; + + /* STM32F0 at address 0x2a */ + /* leds device at address 0x2b */ + + eeprom@54 { + /* holds configuration about RAM, evaluated by bootloader */ + compatible = "at,24c64"; + reg = <0x54>; + }; + }; + + i2c@5 { + #address-cells = <1>; + #size-cells = <0>; + reg = <5>; + + /* ATSHA204A at address 0x64 */ + }; + + i2c@6 { + #address-cells = <1>; + #size-cells = <0>; + reg = <6>; + + /* exposed on pin header */ + }; + }; +}; + +&mdio { + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; + status = "okay"; + + phy1: phy@1 { + status = "okay"; + compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + + /* There is a Switch (MV88E7176) at address 0x10 */ +}; + +&pinctrl { + spi0cs1_pins: spi0-pins-0cs1 { + marvell,pins = "mpp26"; + marvell,function = "spi0"; + }; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins &spi0cs1_pins>; + status = "okay"; + + spi-nor@0 { + compatible = "spansion,s25fl164k", "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition@0 { + reg = <0x0 0x00100000>; + label = "U-Boot"; + }; + + partition@1 { + reg = <0x00100000 0x00700000>; + label = "Rescue system"; + }; + }; + + /* @1 is on pin header */ +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; +}; -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/2] ARM: dts: add support for Turris Omnia 2016-11-10 13:57 ` Uwe Kleine-König @ 2016-11-18 13:23 ` Gregory CLEMENT -1 siblings, 0 replies; 12+ messages in thread From: Gregory CLEMENT @ 2016-11-18 13:23 UTC (permalink / raw) To: linux-arm-kernel Hi Uwe, Andrew, On jeu., nov. 10 2016, Uwe Kleine-K?nig <uwe@kleine-koenig.org> wrote: > This machine is an open hardware router by cz.nic driven by a > Marvell Armada 385. > What is the status for this patch? I see that there is still email about the RFC version. Thanks, Gregory > Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org> > --- > Compared to the (implict) v1, the following was changed: > > - disable rtc > - change compatible to cznic,turris-omnia > > The following components are working: > > - WAN port > - eMMC > - UART0 > - USB > - mSATA > > Wireless fails to probe, didn't debug this up to now. > I already see the DSA devices (with an additional change not included here), > but sending and receiving doesn't work yet. > > SFP is missing as I cannot test it. UART1 is untested, but I'd be > surprised if it didn't work. > > IMHO it makes sense to add the current state and fix the remaining stuff > incrementally. > > Best regards > Uwe > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/armada-385-turris-omnia.dts | 257 ++++++++++++++++++++++++++ > 2 files changed, 258 insertions(+) > create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index befcd2619902..f1d3b9ff257e 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -920,6 +920,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ > armada-385-db-ap.dtb \ > armada-385-linksys-caiman.dtb \ > armada-385-linksys-cobra.dtb \ > + armada-385-turris-omnia.dtb \ > armada-388-clearfog.dtb \ > armada-388-db.dtb \ > armada-388-gp.dtb \ > diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts > new file mode 100644 > index 000000000000..28e45d816120 > --- /dev/null > +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts > @@ -0,0 +1,257 @@ > +/* > + * Device Tree file for the Turris Omnia > + * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf > + * > + * Copyright (C) 2016 Uwe Kleine-K?nig <uwe@kleine-koenig.org> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without > + * any warranty of any kind, whether express or implied. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > +#include "armada-385.dtsi" > + > +/ { > + model = "Turris Omnia"; > + compatible = "cznic,turris-omnia", "marvell,armada385", "marvell,armada380"; > + > + chosen { > + stdout-path = &uart0; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x40000000>; /* 1024 MB */ > + }; > + > + soc { > + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 > + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; > + > + internal-regs { > + > + /* USB part of the eSATA/USB 2.0 port */ > + usb at 58000 { > + status = "okay"; > + }; > + > + rtc at a3800 { > + /* > + * There are several errata for this device > + * still unimplemented. Without some love it only reports > + * 2016-12-19 22:00:24. So disable for now. > + */ > + status = "disabled"; > + }; > + > + sata at a8000 { > + status = "okay"; > + }; > + > + sdhci at d8000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhci_pins>; > + status = "okay"; > + > + bus-width = <8>; > + no-1-8-v; > + non-removable; > + }; > + > + usb3 at f0000 { > + status = "okay"; > + }; > + > + usb3 at f8000 { > + status = "okay"; > + }; > + }; > + > + pcie-controller { > + status = "okay"; > + > + pcie at 1,0 { > + /* Port 0, Lane 0 */ > + status = "okay"; > + }; > + > + pcie at 2,0 { > + /* Port 2, Lane 0 */ > + status = "okay"; > + }; > + > + pcie at 3,0 { > + /* Port 3, Lane 0 */ > + status = "okay"; > + }; > + }; > + }; > +}; > + > +ð0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ge0_rgmii_pins>; > + status = "okay"; > + phy-mode = "rgmii-id"; > + > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > +}; > + > +ð1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ge1_rgmii_pins>; > + status = "okay"; > + phy-mode = "rgmii-id"; > + > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > +}; > + > +/* WAN port */ > +ð2 { > + status = "okay"; > + phy-mode = "sgmii"; > + phy = <&phy1>; > +}; > + > +&i2c0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins>; > + status = "okay"; > + > + i2cmux at 70 { > + compatible = "nxp,pca9547"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x70>; > + status = "okay"; > + > + i2c at 0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0>; > + status = "okay"; > + > + /* STM32F0 at address 0x2a */ > + /* leds device at address 0x2b */ > + > + eeprom at 54 { > + /* holds configuration about RAM, evaluated by bootloader */ > + compatible = "at,24c64"; > + reg = <0x54>; > + }; > + }; > + > + i2c at 5 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <5>; > + > + /* ATSHA204A at address 0x64 */ > + }; > + > + i2c at 6 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <6>; > + > + /* exposed on pin header */ > + }; > + }; > +}; > + > +&mdio { > + pinctrl-names = "default"; > + pinctrl-0 = <&mdio_pins>; > + status = "okay"; > + > + phy1: phy at 1 { > + status = "okay"; > + compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22"; > + reg = <1>; > + }; > + > + /* There is a Switch (MV88E7176) at address 0x10 */ > +}; > + > +&pinctrl { > + spi0cs1_pins: spi0-pins-0cs1 { > + marvell,pins = "mpp26"; > + marvell,function = "spi0"; > + }; > +}; > + > +&spi0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&spi0_pins &spi0cs1_pins>; > + status = "okay"; > + > + spi-nor at 0 { > + compatible = "spansion,s25fl164k", "jedec,spi-nor"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0>; > + spi-max-frequency = <40000000>; > + > + partition at 0 { > + reg = <0x0 0x00100000>; > + label = "U-Boot"; > + }; > + > + partition at 1 { > + reg = <0x00100000 0x00700000>; > + label = "Rescue system"; > + }; > + }; > + > + /* @1 is on pin header */ > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins>; > + status = "okay"; > +}; > + > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1_pins>; > + status = "okay"; > +}; > -- > 2.10.2 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: add support for Turris Omnia @ 2016-11-18 13:23 ` Gregory CLEMENT 0 siblings, 0 replies; 12+ messages in thread From: Gregory CLEMENT @ 2016-11-18 13:23 UTC (permalink / raw) To: Uwe Kleine-König, Andrew Lunn Cc: Mark Rutland, Martin Strbačka, Jason Cooper, devicetree, Tomas Hlavacek, Rob Herring, linux-arm-kernel, Sebastian Hesselbarth Hi Uwe, Andrew, On jeu., nov. 10 2016, Uwe Kleine-König <uwe@kleine-koenig.org> wrote: > This machine is an open hardware router by cz.nic driven by a > Marvell Armada 385. > What is the status for this patch? I see that there is still email about the RFC version. Thanks, Gregory > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> > --- > Compared to the (implict) v1, the following was changed: > > - disable rtc > - change compatible to cznic,turris-omnia > > The following components are working: > > - WAN port > - eMMC > - UART0 > - USB > - mSATA > > Wireless fails to probe, didn't debug this up to now. > I already see the DSA devices (with an additional change not included here), > but sending and receiving doesn't work yet. > > SFP is missing as I cannot test it. UART1 is untested, but I'd be > surprised if it didn't work. > > IMHO it makes sense to add the current state and fix the remaining stuff > incrementally. > > Best regards > Uwe > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/armada-385-turris-omnia.dts | 257 ++++++++++++++++++++++++++ > 2 files changed, 258 insertions(+) > create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index befcd2619902..f1d3b9ff257e 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -920,6 +920,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ > armada-385-db-ap.dtb \ > armada-385-linksys-caiman.dtb \ > armada-385-linksys-cobra.dtb \ > + armada-385-turris-omnia.dtb \ > armada-388-clearfog.dtb \ > armada-388-db.dtb \ > armada-388-gp.dtb \ > diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts > new file mode 100644 > index 000000000000..28e45d816120 > --- /dev/null > +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts > @@ -0,0 +1,257 @@ > +/* > + * Device Tree file for the Turris Omnia > + * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf > + * > + * Copyright (C) 2016 Uwe Kleine-König <uwe@kleine-koenig.org> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without > + * any warranty of any kind, whether express or implied. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > +#include "armada-385.dtsi" > + > +/ { > + model = "Turris Omnia"; > + compatible = "cznic,turris-omnia", "marvell,armada385", "marvell,armada380"; > + > + chosen { > + stdout-path = &uart0; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x40000000>; /* 1024 MB */ > + }; > + > + soc { > + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 > + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; > + > + internal-regs { > + > + /* USB part of the eSATA/USB 2.0 port */ > + usb@58000 { > + status = "okay"; > + }; > + > + rtc@a3800 { > + /* > + * There are several errata for this device > + * still unimplemented. Without some love it only reports > + * 2016-12-19 22:00:24. So disable for now. > + */ > + status = "disabled"; > + }; > + > + sata@a8000 { > + status = "okay"; > + }; > + > + sdhci@d8000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhci_pins>; > + status = "okay"; > + > + bus-width = <8>; > + no-1-8-v; > + non-removable; > + }; > + > + usb3@f0000 { > + status = "okay"; > + }; > + > + usb3@f8000 { > + status = "okay"; > + }; > + }; > + > + pcie-controller { > + status = "okay"; > + > + pcie@1,0 { > + /* Port 0, Lane 0 */ > + status = "okay"; > + }; > + > + pcie@2,0 { > + /* Port 2, Lane 0 */ > + status = "okay"; > + }; > + > + pcie@3,0 { > + /* Port 3, Lane 0 */ > + status = "okay"; > + }; > + }; > + }; > +}; > + > +ð0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ge0_rgmii_pins>; > + status = "okay"; > + phy-mode = "rgmii-id"; > + > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > +}; > + > +ð1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ge1_rgmii_pins>; > + status = "okay"; > + phy-mode = "rgmii-id"; > + > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > +}; > + > +/* WAN port */ > +ð2 { > + status = "okay"; > + phy-mode = "sgmii"; > + phy = <&phy1>; > +}; > + > +&i2c0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins>; > + status = "okay"; > + > + i2cmux@70 { > + compatible = "nxp,pca9547"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x70>; > + status = "okay"; > + > + i2c@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0>; > + status = "okay"; > + > + /* STM32F0 at address 0x2a */ > + /* leds device at address 0x2b */ > + > + eeprom@54 { > + /* holds configuration about RAM, evaluated by bootloader */ > + compatible = "at,24c64"; > + reg = <0x54>; > + }; > + }; > + > + i2c@5 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <5>; > + > + /* ATSHA204A at address 0x64 */ > + }; > + > + i2c@6 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <6>; > + > + /* exposed on pin header */ > + }; > + }; > +}; > + > +&mdio { > + pinctrl-names = "default"; > + pinctrl-0 = <&mdio_pins>; > + status = "okay"; > + > + phy1: phy@1 { > + status = "okay"; > + compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22"; > + reg = <1>; > + }; > + > + /* There is a Switch (MV88E7176) at address 0x10 */ > +}; > + > +&pinctrl { > + spi0cs1_pins: spi0-pins-0cs1 { > + marvell,pins = "mpp26"; > + marvell,function = "spi0"; > + }; > +}; > + > +&spi0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&spi0_pins &spi0cs1_pins>; > + status = "okay"; > + > + spi-nor@0 { > + compatible = "spansion,s25fl164k", "jedec,spi-nor"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0>; > + spi-max-frequency = <40000000>; > + > + partition@0 { > + reg = <0x0 0x00100000>; > + label = "U-Boot"; > + }; > + > + partition@1 { > + reg = <0x00100000 0x00700000>; > + label = "Rescue system"; > + }; > + }; > + > + /* @1 is on pin header */ > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins>; > + status = "okay"; > +}; > + > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1_pins>; > + status = "okay"; > +}; > -- > 2.10.2 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.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] 12+ messages in thread
* [PATCH v2 2/2] ARM: dts: add support for Turris Omnia @ 2016-11-20 20:31 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-20 20:31 UTC (permalink / raw) To: linux-arm-kernel Hello Gregory, On Fri, Nov 18, 2016 at 02:23:22PM +0100, Gregory CLEMENT wrote: > What is the status for this patch? > > I see that there is still email about the RFC version. right, I'm preparing a v3, so don't pick up v2. Best regards Uwe -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 455 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161120/51c93337/attachment.sig> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: add support for Turris Omnia @ 2016-11-20 20:31 ` Uwe Kleine-König 0 siblings, 0 replies; 12+ messages in thread From: Uwe Kleine-König @ 2016-11-20 20:31 UTC (permalink / raw) To: Gregory CLEMENT Cc: Andrew Lunn, Jason Cooper, Sebastian Hesselbarth, Martin Strbačka, Tomas Hlavacek, Rob Herring, Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r [-- Attachment #1: Type: text/plain, Size: 256 bytes --] Hello Gregory, On Fri, Nov 18, 2016 at 02:23:22PM +0100, Gregory CLEMENT wrote: > What is the status for this patch? > > I see that there is still email about the RFC version. right, I'm preparing a v3, so don't pick up v2. Best regards Uwe [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 455 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-10 14:15 ` Andrew Lunn 0 siblings, 0 replies; 12+ messages in thread From: Andrew Lunn @ 2016-11-10 14:15 UTC (permalink / raw) To: linux-arm-kernel On Thu, Nov 10, 2016 at 02:57:20PM +0100, Uwe Kleine-K?nig wrote: > Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org> Hi Uwe It is normal to send vendor-prefixes patches directly to the device tree maintainers as a separate patch. That avoids merge conflicts on the file. Andrew ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-10 14:15 ` Andrew Lunn 0 siblings, 0 replies; 12+ messages in thread From: Andrew Lunn @ 2016-11-10 14:15 UTC (permalink / raw) To: Uwe Kleine-König Cc: Jason Cooper, Gregory Clement, Sebastian Hesselbarth, Martin Strba??ka, Tomas Hlavacek, Rob Herring, Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Thu, Nov 10, 2016 at 02:57:20PM +0100, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König <uwe-rXY34ruvC2xidJT2blvkqNi2O/JbrIOy@public.gmane.org> Hi Uwe It is normal to send vendor-prefixes patches directly to the device tree maintainers as a separate patch. That avoids merge conflicts on the file. Andrew -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-15 1:49 ` Rob Herring 0 siblings, 0 replies; 12+ messages in thread From: Rob Herring @ 2016-11-15 1:49 UTC (permalink / raw) To: linux-arm-kernel On Thu, Nov 10, 2016 at 02:57:20PM +0100, Uwe Kleine-K?nig wrote: > Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org> > --- > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + > 1 file changed, 1 insertion(+) Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC @ 2016-11-15 1:49 ` Rob Herring 0 siblings, 0 replies; 12+ messages in thread From: Rob Herring @ 2016-11-15 1:49 UTC (permalink / raw) To: Uwe Kleine-König Cc: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Martin Strbačka, Tomas Hlavacek, Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Thu, Nov 10, 2016 at 02:57:20PM +0100, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König <uwe-rXY34ruvC2xidJT2blvkqNi2O/JbrIOy@public.gmane.org> > --- > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + > 1 file changed, 1 insertion(+) Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-11-20 20:31 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-10 13:57 [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC Uwe Kleine-König 2016-11-10 13:57 ` Uwe Kleine-König 2016-11-10 13:57 ` [PATCH v2 2/2] ARM: dts: add support for Turris Omnia Uwe Kleine-König 2016-11-10 13:57 ` Uwe Kleine-König 2016-11-18 13:23 ` Gregory CLEMENT 2016-11-18 13:23 ` Gregory CLEMENT 2016-11-20 20:31 ` Uwe Kleine-König 2016-11-20 20:31 ` Uwe Kleine-König 2016-11-10 14:15 ` [PATCH v2 1/2] devicetree: Add vendor prefix for CZ.NIC Andrew Lunn 2016-11-10 14:15 ` Andrew Lunn 2016-11-15 1:49 ` Rob Herring 2016-11-15 1:49 ` Rob Herring
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.