* [U-Boot] [PATCH 00/12] kirkwood: device tree support
@ 2018-05-08 10:34 Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 01/12] ARM: add devicetree files for kirkwood SoC Chris Packham
` (12 more replies)
0 siblings, 13 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
This is an initial series to bring in the device tree files for kirkwood
boards from Linux. All the patches are fairly mechanical matching up the
device trees based on the defconfig name (and some educated guesses in a
few places).
Chris Packham (12):
ARM: add devicetree files for kirkwood SoC
ARM: kirkwood: Add device-tree for dns325
ARM: kirkwood: Add device-tree for dockstar
ARM: kirkwood: Add device-tree for goflexhome
ARM: kirkwood: Add device-tree for guruplug
ARM: kirkwood: Add device-tree for ib62x0
ARM: kirkwood: Add device-tree for iconnect
ARM: kirkwood: Add device-tree for nas220
ARM: kirkwood: Add device-tree for nsa310s
ARM: kirkwood: Add device-tree for openrd
ARM: kirkwood: Add device-tree for pogo_e02
ARM: kirkwood: Add device-tree for sheevaplug
arch/arm/dts/kirkwood-6192.dtsi | 88 ++++
arch/arm/dts/kirkwood-6281.dtsi | 90 ++++
arch/arm/dts/kirkwood-98dx4122.dtsi | 53 +++
arch/arm/dts/kirkwood-blackarmor-nas220.dts | 172 ++++++++
arch/arm/dts/kirkwood-dns325.dts | 63 +++
arch/arm/dts/kirkwood-dnskw.dtsi | 235 +++++++++++
arch/arm/dts/kirkwood-dockstar.dts | 110 +++++
arch/arm/dts/kirkwood-goflexnet.dts | 190 +++++++++
.../arm/dts/kirkwood-guruplug-server-plus.dts | 133 ++++++
arch/arm/dts/kirkwood-ib62x0.dts | 146 +++++++
arch/arm/dts/kirkwood-iconnect.dts | 195 +++++++++
arch/arm/dts/kirkwood-nsa310.dts | 139 +++++++
arch/arm/dts/kirkwood-nsa3x0-common.dtsi | 158 +++++++
arch/arm/dts/kirkwood-openrd-base.dts | 39 ++
arch/arm/dts/kirkwood-openrd-client.dts | 73 ++++
arch/arm/dts/kirkwood-openrd-ultimate.dts | 55 +++
arch/arm/dts/kirkwood-openrd.dtsi | 122 ++++++
arch/arm/dts/kirkwood-pogo_e02.dts | 132 ++++++
arch/arm/dts/kirkwood-sheevaplug-common.dtsi | 104 +++++
arch/arm/dts/kirkwood-sheevaplug.dts | 42 ++
arch/arm/dts/kirkwood.dtsi | 393 ++++++++++++++++++
configs/dns325_defconfig | 3 +-
configs/dockstar_defconfig | 3 +-
configs/goflexhome_defconfig | 3 +-
configs/guruplug_defconfig | 3 +-
configs/ib62x0_defconfig | 3 +-
configs/iconnect_defconfig | 3 +-
configs/nas220_defconfig | 3 +-
configs/nsa310s_defconfig | 3 +-
configs/openrd_base_defconfig | 3 +-
configs/openrd_client_defconfig | 3 +-
configs/openrd_ultimate_defconfig | 3 +-
configs/pogo_e02_defconfig | 3 +-
configs/sheevaplug_defconfig | 3 +-
34 files changed, 2758 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/dts/kirkwood-6192.dtsi
create mode 100644 arch/arm/dts/kirkwood-6281.dtsi
create mode 100644 arch/arm/dts/kirkwood-98dx4122.dtsi
create mode 100644 arch/arm/dts/kirkwood-blackarmor-nas220.dts
create mode 100644 arch/arm/dts/kirkwood-dns325.dts
create mode 100644 arch/arm/dts/kirkwood-dnskw.dtsi
create mode 100644 arch/arm/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/dts/kirkwood-goflexnet.dts
create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/dts/kirkwood-ib62x0.dts
create mode 100644 arch/arm/dts/kirkwood-iconnect.dts
create mode 100644 arch/arm/dts/kirkwood-nsa310.dts
create mode 100644 arch/arm/dts/kirkwood-nsa3x0-common.dtsi
create mode 100644 arch/arm/dts/kirkwood-openrd-base.dts
create mode 100644 arch/arm/dts/kirkwood-openrd-client.dts
create mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts
create mode 100644 arch/arm/dts/kirkwood-openrd.dtsi
create mode 100644 arch/arm/dts/kirkwood-pogo_e02.dts
create mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi
create mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts
create mode 100644 arch/arm/dts/kirkwood.dtsi
--
2.17.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 01/12] ARM: add devicetree files for kirkwood SoC
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 02/12] ARM: kirkwood: Add device-tree for dns325 Chris Packham
` (11 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
These files are taken verbatim from the Linux kernel 4.17
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-6192.dtsi | 88 +++++++
arch/arm/dts/kirkwood-6281.dtsi | 90 +++++++
arch/arm/dts/kirkwood-98dx4122.dtsi | 53 ++++
arch/arm/dts/kirkwood.dtsi | 393 ++++++++++++++++++++++++++++
4 files changed, 624 insertions(+)
create mode 100644 arch/arm/dts/kirkwood-6192.dtsi
create mode 100644 arch/arm/dts/kirkwood-6281.dtsi
create mode 100644 arch/arm/dts/kirkwood-98dx4122.dtsi
create mode 100644 arch/arm/dts/kirkwood.dtsi
diff --git a/arch/arm/dts/kirkwood-6192.dtsi b/arch/arm/dts/kirkwood-6192.dtsi
new file mode 100644
index 000000000000..396bcba08adb
--- /dev/null
+++ b/arch/arm/dts/kirkwood-6192.dtsi
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: GPL-2.0
+/ {
+ mbus at f1000000 {
+ pciec: pcie at 82000000 {
+ compatible = "marvell,kirkwood-pcie";
+ status = "disabled";
+ device_type = "pci";
+
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ bus-range = <0x00 0xff>;
+
+ ranges =
+ <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+ 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
+
+ pcie0: pcie at 1,0 {
+ device_type = "pci";
+ assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
+ reg = <0x0800 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+ 0x81000000 0 0 0x81000000 0x1 0 1 0>;
+ bus-range = <0x00 0xff>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 &intc 9>;
+ marvell,pcie-port = <0>;
+ marvell,pcie-lane = <0>;
+ clocks = <&gate_clk 2>;
+ status = "disabled";
+ };
+ };
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ compatible = "marvell,88f6192-pinctrl";
+
+ pmx_sata0: pmx-sata0 {
+ marvell,pins = "mpp5", "mpp21", "mpp23";
+ marvell,function = "sata0";
+ };
+ pmx_sata1: pmx-sata1 {
+ marvell,pins = "mpp4", "mpp20", "mpp22";
+ marvell,function = "sata1";
+ };
+ pmx_sdio: pmx-sdio {
+ marvell,pins = "mpp12", "mpp13", "mpp14",
+ "mpp15", "mpp16", "mpp17";
+ marvell,function = "sdio";
+ };
+ };
+
+ rtc: rtc at 10300 {
+ compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
+ reg = <0x10300 0x20>;
+ interrupts = <53>;
+ clocks = <&gate_clk 7>;
+ };
+
+ sata: sata at 80000 {
+ compatible = "marvell,orion-sata";
+ reg = <0x80000 0x5000>;
+ interrupts = <21>;
+ clocks = <&gate_clk 14>, <&gate_clk 15>;
+ clock-names = "0", "1";
+ phys = <&sata_phy0>, <&sata_phy1>;
+ phy-names = "port0", "port1";
+ status = "disabled";
+ };
+
+ sdio: mvsdio at 90000 {
+ compatible = "marvell,orion-sdio";
+ reg = <0x90000 0x200>;
+ interrupts = <28>;
+ clocks = <&gate_clk 4>;
+ bus-width = <4>;
+ cap-sdio-irq;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/arm/dts/kirkwood-6281.dtsi b/arch/arm/dts/kirkwood-6281.dtsi
new file mode 100644
index 000000000000..faa05849a40d
--- /dev/null
+++ b/arch/arm/dts/kirkwood-6281.dtsi
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0
+/ {
+ mbus at f1000000 {
+ pciec: pcie at 82000000 {
+ compatible = "marvell,kirkwood-pcie";
+ status = "disabled";
+ device_type = "pci";
+
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ bus-range = <0x00 0xff>;
+
+ ranges =
+ <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+ 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
+
+ pcie0: pcie at 1,0 {
+ device_type = "pci";
+ assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
+ reg = <0x0800 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+ 0x81000000 0 0 0x81000000 0x1 0 1 0>;
+ bus-range = <0x00 0xff>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 &intc 9>;
+ marvell,pcie-port = <0>;
+ marvell,pcie-lane = <0>;
+ clocks = <&gate_clk 2>;
+ status = "disabled";
+ };
+ };
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ compatible = "marvell,88f6281-pinctrl";
+
+ pmx_sata0: pmx-sata0 {
+ marvell,pins = "mpp5", "mpp21", "mpp23";
+ marvell,function = "sata0";
+ };
+ pmx_sata1: pmx-sata1 {
+ marvell,pins = "mpp4", "mpp20", "mpp22";
+ marvell,function = "sata1";
+ };
+ pmx_sdio: pmx-sdio {
+ marvell,pins = "mpp12", "mpp13", "mpp14",
+ "mpp15", "mpp16", "mpp17";
+ marvell,function = "sdio";
+ };
+ };
+
+ rtc: rtc at 10300 {
+ compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
+ reg = <0x10300 0x20>;
+ interrupts = <53>;
+ clocks = <&gate_clk 7>;
+ };
+
+ sata: sata at 80000 {
+ compatible = "marvell,orion-sata";
+ reg = <0x80000 0x5000>;
+ interrupts = <21>;
+ clocks = <&gate_clk 14>, <&gate_clk 15>;
+ clock-names = "0", "1";
+ phys = <&sata_phy0>, <&sata_phy1>;
+ phy-names = "port0", "port1";
+ status = "disabled";
+ };
+
+ sdio: mvsdio at 90000 {
+ compatible = "marvell,orion-sdio";
+ reg = <0x90000 0x200>;
+ interrupts = <28>;
+ clocks = <&gate_clk 4>;
+ pinctrl-0 = <&pmx_sdio>;
+ pinctrl-names = "default";
+ bus-width = <4>;
+ cap-sdio-irq;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/arm/dts/kirkwood-98dx4122.dtsi b/arch/arm/dts/kirkwood-98dx4122.dtsi
new file mode 100644
index 000000000000..299c147298c3
--- /dev/null
+++ b/arch/arm/dts/kirkwood-98dx4122.dtsi
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0
+/ {
+ mbus at f1000000 {
+ pciec: pcie at 82000000 {
+ compatible = "marvell,kirkwood-pcie";
+ status = "disabled";
+ device_type = "pci";
+
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ bus-range = <0x00 0xff>;
+
+ ranges =
+ <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+ 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
+
+ pcie0: pcie at 1,0 {
+ device_type = "pci";
+ assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
+ reg = <0x0800 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+ 0x81000000 0 0 0x81000000 0x1 0 1 0>;
+ bus-range = <0x00 0xff>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 &intc 9>;
+ marvell,pcie-port = <0>;
+ marvell,pcie-lane = <0>;
+ clocks = <&gate_clk 2>;
+ status = "disabled";
+ };
+ };
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ compatible = "marvell,98dx4122-pinctrl";
+
+ };
+ };
+};
+
+&sata_phy0 {
+ status = "disabled";
+};
+
+&sata_phy1 {
+ status = "disabled";
+};
diff --git a/arch/arm/dts/kirkwood.dtsi b/arch/arm/dts/kirkwood.dtsi
new file mode 100644
index 000000000000..81c7eda2c442
--- /dev/null
+++ b/arch/arm/dts/kirkwood.dtsi
@@ -0,0 +1,393 @@
+// SPDX-License-Identifier: GPL-2.0
+/include/ "skeleton.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
+
+/ {
+ compatible = "marvell,kirkwood";
+ interrupt-parent = <&intc>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu at 0 {
+ device_type = "cpu";
+ compatible = "marvell,feroceon";
+ reg = <0>;
+ clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
+ clock-names = "cpu_clk", "ddrclk", "powersave";
+ };
+ };
+
+ aliases {
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ i2c0 = &i2c0;
+ };
+
+ mbus at f1000000 {
+ compatible = "marvell,kirkwood-mbus", "simple-bus";
+ #address-cells = <2>;
+ #size-cells = <1>;
+ /* If a board file needs to change this ranges it must replace it completely */
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 /* internal-regs */
+ MBUS_ID(0x01, 0x2f) 0 0xf4000000 0x10000 /* nand flash */
+ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */
+ >;
+ controller = <&mbusc>;
+ pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
+ pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
+
+ nand: nand at 12f {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ cle = <0>;
+ ale = <1>;
+ bank-width = <1>;
+ compatible = "marvell,orion-nand";
+ reg = <MBUS_ID(0x01, 0x2f) 0 0x400>;
+ chip-delay = <25>;
+ /* set partition map and/or chip-delay in board dts */
+ clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_nand>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ crypto_sram: sa-sram at 301 {
+ compatible = "mmio-sram";
+ reg = <MBUS_ID(0x03, 0x01) 0x0 0x800>;
+ clocks = <&gate_clk 17>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+ };
+
+ ocp at f1000000 {
+ compatible = "simple-bus";
+ ranges = <0x00000000 0xf1000000 0x0100000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ pinctrl: pin-controller at 10000 {
+ /* set compatible property in SoC file */
+ reg = <0x10000 0x20>;
+
+ pmx_ge1: pmx-ge1 {
+ marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
+ "mpp24", "mpp25", "mpp26", "mpp27",
+ "mpp30", "mpp31", "mpp32", "mpp33";
+ marvell,function = "ge1";
+ };
+
+ pmx_nand: pmx-nand {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+ "mpp4", "mpp5", "mpp18", "mpp19";
+ marvell,function = "nand";
+ };
+
+ /*
+ * Default SPI0 pinctrl setting with CSn on mpp0,
+ * overwrite marvell,pins on board level if required.
+ */
+ pmx_spi: pmx-spi {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+ marvell,function = "spi";
+ };
+
+ pmx_twsi0: pmx-twsi0 {
+ marvell,pins = "mpp8", "mpp9";
+ marvell,function = "twsi0";
+ };
+
+ /*
+ * Default UART pinctrl setting without RTS/CTS,
+ * overwrite marvell,pins on board level if required.
+ */
+ pmx_uart0: pmx-uart0 {
+ marvell,pins = "mpp10", "mpp11";
+ marvell,function = "uart0";
+ };
+
+ pmx_uart1: pmx-uart1 {
+ marvell,pins = "mpp13", "mpp14";
+ marvell,function = "uart1";
+ };
+ };
+
+ core_clk: core-clocks at 10030 {
+ compatible = "marvell,kirkwood-core-clock";
+ reg = <0x10030 0x4>;
+ #clock-cells = <1>;
+ };
+
+ spi0: spi at 10600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ interrupts = <23>;
+ reg = <0x10600 0x28>;
+ clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_spi>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ gpio0: gpio at 10100 {
+ compatible = "marvell,orion-gpio";
+ #gpio-cells = <2>;
+ gpio-controller;
+ reg = <0x10100 0x40>;
+ ngpios = <32>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupts = <35>, <36>, <37>, <38>;
+ clocks = <&gate_clk 7>;
+ };
+
+ gpio1: gpio at 10140 {
+ compatible = "marvell,orion-gpio";
+ #gpio-cells = <2>;
+ gpio-controller;
+ reg = <0x10140 0x40>;
+ ngpios = <18>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupts = <39>, <40>, <41>;
+ clocks = <&gate_clk 7>;
+ };
+
+ i2c0: i2c at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <29>;
+ clock-frequency = <100000>;
+ clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_twsi0>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ uart0: serial at 12000 {
+ compatible = "ns16550a";
+ reg = <0x12000 0x100>;
+ reg-shift = <2>;
+ interrupts = <33>;
+ clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_uart0>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ uart1: serial at 12100 {
+ compatible = "ns16550a";
+ reg = <0x12100 0x100>;
+ reg-shift = <2>;
+ interrupts = <34>;
+ clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_uart1>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ mbusc: mbus-controller at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x80>, <0x1500 0x20>;
+ };
+
+ sysc: system-controller at 20000 {
+ compatible = "marvell,orion-system-controller";
+ reg = <0x20000 0x120>;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl at 20110 {
+ compatible = "marvell,orion-bridge-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20110 0x8>;
+ interrupts = <1>;
+ marvell,#interrupts = <6>;
+ };
+
+ gate_clk: clock-gating-control at 2011c {
+ compatible = "marvell,kirkwood-gating-clock";
+ reg = <0x2011c 0x4>;
+ clocks = <&core_clk 0>;
+ #clock-cells = <1>;
+ };
+
+ l2: l2-cache at 20128 {
+ compatible = "marvell,kirkwood-cache";
+ reg = <0x20128 0x4>;
+ };
+
+ intc: main-interrupt-ctrl at 20200 {
+ compatible = "marvell,orion-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20200 0x10>, <0x20210 0x10>;
+ };
+
+ timer: timer at 20300 {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupt-parent = <&bridge_intc>;
+ interrupts = <1>, <2>;
+ clocks = <&core_clk 0>;
+ };
+
+ wdt: watchdog-timer at 20300 {
+ compatible = "marvell,orion-wdt";
+ reg = <0x20300 0x28>, <0x20108 0x4>;
+ interrupt-parent = <&bridge_intc>;
+ interrupts = <3>;
+ clocks = <&gate_clk 7>;
+ status = "okay";
+ };
+
+ cesa: crypto at 30000 {
+ compatible = "marvell,kirkwood-crypto";
+ reg = <0x30000 0x10000>;
+ reg-names = "regs";
+ interrupts = <22>;
+ clocks = <&gate_clk 17>;
+ marvell,crypto-srams = <&crypto_sram>;
+ marvell,crypto-sram-size = <0x800>;
+ status = "okay";
+ };
+
+ usb0: ehci at 50000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x50000 0x1000>;
+ interrupts = <19>;
+ clocks = <&gate_clk 3>;
+ status = "okay";
+ };
+
+ dma0: xor at 60800 {
+ compatible = "marvell,orion-xor";
+ reg = <0x60800 0x100
+ 0x60A00 0x100>;
+ status = "okay";
+ clocks = <&gate_clk 8>;
+
+ xor00 {
+ interrupts = <5>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+ xor01 {
+ interrupts = <6>;
+ dmacap,memcpy;
+ dmacap,xor;
+ dmacap,memset;
+ };
+ };
+
+ dma1: xor at 60900 {
+ compatible = "marvell,orion-xor";
+ reg = <0x60900 0x100
+ 0x60B00 0x100>;
+ status = "okay";
+ clocks = <&gate_clk 16>;
+
+ xor00 {
+ interrupts = <7>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+ xor01 {
+ interrupts = <8>;
+ dmacap,memcpy;
+ dmacap,xor;
+ dmacap,memset;
+ };
+ };
+
+ eth0: ethernet-controller at 72000 {
+ compatible = "marvell,kirkwood-eth";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72000 0x4000>;
+ clocks = <&gate_clk 0>;
+ marvell,tx-checksum-limit = <1600>;
+ status = "disabled";
+
+ eth0port: ethernet0-port at 0 {
+ compatible = "marvell,kirkwood-eth-port";
+ reg = <0>;
+ interrupts = <11>;
+ /* overwrite MAC address in bootloader */
+ local-mac-address = [00 00 00 00 00 00];
+ /* set phy-handle property in board file */
+ };
+ };
+
+ mdio: mdio-bus at 72004 {
+ compatible = "marvell,orion-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72004 0x84>;
+ interrupts = <46>;
+ clocks = <&gate_clk 0>;
+ status = "disabled";
+
+ /* add phy nodes in board file */
+ };
+
+ eth1: ethernet-controller at 76000 {
+ compatible = "marvell,kirkwood-eth";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x76000 0x4000>;
+ clocks = <&gate_clk 19>;
+ marvell,tx-checksum-limit = <1600>;
+ pinctrl-0 = <&pmx_ge1>;
+ pinctrl-names = "default";
+ status = "disabled";
+
+ eth1port: ethernet1-port at 0 {
+ compatible = "marvell,kirkwood-eth-port";
+ reg = <0>;
+ interrupts = <15>;
+ /* overwrite MAC address in bootloader */
+ local-mac-address = [00 00 00 00 00 00];
+ /* set phy-handle property in board file */
+ };
+ };
+
+ sata_phy0: sata-phy at 82000 {
+ compatible = "marvell,mvebu-sata-phy";
+ reg = <0x82000 0x0334>;
+ clocks = <&gate_clk 14>;
+ clock-names = "sata";
+ #phy-cells = <0>;
+ status = "ok";
+ };
+
+ sata_phy1: sata-phy at 84000 {
+ compatible = "marvell,mvebu-sata-phy";
+ reg = <0x84000 0x0334>;
+ clocks = <&gate_clk 15>;
+ clock-names = "sata";
+ #phy-cells = <0>;
+ status = "ok";
+ };
+
+ audio0: audio-controller at a0000 {
+ compatible = "marvell,kirkwood-audio";
+ #sound-dai-cells = <0>;
+ reg = <0xa0000 0x2210>;
+ interrupts = <24>;
+ clocks = <&gate_clk 9>;
+ clock-names = "internal";
+ status = "disabled";
+ };
+ };
+};
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 02/12] ARM: kirkwood: Add device-tree for dns325
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 01/12] ARM: add devicetree files for kirkwood SoC Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 03/12] ARM: kirkwood: Add device-tree for dockstar Chris Packham
` (10 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-dns325.dts | 63 +++++++++
arch/arm/dts/kirkwood-dnskw.dtsi | 235 +++++++++++++++++++++++++++++++
configs/dns325_defconfig | 3 +-
3 files changed, 300 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-dns325.dts
create mode 100644 arch/arm/dts/kirkwood-dnskw.dtsi
diff --git a/arch/arm/dts/kirkwood-dns325.dts b/arch/arm/dts/kirkwood-dns325.dts
new file mode 100644
index 000000000000..94d9c06cbbf5
--- /dev/null
+++ b/arch/arm/dts/kirkwood-dns325.dts
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood-dnskw.dtsi"
+
+/ {
+ model = "D-Link DNS-325 NAS (Rev A1)";
+ compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_power &pmx_led_red_usb_325
+ &pmx_led_red_left_hdd &pmx_led_red_right_hdd
+ &pmx_led_white_usb>;
+ pinctrl-names = "default";
+
+ white-power {
+ label = "dns325:white:power";
+ gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ };
+ white-usb {
+ label = "dns325:white:usb";
+ gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */
+ };
+ red-l_hdd {
+ label = "dns325:red:l_hdd";
+ gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+ };
+ red-r_hdd {
+ label = "dns325:red:r_hdd";
+ gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+ };
+ red-usb {
+ label = "dns325:red:usb";
+ gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ ocp at f1000000 {
+ i2c at 11000 {
+ status = "okay";
+
+ lm75: lm75 at 48 {
+ compatible = "national,lm75";
+ reg = <0x48>;
+ };
+ };
+ serial at 12000 {
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm/dts/kirkwood-dnskw.dtsi b/arch/arm/dts/kirkwood-dnskw.dtsi
new file mode 100644
index 000000000000..cbaf06f2f78e
--- /dev/null
+++ b/arch/arm/dts/kirkwood-dnskw.dtsi
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "D-Link DNS NASes (kirkwood-based)";
+ compatible = "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_button_power &pmx_button_unmount
+ &pmx_button_reset>;
+ pinctrl-names = "default";
+
+ power {
+ label = "Power button";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+ };
+ eject {
+ label = "USB unmount button";
+ linux,code = <KEY_EJECTCD>;
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+ reset {
+ label = "Reset button";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ gpio_fan {
+ /* Fan: ADDA AD045HB-G73 40mm 6000rpm at 5v */
+ compatible = "gpio-fan";
+ pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>;
+ pinctrl-names = "default";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW
+ &gpio1 13 GPIO_ACTIVE_LOW>;
+ gpio-fan,speed-map = <0 0
+ 3000 1
+ 6000 2>;
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ pinctrl-0 = <&pmx_power_off>;
+ pinctrl-names = "default";
+ gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+
+ pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0
+ &pmx_present_sata1 &pmx_fan_tacho
+ &pmx_temp_alarm>;
+ pinctrl-names = "default";
+
+ pmx_sata0: pmx-sata0 {
+ marvell,pins = "mpp20";
+ marvell,function = "sata1";
+ };
+ pmx_sata1: pmx-sata1 {
+ marvell,pins = "mpp21";
+ marvell,function = "sata0";
+ };
+ pmx_led_power: pmx-led-power {
+ marvell,pins = "mpp26";
+ marvell,function = "gpio";
+ };
+ pmx_led_red_right_hdd: pmx-led-red-right-hdd {
+ marvell,pins = "mpp27";
+ marvell,function = "gpio";
+ };
+ pmx_led_red_left_hdd: pmx-led-red-left-hdd {
+ marvell,pins = "mpp28";
+ marvell,function = "gpio";
+ };
+ pmx_led_red_usb_325: pmx-led-red-usb-325 {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ pmx_button_power: pmx-button-power {
+ marvell,pins = "mpp34";
+ marvell,function = "gpio";
+ };
+ pmx_led_red_usb_320: pmx-led-red-usb-320 {
+ marvell,pins = "mpp35";
+ marvell,function = "gpio";
+ };
+ pmx_power_off: pmx-power-off {
+ marvell,pins = "mpp36";
+ marvell,function = "gpio";
+ };
+ pmx_power_back_on: pmx-power-back-on {
+ marvell,pins = "mpp37";
+ marvell,function = "gpio";
+ };
+ pmx_power_sata0: pmx-power-sata0 {
+ marvell,pins = "mpp39";
+ marvell,function = "gpio";
+ };
+ pmx_power_sata1: pmx-power-sata1 {
+ marvell,pins = "mpp40";
+ marvell,function = "gpio";
+ };
+ pmx_present_sata0: pmx-present-sata0 {
+ marvell,pins = "mpp41";
+ marvell,function = "gpio";
+ };
+ pmx_present_sata1: pmx-present-sata1 {
+ marvell,pins = "mpp42";
+ marvell,function = "gpio";
+ };
+ pmx_led_white_usb: pmx-led-white-usb {
+ marvell,pins = "mpp43";
+ marvell,function = "gpio";
+ };
+ pmx_fan_tacho: pmx-fan-tacho {
+ marvell,pins = "mpp44";
+ marvell,function = "gpio";
+ };
+ pmx_fan_high_speed: pmx-fan-high-speed {
+ marvell,pins = "mpp45";
+ marvell,function = "gpio";
+ };
+ pmx_fan_low_speed: pmx-fan-low-speed {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_button_unmount: pmx-button-unmount {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ pmx_button_reset: pmx-button-reset {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+ pmx_temp_alarm: pmx-temp-alarm {
+ marvell,pins = "mpp49";
+ marvell,function = "gpio";
+ };
+ };
+ sata at 80000 {
+ pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
+ pinctrl-names = "default";
+ status = "okay";
+ nr-ports = <2>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;
+ pinctrl-names = "default";
+
+ sata0_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "SATA0 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 7 0>;
+ };
+ sata1_power: regulator at 2 {
+ compatible = "regulator-fixed";
+ reg = <2>;
+ regulator-name = "SATA1 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 8 0>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+ chip-delay = <35>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x500000>;
+ };
+
+ partition at 600000 {
+ label = "ramdisk";
+ reg = <0x0600000 0x500000>;
+ };
+
+ partition at b00000 {
+ label = "image";
+ reg = <0x0b00000 0x6600000>;
+ };
+
+ partition at 7100000 {
+ label = "mini firmware";
+ reg = <0x7100000 0xa00000>;
+ };
+
+ partition at 7b00000 {
+ label = "config";
+ reg = <0x7b00000 0x500000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ reg = <8>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index c46e2b447463..e010c4a42910 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DNS325=y
CONFIG_IDENT_STRING="\nD-Link DNS-325"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
@@ -23,6 +24,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -30,4 +32,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 03/12] ARM: kirkwood: Add device-tree for dockstar
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 01/12] ARM: add devicetree files for kirkwood SoC Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 02/12] ARM: kirkwood: Add device-tree for dns325 Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 04/12] ARM: kirkwood: Add device-tree for goflexhome Chris Packham
` (9 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-dockstar.dts | 110 +++++++++++++++++++++++++++++
configs/dockstar_defconfig | 3 +-
2 files changed, 112 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-dockstar.dts
diff --git a/arch/arm/dts/kirkwood-dockstar.dts b/arch/arm/dts/kirkwood-dockstar.dts
new file mode 100644
index 000000000000..6a3f1bf6d9f1
--- /dev/null
+++ b/arch/arm/dts/kirkwood-dockstar.dts
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "Seagate FreeAgent Dockstar";
+ compatible = "seagate,dockstar", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pmx_usb_power_enable: pmx-usb-power-enable {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ pmx_led_green: pmx-led-green {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_led_orange: pmx-led-orange {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ };
+ serial at 12000 {
+ status = "ok";
+ };
+ };
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
+ pinctrl-names = "default";
+
+ health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ };
+ fault {
+ label = "status:orange:fault";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+ };
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_usb_power_enable>;
+ pinctrl-names = "default";
+
+ usb_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 29 0>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x400000>;
+ };
+
+ partition at 500000 {
+ label = "data";
+ reg = <0x0500000 0xfb00000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ compatible = "marvell,88e1116";
+ reg = <0>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 88d6f596b27a..7ad184f2eb20 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DOCKSTAR=y
CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="DockStar> "
@@ -19,10 +20,10 @@ CONFIG_CMD_JFFS2=y
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 04/12] ARM: kirkwood: Add device-tree for goflexhome
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (2 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 03/12] ARM: kirkwood: Add device-tree for dockstar Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 05/12] ARM: kirkwood: Add device-tree for guruplug Chris Packham
` (8 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-goflexnet.dts | 190 ++++++++++++++++++++++++++++
configs/goflexhome_defconfig | 3 +-
2 files changed, 192 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-goflexnet.dts
diff --git a/arch/arm/dts/kirkwood-goflexnet.dts b/arch/arm/dts/kirkwood-goflexnet.dts
new file mode 100644
index 000000000000..02d87e0a1061
--- /dev/null
+++ b/arch/arm/dts/kirkwood-goflexnet.dts
@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "Seagate GoFlex Net";
+ compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pmx_usb_power_enable: pmx-usb-power-enable {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ pmx_led_right_cap_0: pmx-led_right_cap_0 {
+ marvell,pins = "mpp38";
+ marvell,function = "gpio";
+ };
+ pmx_led_right_cap_1: pmx-led_right_cap_1 {
+ marvell,pins = "mpp39";
+ marvell,function = "gpio";
+ };
+ pmx_led_right_cap_2: pmx-led_right_cap_2 {
+ marvell,pins = "mpp40";
+ marvell,function = "gpio";
+ };
+ pmx_led_right_cap_3: pmx-led_right_cap_3 {
+ marvell,pins = "mpp41";
+ marvell,function = "gpio";
+ };
+ pmx_led_left_cap_0: pmx-led_left_cap_0 {
+ marvell,pins = "mpp42";
+ marvell,function = "gpio";
+ };
+ pmx_led_left_cap_1: pmx-led_left_cap_1 {
+ marvell,pins = "mpp43";
+ marvell,function = "gpio";
+ };
+ pmx_led_left_cap_2: pmx-led_left_cap_2 {
+ marvell,pins = "mpp44";
+ marvell,function = "gpio";
+ };
+ pmx_led_left_cap_3: pmx-led_left_cap_3 {
+ marvell,pins = "mpp45";
+ marvell,function = "gpio";
+ };
+ pmx_led_green: pmx-led_green {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_led_orange: pmx-led_orange {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ };
+ serial at 12000 {
+ status = "ok";
+ };
+
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+
+ };
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = < &pmx_led_orange
+ &pmx_led_left_cap_0 &pmx_led_left_cap_1
+ &pmx_led_left_cap_2 &pmx_led_left_cap_3
+ &pmx_led_right_cap_0 &pmx_led_right_cap_1
+ &pmx_led_right_cap_2 &pmx_led_right_cap_3
+ >;
+ pinctrl-names = "default";
+
+ health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ };
+ fault {
+ label = "status:orange:fault";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+ left0 {
+ label = "status:white:left0";
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+ };
+ left1 {
+ label = "status:white:left1";
+ gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+ };
+ left2 {
+ label = "status:white:left2";
+ gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+ };
+ left3 {
+ label = "status:white:left3";
+ gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+ };
+ right0 {
+ label = "status:white:right0";
+ gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+ };
+ right1 {
+ label = "status:white:right1";
+ gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ };
+ right2 {
+ label = "status:white:right2";
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+ };
+ right3 {
+ label = "status:white:right3";
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ };
+ };
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_usb_power_enable>;
+ pinctrl-names = "default";
+
+ usb_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&nand {
+ chip-delay = <40>;
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x400000>;
+ };
+
+ partition at 500000 {
+ label = "pogoplug";
+ reg = <0x0500000 0x2000000>;
+ };
+
+ partition at 2500000 {
+ label = "root";
+ reg = <0x02500000 0xd800000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index d87d308ac097..7f85c4fa17bb 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GOFLEXHOME=y
CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
@@ -24,6 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -31,4 +33,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 05/12] ARM: kirkwood: Add device-tree for guruplug
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (3 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 04/12] ARM: kirkwood: Add device-tree for goflexhome Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 06/12] ARM: kirkwood: Add device-tree for ib62x0 Chris Packham
` (7 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
.../arm/dts/kirkwood-guruplug-server-plus.dts | 133 ++++++++++++++++++
configs/guruplug_defconfig | 3 +-
2 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus.dts
diff --git a/arch/arm/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/dts/kirkwood-guruplug-server-plus.dts
new file mode 100644
index 000000000000..ff1260ee3fe8
--- /dev/null
+++ b/arch/arm/dts/kirkwood-guruplug-server-plus.dts
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "Globalscale Technologies Guruplug Server Plus";
+ compatible = "globalscale,guruplug-server-plus", "globalscale,guruplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pmx_led_health_r: pmx-led-health-r {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_led_health_g: pmx-led-health-g {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ pmx_led_wmode_r: pmx-led-wmode-r {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+ pmx_led_wmode_g: pmx-led-wmode-g {
+ marvell,pins = "mpp49";
+ marvell,function = "gpio";
+ };
+ };
+ serial at 12000 {
+ status = "ok";
+ };
+
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <1>;
+ };
+
+ /* AzureWave AW-GH381 WiFi/BT */
+ mvsdio at 90000 {
+ status = "okay";
+ non-removable;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g
+ &pmx_led_wmode_r &pmx_led_wmode_g >;
+ pinctrl-names = "default";
+
+ health-r {
+ label = "guruplug:red:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ };
+ health-g {
+ label = "guruplug:green:health";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+ wmode-r {
+ label = "guruplug:red:wmode";
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+ };
+ wmode-g {
+ label = "guruplug:green:wmode";
+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x00000000 0x00100000>;
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x00100000 0x00400000>;
+ };
+
+ partition at 500000 {
+ label = "data";
+ reg = <0x00500000 0x1fb00000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ /* Marvell 88E1121R */
+ compatible = "ethernet-phy-id0141.0cb0",
+ "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
+
+ ethphy1: ethernet-phy at 1 {
+ /* Marvell 88E1121R */
+ compatible = "ethernet-phy-id0141.0cb0",
+ "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ phy-connection-type = "rgmii-id";
+ };
+};
+
+ð1 {
+ status = "okay";
+ ethernet1-port at 0 {
+ phy-handle = <ðphy1>;
+ phy-connection-type = "rgmii-id";
+ };
+};
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index c4889910687f..66c34fcc34bc 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GURUPLUG=y
CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -24,6 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896K(uboot),128K(uboot_env),- at 1M(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -32,4 +34,3 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LZMA=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 06/12] ARM: kirkwood: Add device-tree for ib62x0
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (4 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 05/12] ARM: kirkwood: Add device-tree for guruplug Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 07/12] ARM: kirkwood: Add device-tree for iconnect Chris Packham
` (6 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-ib62x0.dts | 146 +++++++++++++++++++++++++++++++
configs/ib62x0_defconfig | 3 +-
2 files changed, 148 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-ib62x0.dts
diff --git a/arch/arm/dts/kirkwood-ib62x0.dts b/arch/arm/dts/kirkwood-ib62x0.dts
new file mode 100644
index 000000000000..962a910a6f5c
--- /dev/null
+++ b/arch/arm/dts/kirkwood-ib62x0.dts
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
+ compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pmx_led_os_red: pmx-led-os-red {
+ marvell,pins = "mpp22";
+ marvell,function = "gpio";
+ };
+ pmx_power_off: pmx-power-off {
+ marvell,pins = "mpp24";
+ marvell,function = "gpio";
+ };
+ pmx_led_os_green: pmx-led-os-green {
+ marvell,pins = "mpp25";
+ marvell,function = "gpio";
+ };
+ pmx_led_usb_transfer: pmx-led-usb-transfer {
+ marvell,pins = "mpp27";
+ marvell,function = "gpio";
+ };
+ pmx_button_reset: pmx-button-reset {
+ marvell,pins = "mpp28";
+ marvell,function = "gpio";
+ };
+ pmx_button_usb_copy: pmx-button-usb-copy {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ };
+
+ serial at 12000 {
+ status = "okay";
+ };
+
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
+ pinctrl-names = "default";
+
+ copy {
+ label = "USB Copy";
+ linux,code = <KEY_COPY>;
+ gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+ };
+ reset {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green
+ &pmx_led_usb_transfer>;
+ pinctrl-names = "default";
+
+ green-os {
+ label = "ib62x0:green:os";
+ gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+ default-state = "keep";
+ };
+ red-os {
+ label = "ib62x0:red:os";
+ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+ };
+ usb-copy {
+ label = "ib62x0:red:usb_copy";
+ gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ pinctrl-0 = <&pmx_power_off>;
+ pinctrl-names = "default";
+ gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+ };
+};
+
+&nand {
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0xe0000>;
+ };
+
+ partition at e0000 {
+ label = "u-boot environment";
+ reg = <0xe0000 0x20000>;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x600000>;
+ };
+
+ partition at 700000 {
+ label = "root";
+ reg = <0x0700000 0xf900000>;
+ };
+
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ reg = <8>;
+ };
+};
+
+ð0 {
+ status = "okay";
+
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 9a067e36cc00..1dd6b419d1ea 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_IB62X0=y
CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ib62x0"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -22,6 +23,7 @@ CONFIG_CMD_JFFS2=y
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0(uboot),0x20000 at 0xe0000(uboot_env),- at 0x100000(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -30,4 +32,3 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LZMA=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 07/12] ARM: kirkwood: Add device-tree for iconnect
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (5 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 06/12] ARM: kirkwood: Add device-tree for ib62x0 Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 08/12] ARM: kirkwood: Add device-tree for nas220 Chris Packham
` (5 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-iconnect.dts | 195 +++++++++++++++++++++++++++++
configs/iconnect_defconfig | 3 +-
2 files changed, 197 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-iconnect.dts
diff --git a/arch/arm/dts/kirkwood-iconnect.dts b/arch/arm/dts/kirkwood-iconnect.dts
new file mode 100644
index 000000000000..4a512d80912c
--- /dev/null
+++ b/arch/arm/dts/kirkwood-iconnect.dts
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "Iomega Iconnect";
+ compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ linux,initrd-start = <0x4500040>;
+ linux,initrd-end = <0x4800000>;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pmx_button_reset: pmx-button-reset {
+ marvell,pins = "mpp12";
+ marvell,function = "gpio";
+ };
+ pmx_button_otb: pmx-button-otb {
+ marvell,pins = "mpp35";
+ marvell,function = "gpio";
+ };
+ pmx_led_level: pmx-led-level {
+ marvell,pins = "mpp41";
+ marvell,function = "gpio";
+ };
+ pmx_led_power_blue: pmx-led-power-blue {
+ marvell,pins = "mpp42";
+ marvell,function = "gpio";
+ };
+ pmx_led_power_red: pmx-power-red {
+ marvell,pins = "mpp43";
+ marvell,function = "gpio";
+ };
+ pmx_led_usb1: pmx-led-usb1 {
+ marvell,pins = "mpp44";
+ marvell,function = "gpio";
+ };
+ pmx_led_usb2: pmx-led-usb2 {
+ marvell,pins = "mpp45";
+ marvell,function = "gpio";
+ };
+ pmx_led_usb3: pmx-led-usb3 {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_led_usb4: pmx-led-usb4 {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ pmx_led_otb: pmx-led-otb {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+ };
+ i2c at 11000 {
+ status = "okay";
+
+ lm63: lm63 at 4c {
+ compatible = "national,lm63";
+ reg = <0x4c>;
+ };
+ };
+ serial at 12000 {
+ status = "ok";
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = < &pmx_led_level &pmx_led_power_blue
+ &pmx_led_power_red &pmx_led_usb1
+ &pmx_led_usb2 &pmx_led_usb3
+ &pmx_led_usb4 &pmx_led_otb >;
+ pinctrl-names = "default";
+
+ led-level {
+ label = "led_level";
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ };
+ power-blue {
+ label = "power:blue";
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+ default-state = "keep";
+ };
+ power-red {
+ label = "power:red";
+ gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+ };
+ usb1 {
+ label = "usb1:blue";
+ gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+ };
+ usb2 {
+ label = "usb2:blue";
+ gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+ };
+ usb3 {
+ label = "usb3:blue";
+ gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+ };
+ usb4 {
+ label = "usb4:blue";
+ gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+ };
+ otb {
+ label = "otb:blue";
+ gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
+ pinctrl-names = "default";
+
+ otb {
+ label = "OTB Button";
+ linux,code = <KEY_COPY>;
+ gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ reset {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+
+ partition at 0 {
+ label = "uboot";
+ reg = <0x0000000 0xc0000>;
+ };
+
+ partition at a0000 {
+ label = "env";
+ reg = <0xa0000 0x20000>;
+ };
+
+ partition at 100000 {
+ label = "zImage";
+ reg = <0x100000 0x300000>;
+ };
+
+ partition at 540000 {
+ label = "initrd";
+ reg = <0x540000 0x300000>;
+ };
+
+ partition at 980000 {
+ label = "boot";
+ reg = <0x980000 0x1f400000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 11 {
+ reg = <11>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 80b8ff999a55..236b91df45e6 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_ICONNECT=y
CONFIG_IDENT_STRING=" Iomega iConnect"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="iconnect => "
@@ -18,6 +19,7 @@ CONFIG_CMD_JFFS2=y
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000 at 0x0(uboot),0x20000 at 0x80000(uboot_env),- at 0xa0000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_SYS_NS16550=y
@@ -25,4 +27,3 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LZMA=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 08/12] ARM: kirkwood: Add device-tree for nas220
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (6 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 07/12] ARM: kirkwood: Add device-tree for iconnect Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s Chris Packham
` (4 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts file from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-blackarmor-nas220.dts | 172 ++++++++++++++++++++
configs/nas220_defconfig | 3 +-
2 files changed, 174 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-blackarmor-nas220.dts
diff --git a/arch/arm/dts/kirkwood-blackarmor-nas220.dts b/arch/arm/dts/kirkwood-blackarmor-nas220.dts
new file mode 100644
index 000000000000..07fbfca444d5
--- /dev/null
+++ b/arch/arm/dts/kirkwood-blackarmor-nas220.dts
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Device Tree file for Seagate Blackarmor NAS220
+ *
+ * Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include "kirkwood.dtsi"
+#include "kirkwood-6192.dtsi"
+
+/ {
+ model = "Seagate Blackarmor NAS220";
+ compatible = "seagate,blackarmor-nas220","marvell,kirkwood-88f6192",
+ "marvell,kirkwood";
+
+ memory { /* 128 MB */
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+
+ reset {
+ label = "Reset";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+
+ button {
+ label = "Power";
+ linux,code = <KEY_SLEEP>;
+ gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ blue-power {
+ label = "nas220:blue:power";
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;
+ pinctrl-names = "default";
+
+ sata0_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "SATA0 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 24 GPIO_ACTIVE_LOW>;
+ };
+
+ sata1_power: regulator at 2 {
+ compatible = "regulator-fixed";
+ reg = <2>;
+ regulator-name = "SATA1 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 28 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+/*
+ * Serial port routed to connector CN5
+ *
+ * pin 1 - TX (CPU's TX)
+ * pin 4 - RX (CPU's RX)
+ * pin 6 - GND
+ */
+&uart0 {
+ status = "okay";
+};
+
+&pinctrl {
+ pinctrl-0 = <&pmx_button_reset &pmx_button_power>;
+ pinctrl-names = "default";
+
+ pmx_act_sata0: pmx-act-sata0 {
+ marvell,pins = "mpp15";
+ marvell,function = "sata0";
+ };
+
+ pmx_act_sata1: pmx-act-sata1 {
+ marvell,pins = "mpp16";
+ marvell,function = "sata1";
+ };
+
+ pmx_power_sata0: pmx-power-sata0 {
+ marvell,pins = "mpp24";
+ marvell,function = "gpio";
+ };
+
+ pmx_power_sata1: pmx-power-sata1 {
+ marvell,pins = "mpp28";
+ marvell,function = "gpio";
+ };
+
+ pmx_button_reset: pmx-button-reset {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+
+ pmx_button_power: pmx-button-power {
+ marvell,pins = "mpp26";
+ marvell,function = "gpio";
+ };
+};
+
+&sata {
+ status = "okay";
+ nr-ports = <2>;
+};
+
+&i2c0 {
+ status = "okay";
+
+ adt7476: thermal at 2e {
+ compatible = "adi,adt7476";
+ reg = <0x2e>;
+ };
+};
+
+&nand {
+ status = "okay";
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ reg = <8>;
+ };
+};
+
+ð0 {
+ status = "okay";
+
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 75ea85bad4c6..06918eee2334 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NAS220=y
CONFIG_IDENT_STRING="\nNAS 220"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -24,6 +25,7 @@ CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -31,4 +33,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (7 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 08/12] ARM: kirkwood: Add device-tree for nas220 Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-09 18:27 ` bodhi bodhi
2018-05-08 10:34 ` [U-Boot] [PATCH 10/12] ARM: kirkwood: Add device-tree for openrd Chris Packham
` (3 subsequent siblings)
12 siblings, 1 reply; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-nsa310.dts | 139 ++++++++++++++++++++
arch/arm/dts/kirkwood-nsa3x0-common.dtsi | 158 +++++++++++++++++++++++
configs/nsa310s_defconfig | 3 +-
3 files changed, 299 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-nsa310.dts
create mode 100644 arch/arm/dts/kirkwood-nsa3x0-common.dtsi
diff --git a/arch/arm/dts/kirkwood-nsa310.dts b/arch/arm/dts/kirkwood-nsa310.dts
new file mode 100644
index 000000000000..9b861c2e76c5
--- /dev/null
+++ b/arch/arm/dts/kirkwood-nsa310.dts
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood-nsa3x0-common.dtsi"
+
+/ {
+ compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pinctrl-0 = <&pmx_unknown>;
+ pinctrl-names = "default";
+
+ pmx_led_esata_green: pmx-led-esata-green {
+ marvell,pins = "mpp12";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_esata_red: pmx-led-esata-red {
+ marvell,pins = "mpp13";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_usb_green: pmx-led-usb-green {
+ marvell,pins = "mpp15";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_usb_red: pmx-led-usb-red {
+ marvell,pins = "mpp16";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_sys_green: pmx-led-sys-green {
+ marvell,pins = "mpp28";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_sys_red: pmx-led-sys-red {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_hdd_green: pmx-led-hdd-green {
+ marvell,pins = "mpp41";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_hdd_red: pmx-led-hdd-red {
+ marvell,pins = "mpp42";
+ marvell,function = "gpio";
+ };
+
+ pmx_unknown: pmx-unknown {
+ marvell,pins = "mpp44";
+ marvell,function = "gpio";
+ };
+
+ };
+
+ i2c at 11000 {
+ status = "okay";
+
+ adt7476: adt7476a at 2e {
+ compatible = "adi,adt7476";
+ reg = <0x2e>;
+ };
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
+ &pmx_led_usb_green &pmx_led_usb_red
+ &pmx_led_sys_green &pmx_led_sys_red
+ &pmx_led_copy_green &pmx_led_copy_red
+ &pmx_led_hdd_green &pmx_led_hdd_red>;
+ pinctrl-names = "default";
+
+ green-sys {
+ label = "nsa310:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ };
+ red-sys {
+ label = "nsa310:red:sys";
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+ green-hdd {
+ label = "nsa310:green:hdd";
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ };
+ red-hdd {
+ label = "nsa310:red:hdd";
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+ };
+ green-esata {
+ label = "nsa310:green:esata";
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+ };
+ red-esata {
+ label = "nsa310:red:esata";
+ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+ };
+ green-usb {
+ label = "nsa310:green:usb";
+ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+ };
+ red-usb {
+ label = "nsa310:red:usb";
+ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+ };
+ green-copy {
+ label = "nsa310:green:copy";
+ gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ };
+ red-copy {
+ label = "nsa310:red:copy";
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
new file mode 100644
index 000000000000..2c4037b07282
--- /dev/null
+++ b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "ZyXEL NSA310";
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+
+ pmx_usb_power: pmx-usb-power {
+ marvell,pins = "mpp21";
+ marvell,function = "gpio";
+ };
+
+ pmx_pwr_off: pmx-pwr-off {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+
+ pmx_btn_reset: pmx-btn-reset {
+ marvell,pins = "mpp36";
+ marvell,function = "gpio";
+ };
+
+ pmx_btn_copy: pmx-btn-copy {
+ marvell,pins = "mpp37";
+ marvell,function = "gpio";
+ };
+
+ pmx_btn_power: pmx-btn-power {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_copy_green: pmx-led-copy-green {
+ marvell,pins = "mpp39";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_copy_red: pmx-led-copy-red {
+ marvell,pins = "mpp40";
+ marvell,function = "gpio";
+ };
+ };
+
+ serial at 12000 {
+ status = "ok";
+ };
+
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ pinctrl-0 = <&pmx_pwr_off>;
+ pinctrl-names = "default";
+ gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
+ pinctrl-names = "default";
+
+ power {
+ label = "Power Button";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+ };
+ copy {
+ label = "Copy Button";
+ linux,code = <KEY_COPY>;
+ gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+ };
+ reset {
+ label = "Reset Button";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_usb_power>;
+ pinctrl-names = "default";
+
+ usb0_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+ chip-delay = <35>;
+
+ partition at 0 {
+ label = "uboot";
+ reg = <0x0000000 0x0100000>;
+ read-only;
+ };
+ partition at 100000 {
+ label = "uboot_env";
+ reg = <0x0100000 0x0080000>;
+ };
+ partition at 180000 {
+ label = "key_store";
+ reg = <0x0180000 0x0080000>;
+ };
+ partition at 200000 {
+ label = "info";
+ reg = <0x0200000 0x0080000>;
+ };
+ partition at 280000 {
+ label = "etc";
+ reg = <0x0280000 0x0a00000>;
+ };
+ partition at c80000 {
+ label = "kernel_1";
+ reg = <0x0c80000 0x0a00000>;
+ };
+ partition at 1680000 {
+ label = "rootfs1";
+ reg = <0x1680000 0x2fc0000>;
+ };
+ partition at 4640000 {
+ label = "kernel_2";
+ reg = <0x4640000 0x0a00000>;
+ };
+ partition at 5040000 {
+ label = "rootfs2";
+ reg = <0x5040000 0x2fc0000>;
+ };
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 2529687414fa..d3ea933d378b 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NSA310S=y
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -21,6 +22,7 @@ CONFIG_CMD_JFFS2=y
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0(uboot),0x20000 at 0xe0000(uboot_env),0x100000 at 0x100000(second_stage_uboot),- at 0x200000(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
@@ -29,4 +31,3 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LZMA=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 10/12] ARM: kirkwood: Add device-tree for openrd
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (8 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 11/12] ARM: kirkwood: Add device-tree for pogo_e02 Chris Packham
` (2 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-openrd-base.dts | 39 +++++++
arch/arm/dts/kirkwood-openrd-client.dts | 73 +++++++++++++
arch/arm/dts/kirkwood-openrd-ultimate.dts | 55 ++++++++++
arch/arm/dts/kirkwood-openrd.dtsi | 122 ++++++++++++++++++++++
configs/openrd_base_defconfig | 3 +-
configs/openrd_client_defconfig | 3 +-
configs/openrd_ultimate_defconfig | 3 +-
7 files changed, 295 insertions(+), 3 deletions(-)
create mode 100644 arch/arm/dts/kirkwood-openrd-base.dts
create mode 100644 arch/arm/dts/kirkwood-openrd-client.dts
create mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts
create mode 100644 arch/arm/dts/kirkwood-openrd.dtsi
diff --git a/arch/arm/dts/kirkwood-openrd-base.dts b/arch/arm/dts/kirkwood-openrd-base.dts
new file mode 100644
index 000000000000..094191ece3d7
--- /dev/null
+++ b/arch/arm/dts/kirkwood-openrd-base.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Marvell OpenRD Base Board Description
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * base variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+ model = "OpenRD Base";
+ compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ ocp at f1000000 {
+ serial at 12100 {
+ status = "okay";
+ };
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ reg = <8>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/arch/arm/dts/kirkwood-openrd-client.dts b/arch/arm/dts/kirkwood-openrd-client.dts
new file mode 100644
index 000000000000..74dc23daf646
--- /dev/null
+++ b/arch/arm/dts/kirkwood-openrd-client.dts
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Marvell OpenRD Client Board Description
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * client variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+ model = "OpenRD Client";
+ compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ ocp at f1000000 {
+ audio-controller at a0000 {
+ status = "okay";
+ };
+ i2c at 11000 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ cs42l51: cs42l51 at 4a {
+ compatible = "cirrus,cs42l51";
+ reg = <0x4a>;
+ #sound-dai-cells = <0>;
+ };
+ };
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,mclk-fs = <256>;
+
+ simple-audio-card,cpu {
+ sound-dai = <&audio0 0>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&cs42l51>;
+ };
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ reg = <8>;
+ };
+ ethphy1: ethernet-phy at 24 {
+ reg = <24>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
+
+ð1 {
+ status = "okay";
+ ethernet1-port at 0 {
+ phy-handle = <ðphy1>;
+ };
+};
diff --git a/arch/arm/dts/kirkwood-openrd-ultimate.dts b/arch/arm/dts/kirkwood-openrd-ultimate.dts
new file mode 100644
index 000000000000..888e13320c19
--- /dev/null
+++ b/arch/arm/dts/kirkwood-openrd-ultimate.dts
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Marvell OpenRD Ultimate Board Description
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * ultimate variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+ model = "OpenRD Ultimate";
+ compatible = "marvell,openrd-ultimate", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ ocp at f1000000 {
+ i2c at 11000 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ cs42l51: cs42l51 at 4a {
+ compatible = "cirrus,cs42l51";
+ reg = <0x4a>;
+ };
+ };
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+ ethphy1: ethernet-phy at 1 {
+ reg = <1>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
+
+ð1 {
+ status = "okay";
+ ethernet1-port at 0 {
+ phy-handle = <ðphy1>;
+ };
+};
diff --git a/arch/arm/dts/kirkwood-openrd.dtsi b/arch/arm/dts/kirkwood-openrd.dtsi
new file mode 100644
index 000000000000..47f03c69c55a
--- /dev/null
+++ b/arch/arm/dts/kirkwood-openrd.dtsi
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Marvell OpenRD (Base|Client|Ultimate) Board Description
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file contains the definitions that are common between the three
+ * variants of the Marvell Kirkwood Development Board.
+ */
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+ pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
+ pinctrl-names = "default";
+
+ pmx_select28: pmx-select-rs232-rs485 {
+ marvell,pins = "mpp28";
+ marvell,function = "gpio";
+ };
+ pmx_sdio_cd: pmx-sdio-cd {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ pmx_select34: pmx-select-uart-sd {
+ marvell,pins = "mpp34";
+ marvell,function = "gpio";
+ };
+ };
+ serial at 12000 {
+ status = "okay";
+
+ };
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+ mvsdio at 90000 {
+ status = "okay";
+ cd-gpios = <&gpio0 29 9>;
+ };
+ gpio at 10100 {
+ p28 {
+ gpio-hog;
+ gpios = <28 GPIO_ACTIVE_HIGH>;
+ /*
+ * SelRS232or485 selects between RS-232 or RS-485
+ * mode for the second UART.
+ *
+ * Low: RS-232
+ * High: RS-485
+ *
+ * To use the second UART, you need to change also
+ * the SelUARTorSD.
+ */
+ output-low;
+ line-name = "SelRS232or485";
+ };
+ };
+ gpio at 10140 {
+ p2 {
+ gpio-hog;
+ gpios = <2 GPIO_ACTIVE_HIGH>;
+ /*
+ * SelUARTorSD selects between the second UART
+ * (serial at 12100) and SD (mvsdio at 90000).
+ *
+ * Low: UART
+ * High: SD
+ *
+ * When changing this line make sure the newly
+ * selected device node is enabled and the
+ * previously selected device node is disabled.
+ */
+ output-high; /* Select SD by default */
+ line-name = "SelUARTorSD";
+ };
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+ pinctrl-0 = <&pmx_nand>;
+ pinctrl-names = "default";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x400000>;
+ };
+
+ partition at 600000 {
+ label = "root";
+ reg = <0x0600000 0x1FA00000>;
+ };
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 75ebb22f2d3e..650ac5766e4e 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -4,6 +4,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_IDENT_STRING="\nOpenRD-Base"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
CONFIG_BOOTDELAY=3
CONFIG_LOGLEVEL=2
@@ -24,6 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC_HW_PARTITIONING is not set
@@ -31,4 +33,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 533a4032488f..b139994f0a0c 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -4,6 +4,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_IDENT_STRING="\nOpenRD-Client"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
CONFIG_BOOTDELAY=3
CONFIG_LOGLEVEL=2
@@ -24,6 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC_HW_PARTITIONING is not set
@@ -31,4 +33,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index db90072978f1..dfadcca9d9f6 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -4,6 +4,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
CONFIG_BOOTDELAY=3
CONFIG_LOGLEVEL=2
@@ -24,6 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
# CONFIG_MMC_HW_PARTITIONING is not set
@@ -31,4 +33,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 11/12] ARM: kirkwood: Add device-tree for pogo_e02
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (9 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 10/12] ARM: kirkwood: Add device-tree for openrd Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 12/12] ARM: kirkwood: Add device-tree for sheevaplug Chris Packham
2018-05-16 12:03 ` [U-Boot] [PATCH 00/12] kirkwood: device tree support Stefan Roese
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-pogo_e02.dts | 132 +++++++++++++++++++++++++++++
configs/pogo_e02_defconfig | 3 +-
2 files changed, 134 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-pogo_e02.dts
diff --git a/arch/arm/dts/kirkwood-pogo_e02.dts b/arch/arm/dts/kirkwood-pogo_e02.dts
new file mode 100644
index 000000000000..f9e95e55f36d
--- /dev/null
+++ b/arch/arm/dts/kirkwood-pogo_e02.dts
@@ -0,0 +1,132 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * kirkwood-pogo_e02.dts - Device tree file for Pogoplug E02
+ *
+ * Copyright (C) 2015 Christoph Junghans <ottxor@gentoo.org>
+ *
+ * based on information of dts files from
+ * Arch Linux ARM by Oleg Rakhmanov <moonman.ca@gmail.com>
+ * OpenWrt by Felix Kaechele <heffer@fedoraproject.org>
+ *
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ model = "Cloud Engines Pogoplug E02";
+ compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281",
+ "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ health {
+ label = "pogo_e02:green:health";
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ };
+ fault {
+ label = "pogo_e02:orange:fault";
+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_usb_power_enable>;
+ pinctrl-names = "default";
+
+ usb_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&pinctrl {
+ pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange
+ &pmx_led_green >;
+ pinctrl-names = "default";
+
+ pmx_usb_power_enable: pmx-usb-power-enable {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_green: pmx-led-green {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+
+ pmx_led_orange: pmx-led-orange {
+ marvell,pins = "mpp49";
+ marvell,function = "gpio";
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
+
+&nand {
+ chip-delay = <40>;
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x400000>;
+ };
+
+ partition at 500000 {
+ label = "pogoplug";
+ reg = <0x0500000 0x2000000>;
+ };
+
+ partition at 2500000 {
+ label = "root";
+ reg = <0x02500000 0x5b00000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 8e01582b5565..94a3b1aedb76 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_POGO_E02=y
CONFIG_IDENT_STRING="\nPogo E02"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="PogoE02> "
@@ -18,10 +19,10 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 12/12] ARM: kirkwood: Add device-tree for sheevaplug
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (10 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 11/12] ARM: kirkwood: Add device-tree for pogo_e02 Chris Packham
@ 2018-05-08 10:34 ` Chris Packham
2018-05-16 12:03 ` [U-Boot] [PATCH 00/12] kirkwood: device tree support Stefan Roese
12 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-08 10:34 UTC (permalink / raw)
To: u-boot
Import the dts files from Linux 4.17 and enable device tree control in
u-boot.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
arch/arm/dts/kirkwood-sheevaplug-common.dtsi | 104 +++++++++++++++++++
arch/arm/dts/kirkwood-sheevaplug.dts | 42 ++++++++
configs/sheevaplug_defconfig | 3 +-
3 files changed, 148 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi
create mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts
diff --git a/arch/arm/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/dts/kirkwood-sheevaplug-common.dtsi
new file mode 100644
index 000000000000..0a698d3b7393
--- /dev/null
+++ b/arch/arm/dts/kirkwood-sheevaplug-common.dtsi
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * kirkwood-sheevaplug-common.dtsi - Common parts for Sheevaplugs
+ *
+ * Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
+ */
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ };
+
+ ocp at f1000000 {
+ pinctrl: pin-controller at 10000 {
+
+ pmx_usb_power_enable: pmx-usb-power-enable {
+ marvell,pins = "mpp29";
+ marvell,function = "gpio";
+ };
+ pmx_led_red: pmx-led-red {
+ marvell,pins = "mpp46";
+ marvell,function = "gpio";
+ };
+ pmx_led_blue: pmx-led-blue {
+ marvell,pins = "mpp49";
+ marvell,function = "gpio";
+ };
+ pmx_sdio_cd: pmx-sdio-cd {
+ marvell,pins = "mpp44";
+ marvell,function = "gpio";
+ };
+ pmx_sdio_wp: pmx-sdio-wp {
+ marvell,pins = "mpp47";
+ marvell,function = "gpio";
+ };
+ };
+ serial at 12000 {
+ status = "okay";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-0 = <&pmx_usb_power_enable>;
+ pinctrl-names = "default";
+
+ usb_power: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 29 0>;
+ };
+ };
+};
+
+&nand {
+ status = "okay";
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x100000>;
+ };
+
+ partition at 100000 {
+ label = "uImage";
+ reg = <0x0100000 0x400000>;
+ };
+
+ partition at 500000 {
+ label = "root";
+ reg = <0x0500000 0x1fb00000>;
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
diff --git a/arch/arm/dts/kirkwood-sheevaplug.dts b/arch/arm/dts/kirkwood-sheevaplug.dts
new file mode 100644
index 000000000000..c73cc904e5c4
--- /dev/null
+++ b/arch/arm/dts/kirkwood-sheevaplug.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * kirkwood-sheevaplug.dts - Device tree file for Sheevaplug
+ *
+ * Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "kirkwood-sheevaplug-common.dtsi"
+
+/ {
+ model = "Globalscale Technologies SheevaPlug";
+ compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ ocp at f1000000 {
+ mvsdio at 90000 {
+ pinctrl-0 = <&pmx_sdio>;
+ pinctrl-names = "default";
+ status = "okay";
+ /* No CD or WP GPIOs */
+ broken-cd;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
+ pinctrl-names = "default";
+
+ health {
+ label = "sheevaplug:blue:health";
+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ };
+
+ misc {
+ label = "sheevaplug:red:misc";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index d921666ae846..1e4068bf9c36 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_SHEEVAPLUG=y
CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MVSATA_IDE=y
CONFIG_SYS_NS16550=y
@@ -32,4 +34,3 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LZMA=y
-CONFIG_OF_LIBFDT=y
--
2.17.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s
2018-05-08 10:34 ` [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s Chris Packham
@ 2018-05-09 18:27 ` bodhi bodhi
2018-05-10 0:51 ` Chris Packham
0 siblings, 1 reply; 18+ messages in thread
From: bodhi bodhi @ 2018-05-09 18:27 UTC (permalink / raw)
To: u-boot
Hi Chris,
What we have in Linux mainline is Zyxel NSA310 (Marvell 88f6281). The Zyxel
NSA310S (Marvell 88f6702) is actually a different box, which has not been
mainlined yet.
By the way, there are 3 variations of the Zyxel NSA310 box. This box has
some combination of: red USB Led, lm85 sensor, adt7476 sensor that make
them slighly different. The mainlined NSA310 DTS is for the one with adt7476
sensor.
Regards
bodhi
On Tue, May 8, 2018 at 3:34 AM, Chris Packham <judge.packham@gmail.com>
wrote:
> Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
>
> arch/arm/dts/kirkwood-nsa310.dts | 139 ++++++++++++++++++++
> arch/arm/dts/kirkwood-nsa3x0-common.dtsi | 158 +++++++++++++++++++++++
> configs/nsa310s_defconfig | 3 +-
> 3 files changed, 299 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm/dts/kirkwood-nsa310.dts
> create mode 100644 arch/arm/dts/kirkwood-nsa3x0-common.dtsi
>
> diff --git a/arch/arm/dts/kirkwood-nsa310.dts b/arch/arm/dts/kirkwood-
> nsa310.dts
> new file mode 100644
> index 000000000000..9b861c2e76c5
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-nsa310.dts
> @@ -0,0 +1,139 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/dts-v1/;
> +
> +#include "kirkwood-nsa3x0-common.dtsi"
> +
> +/ {
> + compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281",
> "marvell,kirkwood";
> +
> + memory {
> + device_type = "memory";
> + reg = <0x00000000 0x10000000>;
> + };
> +
> + chosen {
> + bootargs = "console=ttyS0,115200";
> + stdout-path = &uart0;
> + };
> +
> + ocp at f1000000 {
> + pinctrl: pin-controller at 10000 {
> + pinctrl-0 = <&pmx_unknown>;
> + pinctrl-names = "default";
> +
> + pmx_led_esata_green: pmx-led-esata-green {
> + marvell,pins = "mpp12";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_esata_red: pmx-led-esata-red {
> + marvell,pins = "mpp13";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_usb_green: pmx-led-usb-green {
> + marvell,pins = "mpp15";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_usb_red: pmx-led-usb-red {
> + marvell,pins = "mpp16";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_sys_green: pmx-led-sys-green {
> + marvell,pins = "mpp28";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_sys_red: pmx-led-sys-red {
> + marvell,pins = "mpp29";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_hdd_green: pmx-led-hdd-green {
> + marvell,pins = "mpp41";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_hdd_red: pmx-led-hdd-red {
> + marvell,pins = "mpp42";
> + marvell,function = "gpio";
> + };
> +
> + pmx_unknown: pmx-unknown {
> + marvell,pins = "mpp44";
> + marvell,function = "gpio";
> + };
> +
> + };
> +
> + i2c at 11000 {
> + status = "okay";
> +
> + adt7476: adt7476a at 2e {
> + compatible = "adi,adt7476";
> + reg = <0x2e>;
> + };
> + };
> + };
> +
> + gpio-leds {
> + compatible = "gpio-leds";
> + pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
> + &pmx_led_usb_green &pmx_led_usb_red
> + &pmx_led_sys_green &pmx_led_sys_red
> + &pmx_led_copy_green &pmx_led_copy_red
> + &pmx_led_hdd_green &pmx_led_hdd_red>;
> + pinctrl-names = "default";
> +
> + green-sys {
> + label = "nsa310:green:sys";
> + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
> + };
> + red-sys {
> + label = "nsa310:red:sys";
> + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
> + };
> + green-hdd {
> + label = "nsa310:green:hdd";
> + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
> + };
> + red-hdd {
> + label = "nsa310:red:hdd";
> + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
> + };
> + green-esata {
> + label = "nsa310:green:esata";
> + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
> + };
> + red-esata {
> + label = "nsa310:red:esata";
> + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
> + };
> + green-usb {
> + label = "nsa310:green:usb";
> + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
> + };
> + red-usb {
> + label = "nsa310:red:usb";
> + gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
> + };
> + green-copy {
> + label = "nsa310:green:copy";
> + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
> + };
> + red-copy {
> + label = "nsa310:red:copy";
> + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +};
> +
> +&pciec {
> + status = "okay";
> +};
> +
> +&pcie0 {
> + status = "okay";
> +};
> diff --git a/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
> b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
> new file mode 100644
> index 000000000000..2c4037b07282
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
> @@ -0,0 +1,158 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include "kirkwood.dtsi"
> +#include "kirkwood-6281.dtsi"
> +
> +/ {
> + model = "ZyXEL NSA310";
> +
> + ocp at f1000000 {
> + pinctrl: pin-controller at 10000 {
> +
> + pmx_usb_power: pmx-usb-power {
> + marvell,pins = "mpp21";
> + marvell,function = "gpio";
> + };
> +
> + pmx_pwr_off: pmx-pwr-off {
> + marvell,pins = "mpp48";
> + marvell,function = "gpio";
> + };
> +
> + pmx_btn_reset: pmx-btn-reset {
> + marvell,pins = "mpp36";
> + marvell,function = "gpio";
> + };
> +
> + pmx_btn_copy: pmx-btn-copy {
> + marvell,pins = "mpp37";
> + marvell,function = "gpio";
> + };
> +
> + pmx_btn_power: pmx-btn-power {
> + marvell,pins = "mpp46";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_copy_green: pmx-led-copy-green {
> + marvell,pins = "mpp39";
> + marvell,function = "gpio";
> + };
> +
> + pmx_led_copy_red: pmx-led-copy-red {
> + marvell,pins = "mpp40";
> + marvell,function = "gpio";
> + };
> + };
> +
> + serial at 12000 {
> + status = "ok";
> + };
> +
> + sata at 80000 {
> + status = "okay";
> + nr-ports = <2>;
> + };
> + };
> +
> + gpio_poweroff {
> + compatible = "gpio-poweroff";
> + pinctrl-0 = <&pmx_pwr_off>;
> + pinctrl-names = "default";
> + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
> + pinctrl-names = "default";
> +
> + power {
> + label = "Power Button";
> + linux,code = <KEY_POWER>;
> + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
> + };
> + copy {
> + label = "Copy Button";
> + linux,code = <KEY_COPY>;
> + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
> + };
> + reset {
> + label = "Reset Button";
> + linux,code = <KEY_RESTART>;
> + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> + };
> + };
> +
> +
> + regulators {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-0 = <&pmx_usb_power>;
> + pinctrl-names = "default";
> +
> + usb0_power: regulator at 1 {
> + compatible = "regulator-fixed";
> + reg = <1>;
> + regulator-name = "USB Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +};
> +
> +&nand {
> + status = "okay";
> + chip-delay = <35>;
> +
> + partition at 0 {
> + label = "uboot";
> + reg = <0x0000000 0x0100000>;
> + read-only;
> + };
> + partition at 100000 {
> + label = "uboot_env";
> + reg = <0x0100000 0x0080000>;
> + };
> + partition at 180000 {
> + label = "key_store";
> + reg = <0x0180000 0x0080000>;
> + };
> + partition at 200000 {
> + label = "info";
> + reg = <0x0200000 0x0080000>;
> + };
> + partition at 280000 {
> + label = "etc";
> + reg = <0x0280000 0x0a00000>;
> + };
> + partition at c80000 {
> + label = "kernel_1";
> + reg = <0x0c80000 0x0a00000>;
> + };
> + partition at 1680000 {
> + label = "rootfs1";
> + reg = <0x1680000 0x2fc0000>;
> + };
> + partition at 4640000 {
> + label = "kernel_2";
> + reg = <0x4640000 0x0a00000>;
> + };
> + partition at 5040000 {
> + label = "rootfs2";
> + reg = <0x5040000 0x2fc0000>;
> + };
> +};
> +
> +&pciec {
> + status = "okay";
> +};
> +
> +&pcie0 {
> + status = "okay";
> +};
> diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
> index 2529687414fa..d3ea933d378b 100644
> --- a/configs/nsa310s_defconfig
> +++ b/configs/nsa310s_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_KIRKWOOD=y
> CONFIG_SYS_TEXT_BASE=0x600000
> CONFIG_TARGET_NSA310S=y
> +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310"
> CONFIG_BOOTDELAY=3
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> @@ -21,6 +22,7 @@ CONFIG_CMD_JFFS2=y
> CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@
> 0x0(uboot),0x20000 at 0xe0000(uboot_env),0x100000 at 0x100000(
> second_stage_uboot),- at 0x200000(root)"
> CONFIG_CMD_UBI=y
> CONFIG_ISO_PARTITION=y
> +CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_MVSATA_IDE=y
> # CONFIG_MMC is not set
> @@ -29,4 +31,3 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> -CONFIG_OF_LIBFDT=y
> --
> 2.17.0
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s
2018-05-09 18:27 ` bodhi bodhi
@ 2018-05-10 0:51 ` Chris Packham
2018-05-15 12:09 ` Stefan Roese
0 siblings, 1 reply; 18+ messages in thread
From: Chris Packham @ 2018-05-10 0:51 UTC (permalink / raw)
To: u-boot
On Thu, May 10, 2018 at 6:27 AM bodhi bodhi <mibodhi@gmail.com> wrote:
> Hi Chris,
> What we have in Linux mainline is Zyxel NSA310 (Marvell 88f6281). The
Zyxel NSA310S (Marvell 88f6702) is actually a different box, which has not
been mainlined yet.
> By the way, there are 3 variations of the Zyxel NSA310 box. This box has
some combination of: red USB Led, lm85 sensor, adt7476 sensor that make
them slighly different. The mainlined NSA310 DTS is for the one with
adt7476 sensor.
Ah OK. I did see 2 boards in the kernel, this was one of the "educated
guesses" which turns out not to to be a good guess. For now I'll just drop
this conversion from the series.
> Regards
> bodhi
> On Tue, May 8, 2018 at 3:34 AM, Chris Packham <judge.packham@gmail.com>
wrote:
>> Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.
>> Signed-off-by: Chris Packham <judge.packham@gmail.com>
>> ---
>> arch/arm/dts/kirkwood-nsa310.dts | 139 ++++++++++++++++++++
>> arch/arm/dts/kirkwood-nsa3x0-common.dtsi | 158 +++++++++++++++++++++++
>> configs/nsa310s_defconfig | 3 +-
>> 3 files changed, 299 insertions(+), 1 deletion(-)
>> create mode 100644 arch/arm/dts/kirkwood-nsa310.dts
>> create mode 100644 arch/arm/dts/kirkwood-nsa3x0-common.dtsi
>> diff --git a/arch/arm/dts/kirkwood-nsa310.dts
b/arch/arm/dts/kirkwood-nsa310.dts
>> new file mode 100644
>> index 000000000000..9b861c2e76c5
>> --- /dev/null
>> +++ b/arch/arm/dts/kirkwood-nsa310.dts
>> @@ -0,0 +1,139 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/dts-v1/;
>> +
>> +#include "kirkwood-nsa3x0-common.dtsi"
>> +
>> +/ {
>> + compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281",
"marvell,kirkwood";
>> +
>> + memory {
>> + device_type = "memory";
>> + reg = <0x00000000 0x10000000>;
>> + };
>> +
>> + chosen {
>> + bootargs = "console=ttyS0,115200";
>> + stdout-path = &uart0;
>> + };
>> +
>> + ocp at f1000000 {
>> + pinctrl: pin-controller at 10000 {
>> + pinctrl-0 = <&pmx_unknown>;
>> + pinctrl-names = "default";
>> +
>> + pmx_led_esata_green: pmx-led-esata-green {
>> + marvell,pins = "mpp12";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_esata_red: pmx-led-esata-red {
>> + marvell,pins = "mpp13";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_usb_green: pmx-led-usb-green {
>> + marvell,pins = "mpp15";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_usb_red: pmx-led-usb-red {
>> + marvell,pins = "mpp16";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_sys_green: pmx-led-sys-green {
>> + marvell,pins = "mpp28";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_sys_red: pmx-led-sys-red {
>> + marvell,pins = "mpp29";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_hdd_green: pmx-led-hdd-green {
>> + marvell,pins = "mpp41";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_hdd_red: pmx-led-hdd-red {
>> + marvell,pins = "mpp42";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_unknown: pmx-unknown {
>> + marvell,pins = "mpp44";
>> + marvell,function = "gpio";
>> + };
>> +
>> + };
>> +
>> + i2c at 11000 {
>> + status = "okay";
>> +
>> + adt7476: adt7476a at 2e {
>> + compatible = "adi,adt7476";
>> + reg = <0x2e>;
>> + };
>> + };
>> + };
>> +
>> + gpio-leds {
>> + compatible = "gpio-leds";
>> + pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
>> + &pmx_led_usb_green &pmx_led_usb_red
>> + &pmx_led_sys_green &pmx_led_sys_red
>> + &pmx_led_copy_green &pmx_led_copy_red
>> + &pmx_led_hdd_green &pmx_led_hdd_red>;
>> + pinctrl-names = "default";
>> +
>> + green-sys {
>> + label = "nsa310:green:sys";
>> + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
>> + };
>> + red-sys {
>> + label = "nsa310:red:sys";
>> + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
>> + };
>> + green-hdd {
>> + label = "nsa310:green:hdd";
>> + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
>> + };
>> + red-hdd {
>> + label = "nsa310:red:hdd";
>> + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
>> + };
>> + green-esata {
>> + label = "nsa310:green:esata";
>> + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
>> + };
>> + red-esata {
>> + label = "nsa310:red:esata";
>> + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
>> + };
>> + green-usb {
>> + label = "nsa310:green:usb";
>> + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
>> + };
>> + red-usb {
>> + label = "nsa310:red:usb";
>> + gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
>> + };
>> + green-copy {
>> + label = "nsa310:green:copy";
>> + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
>> + };
>> + red-copy {
>> + label = "nsa310:red:copy";
>> + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
>> + };
>> + };
>> +};
>> +
>> +&pciec {
>> + status = "okay";
>> +};
>> +
>> +&pcie0 {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
>> new file mode 100644
>> index 000000000000..2c4037b07282
>> --- /dev/null
>> +++ b/arch/arm/dts/kirkwood-nsa3x0-common.dtsi
>> @@ -0,0 +1,158 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +#include "kirkwood.dtsi"
>> +#include "kirkwood-6281.dtsi"
>> +
>> +/ {
>> + model = "ZyXEL NSA310";
>> +
>> + ocp at f1000000 {
>> + pinctrl: pin-controller at 10000 {
>> +
>> + pmx_usb_power: pmx-usb-power {
>> + marvell,pins = "mpp21";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_pwr_off: pmx-pwr-off {
>> + marvell,pins = "mpp48";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_btn_reset: pmx-btn-reset {
>> + marvell,pins = "mpp36";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_btn_copy: pmx-btn-copy {
>> + marvell,pins = "mpp37";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_btn_power: pmx-btn-power {
>> + marvell,pins = "mpp46";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_copy_green: pmx-led-copy-green {
>> + marvell,pins = "mpp39";
>> + marvell,function = "gpio";
>> + };
>> +
>> + pmx_led_copy_red: pmx-led-copy-red {
>> + marvell,pins = "mpp40";
>> + marvell,function = "gpio";
>> + };
>> + };
>> +
>> + serial at 12000 {
>> + status = "ok";
>> + };
>> +
>> + sata at 80000 {
>> + status = "okay";
>> + nr-ports = <2>;
>> + };
>> + };
>> +
>> + gpio_poweroff {
>> + compatible = "gpio-poweroff";
>> + pinctrl-0 = <&pmx_pwr_off>;
>> + pinctrl-names = "default";
>> + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
>> + };
>> +
>> + gpio_keys {
>> + compatible = "gpio-keys";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy
&pmx_btn_power>;
>> + pinctrl-names = "default";
>> +
>> + power {
>> + label = "Power Button";
>> + linux,code = <KEY_POWER>;
>> + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
>> + };
>> + copy {
>> + label = "Copy Button";
>> + linux,code = <KEY_COPY>;
>> + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
>> + };
>> + reset {
>> + label = "Reset Button";
>> + linux,code = <KEY_RESTART>;
>> + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
>> + };
>> + };
>> +
>> +
>> + regulators {
>> + compatible = "simple-bus";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + pinctrl-0 = <&pmx_usb_power>;
>> + pinctrl-names = "default";
>> +
>> + usb0_power: regulator at 1 {
>> + compatible = "regulator-fixed";
>> + reg = <1>;
>> + regulator-name = "USB Power";
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + regulator-always-on;
>> + regulator-boot-on;
>> + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
>> + };
>> + };
>> +};
>> +
>> +&nand {
>> + status = "okay";
>> + chip-delay = <35>;
>> +
>> + partition at 0 {
>> + label = "uboot";
>> + reg = <0x0000000 0x0100000>;
>> + read-only;
>> + };
>> + partition at 100000 {
>> + label = "uboot_env";
>> + reg = <0x0100000 0x0080000>;
>> + };
>> + partition at 180000 {
>> + label = "key_store";
>> + reg = <0x0180000 0x0080000>;
>> + };
>> + partition at 200000 {
>> + label = "info";
>> + reg = <0x0200000 0x0080000>;
>> + };
>> + partition at 280000 {
>> + label = "etc";
>> + reg = <0x0280000 0x0a00000>;
>> + };
>> + partition at c80000 {
>> + label = "kernel_1";
>> + reg = <0x0c80000 0x0a00000>;
>> + };
>> + partition at 1680000 {
>> + label = "rootfs1";
>> + reg = <0x1680000 0x2fc0000>;
>> + };
>> + partition at 4640000 {
>> + label = "kernel_2";
>> + reg = <0x4640000 0x0a00000>;
>> + };
>> + partition at 5040000 {
>> + label = "rootfs2";
>> + reg = <0x5040000 0x2fc0000>;
>> + };
>> +};
>> +
>> +&pciec {
>> + status = "okay";
>> +};
>> +
>> +&pcie0 {
>> + status = "okay";
>> +};
>> diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
>> index 2529687414fa..d3ea933d378b 100644
>> --- a/configs/nsa310s_defconfig
>> +++ b/configs/nsa310s_defconfig
>> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>> CONFIG_KIRKWOOD=y
>> CONFIG_SYS_TEXT_BASE=0x600000
>> CONFIG_TARGET_NSA310S=y
>> +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310"
>> CONFIG_BOOTDELAY=3
>> # CONFIG_DISPLAY_BOARDINFO is not set
>> CONFIG_HUSH_PARSER=y
>> @@ -21,6 +22,7 @@ CONFIG_CMD_JFFS2=y
>> CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0
(uboot),0x20000 at 0xe0000(uboot_env),0x100000 at 0x100000
(second_stage_uboot),- at 0x200000(root)"
>> CONFIG_CMD_UBI=y
>> CONFIG_ISO_PARTITION=y
>> +CONFIG_OF_CONTROL=y
>> CONFIG_ENV_IS_IN_NAND=y
>> CONFIG_MVSATA_IDE=y
>> # CONFIG_MMC is not set
>> @@ -29,4 +31,3 @@ CONFIG_USB=y
>> CONFIG_USB_EHCI_HCD=y
>> CONFIG_USB_STORAGE=y
>> CONFIG_LZMA=y
>> -CONFIG_OF_LIBFDT=y
>> --
>> 2.17.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s
2018-05-10 0:51 ` Chris Packham
@ 2018-05-15 12:09 ` Stefan Roese
[not found] ` <CAFOYHZBbO1ojzif9tbpbk_xj7ySsU2P11ftbKKz3xLGrzXh_FA@mail.gmail.com>
0 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2018-05-15 12:09 UTC (permalink / raw)
To: u-boot
Hi Chris,
On 10.05.2018 02:51, Chris Packham wrote:
> On Thu, May 10, 2018 at 6:27 AM bodhi bodhi <mibodhi@gmail.com> wrote:
>
>> Hi Chris,
>
>> What we have in Linux mainline is Zyxel NSA310 (Marvell 88f6281). The
> Zyxel NSA310S (Marvell 88f6702) is actually a different box, which has not
> been mainlined yet.
>
>> By the way, there are 3 variations of the Zyxel NSA310 box. This box has
> some combination of: red USB Led, lm85 sensor, adt7476 sensor that make
> them slighly different. The mainlined NSA310 DTS is for the one with
> adt7476 sensor.
>
>
> Ah OK. I did see 2 boards in the kernel, this was one of the "educated
> guesses" which turns out not to to be a good guess. For now I'll just drop
> this conversion from the series.
Yes, that makes sense. Please do so. We can always get the correct
version back into mainline, once we have Kirkwood "enabled" in a
modern way.
What is your plan with this Kirkwood revival? Do you plan to send
updates to enable DM for those boards and perhaps some drivers as
well? How should I proceed with this DT patch-set?
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s
[not found] ` <c61d0b00-de94-7684-263e-3a46ae6d36d7@denx.de>
@ 2018-05-16 8:23 ` Chris Packham
0 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2018-05-16 8:23 UTC (permalink / raw)
To: u-boot
(adding back list and cc, my bad replied from a mobile device)
On Wed, May 16, 2018 at 8:10 PM Stefan Roese <sr@denx.de> wrote:
> Hi Chris,
> On 16.05.2018 09:58, Chris Packham wrote:
> > Hi Stefan,
> >
> > On Wed, 16 May 2018, 12:09 AM Stefan Roese, <sr@denx.de
> > <mailto:sr@denx.de>> wrote:
> >
> > Hi Chris,
> >
> > On 10.05.2018 02:51, Chris Packham wrote:
> > > On Thu, May 10, 2018 at 6:27 AM bodhi bodhi <mibodhi@gmail.com
> > <mailto:mibodhi@gmail.com>> wrote:
> > >
> > >> Hi Chris,
> > >
> > >> What we have in Linux mainline is Zyxel NSA310 (Marvell
> > 88f6281). The
> > > Zyxel NSA310S (Marvell 88f6702) is actually a different box,
> > which has not
> > > been mainlined yet.
> > >
> > >> By the way, there are 3 variations of the Zyxel NSA310 box. This
> > box has
> > > some combination of: red USB Led, lm85 sensor, adt7476 sensor
> > that make
> > > them slighly different. The mainlined NSA310 DTS is for the one
with
> > > adt7476 sensor.
> > >
> > >
> > > Ah OK. I did see 2 boards in the kernel, this was one of the
> > "educated
> > > guesses" which turns out not to to be a good guess. For now I'll
> > just drop
> > > this conversion from the series.
> >
> > Yes, that makes sense. Please do so. We can always get the correct
> > version back into mainline, once we have Kirkwood "enabled" in a
> > modern way.
> >
> > What is your plan with this Kirkwood revival? Do you plan to send
> > updates to enable DM for those boards and perhaps some drivers as
> > well? How should I proceed with this DT patch-set?
> >
> >
> > I was about to ask you.
> >
> > I was thinking about sending a v2 omitting nas310s, but if that's the
> > only change you could just omit it at your end.
> So for a start its good that I apply these patches, omitting the nas310s
> one?
Yes thanks. Aside from the commend from Bodhi I haven't seen any other
feedback. Not sure if you wanted to wait a bit longer.
> > Then I've got another set lined up for the boards using spi flash which
> > lays the groundwork for Jagan's spi changes. I may as well switch over
> > the i2c configs since the driver already supports DM. I'll probably send
> > those later this week.
> >
> > If i get really enthusiastic i might give converting the mvgbe driver to
> > DM a try but the hardware I have for testing is complicated.
> Sounds like a plan. Thanks for working on this.
No problem I'm keen to see Kirkwood hang around.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 00/12] kirkwood: device tree support
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
` (11 preceding siblings ...)
2018-05-08 10:34 ` [U-Boot] [PATCH 12/12] ARM: kirkwood: Add device-tree for sheevaplug Chris Packham
@ 2018-05-16 12:03 ` Stefan Roese
12 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2018-05-16 12:03 UTC (permalink / raw)
To: u-boot
On 08.05.2018 12:34, Chris Packham wrote:
> This is an initial series to bring in the device tree files for kirkwood
> boards from Linux. All the patches are fairly mechanical matching up the
> device trees based on the defconfig name (and some educated guesses in a
> few places).
>
> Chris Packham (12):
> ARM: add devicetree files for kirkwood SoC
> ARM: kirkwood: Add device-tree for dns325
> ARM: kirkwood: Add device-tree for dockstar
> ARM: kirkwood: Add device-tree for goflexhome
> ARM: kirkwood: Add device-tree for guruplug
> ARM: kirkwood: Add device-tree for ib62x0
> ARM: kirkwood: Add device-tree for iconnect
> ARM: kirkwood: Add device-tree for nas220
> ARM: kirkwood: Add device-tree for nsa310s
> ARM: kirkwood: Add device-tree for openrd
> ARM: kirkwood: Add device-tree for pogo_e02
> ARM: kirkwood: Add device-tree for sheevaplug
>
> arch/arm/dts/kirkwood-6192.dtsi | 88 ++++
> arch/arm/dts/kirkwood-6281.dtsi | 90 ++++
> arch/arm/dts/kirkwood-98dx4122.dtsi | 53 +++
> arch/arm/dts/kirkwood-blackarmor-nas220.dts | 172 ++++++++
> arch/arm/dts/kirkwood-dns325.dts | 63 +++
> arch/arm/dts/kirkwood-dnskw.dtsi | 235 +++++++++++
> arch/arm/dts/kirkwood-dockstar.dts | 110 +++++
> arch/arm/dts/kirkwood-goflexnet.dts | 190 +++++++++
> .../arm/dts/kirkwood-guruplug-server-plus.dts | 133 ++++++
> arch/arm/dts/kirkwood-ib62x0.dts | 146 +++++++
> arch/arm/dts/kirkwood-iconnect.dts | 195 +++++++++
> arch/arm/dts/kirkwood-nsa310.dts | 139 +++++++
> arch/arm/dts/kirkwood-nsa3x0-common.dtsi | 158 +++++++
> arch/arm/dts/kirkwood-openrd-base.dts | 39 ++
> arch/arm/dts/kirkwood-openrd-client.dts | 73 ++++
> arch/arm/dts/kirkwood-openrd-ultimate.dts | 55 +++
> arch/arm/dts/kirkwood-openrd.dtsi | 122 ++++++
> arch/arm/dts/kirkwood-pogo_e02.dts | 132 ++++++
> arch/arm/dts/kirkwood-sheevaplug-common.dtsi | 104 +++++
> arch/arm/dts/kirkwood-sheevaplug.dts | 42 ++
> arch/arm/dts/kirkwood.dtsi | 393 ++++++++++++++++++
> configs/dns325_defconfig | 3 +-
> configs/dockstar_defconfig | 3 +-
> configs/goflexhome_defconfig | 3 +-
> configs/guruplug_defconfig | 3 +-
> configs/ib62x0_defconfig | 3 +-
> configs/iconnect_defconfig | 3 +-
> configs/nas220_defconfig | 3 +-
> configs/nsa310s_defconfig | 3 +-
> configs/openrd_base_defconfig | 3 +-
> configs/openrd_client_defconfig | 3 +-
> configs/openrd_ultimate_defconfig | 3 +-
> configs/pogo_e02_defconfig | 3 +-
> configs/sheevaplug_defconfig | 3 +-
> 34 files changed, 2758 insertions(+), 13 deletions(-)
> create mode 100644 arch/arm/dts/kirkwood-6192.dtsi
> create mode 100644 arch/arm/dts/kirkwood-6281.dtsi
> create mode 100644 arch/arm/dts/kirkwood-98dx4122.dtsi
> create mode 100644 arch/arm/dts/kirkwood-blackarmor-nas220.dts
> create mode 100644 arch/arm/dts/kirkwood-dns325.dts
> create mode 100644 arch/arm/dts/kirkwood-dnskw.dtsi
> create mode 100644 arch/arm/dts/kirkwood-dockstar.dts
> create mode 100644 arch/arm/dts/kirkwood-goflexnet.dts
> create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus.dts
> create mode 100644 arch/arm/dts/kirkwood-ib62x0.dts
> create mode 100644 arch/arm/dts/kirkwood-iconnect.dts
> create mode 100644 arch/arm/dts/kirkwood-nsa310.dts
> create mode 100644 arch/arm/dts/kirkwood-nsa3x0-common.dtsi
> create mode 100644 arch/arm/dts/kirkwood-openrd-base.dts
> create mode 100644 arch/arm/dts/kirkwood-openrd-client.dts
> create mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts
> create mode 100644 arch/arm/dts/kirkwood-openrd.dtsi
> create mode 100644 arch/arm/dts/kirkwood-pogo_e02.dts
> create mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi
> create mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts
> create mode 100644 arch/arm/dts/kirkwood.dtsi
>
All patches with the exception of the nsa310s one applied to
u-boot-marvell/master
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2018-05-16 12:03 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-08 10:34 [U-Boot] [PATCH 00/12] kirkwood: device tree support Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 01/12] ARM: add devicetree files for kirkwood SoC Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 02/12] ARM: kirkwood: Add device-tree for dns325 Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 03/12] ARM: kirkwood: Add device-tree for dockstar Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 04/12] ARM: kirkwood: Add device-tree for goflexhome Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 05/12] ARM: kirkwood: Add device-tree for guruplug Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 06/12] ARM: kirkwood: Add device-tree for ib62x0 Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 07/12] ARM: kirkwood: Add device-tree for iconnect Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 08/12] ARM: kirkwood: Add device-tree for nas220 Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 09/12] ARM: kirkwood: Add device-tree for nsa310s Chris Packham
2018-05-09 18:27 ` bodhi bodhi
2018-05-10 0:51 ` Chris Packham
2018-05-15 12:09 ` Stefan Roese
[not found] ` <CAFOYHZBbO1ojzif9tbpbk_xj7ySsU2P11ftbKKz3xLGrzXh_FA@mail.gmail.com>
[not found] ` <c61d0b00-de94-7684-263e-3a46ae6d36d7@denx.de>
2018-05-16 8:23 ` Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 10/12] ARM: kirkwood: Add device-tree for openrd Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 11/12] ARM: kirkwood: Add device-tree for pogo_e02 Chris Packham
2018-05-08 10:34 ` [U-Boot] [PATCH 12/12] ARM: kirkwood: Add device-tree for sheevaplug Chris Packham
2018-05-16 12:03 ` [U-Boot] [PATCH 00/12] kirkwood: device tree support Stefan Roese
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.