Skip to contentSkip to conversation

ARM: kirkwood: dts conversion round 2

PATCH New Chris Packham 3 participants 9 messages May 17, 2018 – May 29, 2018

Subsystems (3)
Device tree bindings Arm (32-bit) LED
lore
Share & tools
lore

Chris Packham

author
#0 lore raw

cover ARM: kirkwood: dts conversion round 2

This is the second round of updating kirkwood boards to OF_CONTROL. Most of these boards use spi flash so I've added the u-boot specific "spi-flash" compatible string where appropriate.

Chris Packham (6):
ARM: kirkwood: Add device-tree for d2net_v2 & net2big_v2
ARM: kirkwood: Add device-tree for dreamplug
ARM: kirkwood: Add device-tree for ds109
ARM: kirkwood: Add device-tree for lschlv2 & lsxhl
ARM: kirkwood: Add device-tree for netspace & inetspace
ARM: kirkwood: Add device-tree for keymile

 arch/arm/dts/kirkwood-d2net.dts         |  45 ++
 arch/arm/dts/kirkwood-dreamplug.dts     | 127 ++++
 arch/arm/dts/kirkwood-ds109.dts         |  40 ++
 arch/arm/dts/kirkwood-is2.dts           |  40 ++
 arch/arm/dts/kirkwood-km_common.dtsi    |  47 ++
 arch/arm/dts/kirkwood-km_kirkwood.dts   |  31 +
 arch/arm/dts/kirkwood-lschlv2.dts       |  20 +
 arch/arm/dts/kirkwood-lsxhl.dts         |  20 +
 arch/arm/dts/kirkwood-lsxl.dtsi         | 237 +++++++
 arch/arm/dts/kirkwood-net2big.dts       |  63 ++
 arch/arm/dts/kirkwood-netxbig.dtsi      | 232 +++++++
 arch/arm/dts/kirkwood-ns2-common.dtsi   |  97 +++
 arch/arm/dts/kirkwood-ns2.dts           |  40 ++
 arch/arm/dts/kirkwood-ns2lite.dts       |  35 +
 arch/arm/dts/kirkwood-ns2max.dts        |  59 ++
 arch/arm/dts/kirkwood-ns2mini.dts       |  60 ++
 arch/arm/dts/kirkwood-synology.dtsi     | 855 ++++++++++++++++++++++++
 configs/d2net_v2_defconfig              |   3 +-
 configs/dreamplug_defconfig             |   3 +-
 configs/ds109_defconfig                 |   2 +
 configs/inetspace_v2_defconfig          |   3 +-
 configs/km_kirkwood_128m16_defconfig    |   3 +-
 configs/km_kirkwood_defconfig           |   3 +-
 configs/km_kirkwood_pci_defconfig       |   3 +-
 configs/kmcoge5un_defconfig             |   3 +-
 configs/kmnusa_defconfig                |   3 +-
 configs/kmsugp1_defconfig               |   3 +-
 configs/kmsuv31_defconfig               |   3 +-
 configs/lschlv2_defconfig               |   3 +-
 configs/lsxhl_defconfig                 |   3 +-
 configs/mgcoge3un_defconfig             |   3 +-
 configs/net2big_v2_defconfig            |   3 +-
 configs/netspace_lite_v2_defconfig      |   3 +-
 configs/netspace_max_v2_defconfig       |   3 +-
 configs/netspace_mini_v2_defconfig      |   3 +-
 configs/netspace_v2_defconfig           |   3 +-
 include/dt-bindings/leds/leds-netxbig.h |  18 +
 include/dt-bindings/leds/leds-ns2.h     |   9 +
 38 files changed, 2113 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net.dts
 create mode 100644 arch/arm/dts/kirkwood-dreamplug.dts
 create mode 100644 arch/arm/dts/kirkwood-ds109.dts
 create mode 100644 arch/arm/dts/kirkwood-is2.dts
 create mode 100644 arch/arm/dts/kirkwood-km_common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-km_kirkwood.dts
 create mode 100644 arch/arm/dts/kirkwood-lschlv2.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxhl.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxl.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/dts/kirkwood-netxbig.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2-common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2lite.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2max.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2mini.dts
 create mode 100644 arch/arm/dts/kirkwood-synology.dtsi
 create mode 100644 include/dt-bindings/leds/leds-netxbig.h
 create mode 100644 include/dt-bindings/leds/leds-ns2.h
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 1/6 ARM: kirkwood: Add device-tree for d2net_v2 & net2big_v2

Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-d2net.dts         |  45 +++++
 arch/arm/dts/kirkwood-net2big.dts       |  63 +++++++
 arch/arm/dts/kirkwood-netxbig.dtsi      | 232 ++++++++++++++++++++++++
 configs/d2net_v2_defconfig              |   3 +-
 configs/net2big_v2_defconfig            |   3 +-
 include/dt-bindings/leds/leds-netxbig.h |  18 ++
 6 files changed, 362 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net.dts
 create mode 100644 arch/arm/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/dts/kirkwood-netxbig.dtsi
 create mode 100644 include/dt-bindings/leds/leds-netxbig.h
arch/arm/dts/kirkwood-d2net.dts new file +45 -0
new file mode 100644
index 000000000000..bd3b266dd766
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree file for d2 Network v2
+ *
+ * Copyright (C) 2014 Simon Guinot <[email protected]>
+ *
+*/
+
+/dts-v1/;
+
+#include <dt-bindings/leds/leds-ns2.h>
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+	model = "LaCie d2 Network v2";
+	compatible = "lacie,d2net_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+
+	ns2-leds {
+		compatible = "lacie,ns2-leds";
+
+		blue-sata {
+			label = "d2net_v2:blue:sata";
+			slow-gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+			cmd-gpio = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+			modes-map = <NS_V2_LED_OFF  1 0
+				     NS_V2_LED_ON   0 1
+				     NS_V2_LED_ON   1 1
+				     NS_V2_LED_SATA 0 0>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		red-fail {
+			label = "d2net_v2:red:fail";
+			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
arch/arm/dts/kirkwood-net2big.dts new file +63 -0

63 lines not on this page · raw message

arch/arm/dts/kirkwood-netxbig.dtsi new file +232 -0

232 lines not on this page · raw message

configs/d2net_v2_defconfig +2 -1
index 72db1e74a0aa..d054c21780c3 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_IDENT_STRING=" D2 v2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
configs/net2big_v2_defconfig +2 -1
index d486e4cd7bd2..e7216556be92 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_IDENT_STRING=" 2Big v2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
include/dt-bindings/leds/leds-netxbig.h new file +18 -0
new file mode 100644
index 000000000000..92658b0310b2
@@ -0,0 +1,18 @@
+/*
+ * This header provides constants for netxbig LED bindings.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef _DT_BINDINGS_LEDS_NETXBIG_H
+#define _DT_BINDINGS_LEDS_NETXBIG_H
+
+#define NETXBIG_LED_OFF		0
+#define NETXBIG_LED_ON		1
+#define NETXBIG_LED_SATA	2
+#define NETXBIG_LED_TIMER1	3
+#define NETXBIG_LED_TIMER2	4
+
+#endif /* _DT_BINDINGS_LEDS_NETXBIG_H */
Signature · 1 line
2.17.0
author
#2 lore raw

PATCH 2/6 ARM: kirkwood: Add device-tree for dreamplug

In reply to Chris Packham

Import the dts file from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-dreamplug.dts | 127 ++++++++++++++++++++++++++++
 configs/dreamplug_defconfig         |   3 +-
 2 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/kirkwood-dreamplug.dts
arch/arm/dts/kirkwood-dreamplug.dts new file +127 -0
new file mode 100644
index 000000000000..a647a65c20a0
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	model = "Globalscale Technologies Dreamplug";
+	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "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_bluetooth: pmx-led-bluetooth {
+				marvell,pins = "mpp47";
+				marvell,function = "gpio";
+			};
+			pmx_led_wifi: pmx-led-wifi {
+				marvell,pins = "mpp48";
+				marvell,function = "gpio";
+			};
+			pmx_led_wifi_ap: pmx-led-wifi-ap {
+				marvell,pins = "mpp49";
+				marvell,function = "gpio";
+			};
+		};
+		serial at 12000 {
+			status = "ok";
+		};
+
+		spi at 10600 {
+			status = "okay";
+
+			m25p40 at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mxicy,mx25l1606e", "jedec,spi-nor", "spi-flash";
+				reg = <0>;
+				spi-max-frequency = <50000000>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+
+				partition at 100000 {
+					reg = <0x100000 0x10000>;
+					label = "u-boot env";
+				};
+
+				partition at 180000 {
+					reg = <0x180000 0x10000>;
+					label = "dtb";
+				};
+			};
+		};
+
+		sata at 80000 {
+			status = "okay";
+			nr-ports = <1>;
+		};
+
+		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_bluetooth &pmx_led_wifi
+			     &pmx_led_wifi_ap >;
+		pinctrl-names = "default";
+
+		bluetooth {
+			label = "dreamplug:blue:bluetooth";
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+		};
+		wifi {
+			label = "dreamplug:green:wifi";
+			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+		};
+		wifi-ap {
+			label = "dreamplug:green:wifi_ap";
+			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		reg = <1>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};
configs/dreamplug_defconfig +2 -1
index cbd2fb68ad92..8090c9a37793 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_DREAMPLUG=y
 CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y

@@ -19,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -32,4 +34,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.17.0
author
#3 lore raw

PATCH 3/6 ARM: kirkwood: Add device-tree for ds109

In reply to Chris Packham

Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-ds109.dts     |  40 ++
 arch/arm/dts/kirkwood-synology.dtsi | 855 ++++++++++++++++++++++++++++
 configs/ds109_defconfig             |   2 +
 3 files changed, 897 insertions(+)
 create mode 100644 arch/arm/dts/kirkwood-ds109.dts
 create mode 100644 arch/arm/dts/kirkwood-synology.dtsi
arch/arm/dts/kirkwood-ds109.dts new file +40 -0
new file mode 100644
index 000000000000..29982e7acb7f
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Andrew Lunn <[email protected]>
+ * Ben Peddell <[email protected]>
+ *
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-synology.dtsi"
+
+/ {
+	model = "Synology DS109, DS110, DS110jv20";
+	compatible = "synology,ds109", "synology,ds110jv20",
+		     "synology,ds110", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+		stdout-path = &uart0;
+	};
+
+	gpio-fan-150-32-35 {
+		status = "okay";
+	};
+
+	gpio-leds-hdd-21-1 {
+		status = "okay";
+	};
+};
+
+&rs5c372 {
+	status = "okay";
+};
arch/arm/dts/kirkwood-synology.dtsi new file +855 -0

855 lines not on this page · raw message

configs/ds109_defconfig +2 -0
index 43e92d7ef290..c9207433b374 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_DS109=y
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109"
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_IDE=y

@@ -14,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
Signature · 1 line
2.17.0
author
#4 lore raw

PATCH 4/6 ARM: kirkwood: Add device-tree for lschlv2 & lsxhl

In reply to Chris Packham

Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-lschlv2.dts |  20 +++
 arch/arm/dts/kirkwood-lsxhl.dts   |  20 +++
 arch/arm/dts/kirkwood-lsxl.dtsi   | 237 ++++++++++++++++++++++++++++++
 configs/lschlv2_defconfig         |   3 +-
 configs/lsxhl_defconfig           |   3 +-
 5 files changed, 281 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-lschlv2.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxhl.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxl.dtsi
arch/arm/dts/kirkwood-lschlv2.dts new file +20 -0
new file mode 100644
index 000000000000..1d737d903f5f
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood-lsxl.dtsi"
+
+/ {
+	model = "Buffalo Linkstation LS-CHLv2";
+	compatible = "buffalo,lschlv2", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x4000000>;
+	};
+
+	ocp at f1000000 {
+		serial at 12000 {
+			status = "okay";
+		};
+	};
+};
arch/arm/dts/kirkwood-lsxhl.dts new file +20 -0
new file mode 100644
index 000000000000..a56e0d797778
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood-lsxl.dtsi"
+
+/ {
+	model = "Buffalo Linkstation LS-XHL";
+	compatible = "buffalo,lsxhl", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+
+	ocp at f1000000 {
+		serial at 12000 {
+			status = "okay";
+		};
+	};
+};
arch/arm/dts/kirkwood-lsxl.dtsi new file +237 -0

237 lines not on this page · raw message

configs/lschlv2_defconfig +2 -1
index 1ca3d1272c97..23e68a00ea5d 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_LSXL=y
 CONFIG_IDENT_STRING=" LS-CHLv2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lschlv2"
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -28,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MVSATA_IDE=y

@@ -42,4 +44,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
configs/lsxhl_defconfig +2 -1
index c88fe37ab163..b523b68284aa 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_LSXL=y
 CONFIG_IDENT_STRING=" LS-XHL"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lsxhl"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_API=y

@@ -19,6 +20,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MVSATA_IDE=y

@@ -33,4 +35,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.17.0
author
#5 lore raw

PATCH 5/6 ARM: kirkwood: Add device-tree for netspace & inetspace

In reply to Chris Packham

Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-is2.dts         | 40 +++++++++++
 arch/arm/dts/kirkwood-ns2-common.dtsi | 97 +++++++++++++++++++++++++++
 arch/arm/dts/kirkwood-ns2.dts         | 40 +++++++++++
 arch/arm/dts/kirkwood-ns2lite.dts     | 35 ++++++++++
 arch/arm/dts/kirkwood-ns2max.dts      | 59 ++++++++++++++++
 arch/arm/dts/kirkwood-ns2mini.dts     | 60 +++++++++++++++++
 configs/inetspace_v2_defconfig        |  3 +-
 configs/netspace_lite_v2_defconfig    |  3 +-
 configs/netspace_max_v2_defconfig     |  3 +-
 configs/netspace_mini_v2_defconfig    |  3 +-
 configs/netspace_v2_defconfig         |  3 +-
 include/dt-bindings/leds/leds-ns2.h   |  9 +++
 12 files changed, 350 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-is2.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2-common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2lite.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2max.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2mini.dts
 create mode 100644 include/dt-bindings/leds/leds-ns2.h
arch/arm/dts/kirkwood-is2.dts new file +40 -0
new file mode 100644
index 000000000000..1bc16a5cdbaa
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include <dt-bindings/leds/leds-ns2.h>
+#include "kirkwood-ns2-common.dtsi"
+
+/ {
+	model = "LaCie Internet Space v2";
+	compatible = "lacie,inetspace_v2", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+
+	ocp at f1000000 {
+		sata at 80000 {
+			pinctrl-0 = <&pmx_ns2_sata0>;
+			pinctrl-names = "default";
+			status = "okay";
+			nr-ports = <1>;
+		};
+	};
+
+	ns2-leds {
+		compatible = "lacie,ns2-leds";
+
+		blue-sata {
+			label = "ns2:blue:sata";
+			slow-gpio = <&gpio0 29 0>;
+			cmd-gpio = <&gpio0 30 0>;
+			modes-map = <NS_V2_LED_OFF  1 0
+				     NS_V2_LED_ON   0 1
+				     NS_V2_LED_ON   1 1
+				     NS_V2_LED_SATA 0 0>;
+		};
+	};
+};
+
+&ethphy0 { reg = <8>; };
arch/arm/dts/kirkwood-ns2-common.dtsi new file +97 -0

97 lines not on this page · raw message

arch/arm/dts/kirkwood-ns2.dts new file +40 -0
new file mode 100644
index 000000000000..7b67083e1ec0
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include <dt-bindings/leds/leds-ns2.h>
+#include "kirkwood-ns2-common.dtsi"
+
+/ {
+	model = "LaCie Network Space v2";
+	compatible = "lacie,netspace_v2", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+
+	ocp at f1000000 {
+		sata at 80000 {
+			pinctrl-0 = <&pmx_ns2_sata0>;
+			pinctrl-names = "default";
+			status = "okay";
+			nr-ports = <1>;
+		};
+	};
+
+	ns2-leds {
+		compatible = "lacie,ns2-leds";
+
+		blue-sata {
+			label = "ns2:blue:sata";
+			slow-gpio = <&gpio0 29 0>;
+			cmd-gpio = <&gpio0 30 0>;
+			modes-map = <NS_V2_LED_OFF  1 0
+				     NS_V2_LED_ON   0 1
+				     NS_V2_LED_ON   1 1
+				     NS_V2_LED_SATA 0 0>;
+		};
+	};
+};
+
+&ethphy0 { reg = <8>; };
arch/arm/dts/kirkwood-ns2lite.dts new file +35 -0
new file mode 100644
index 000000000000..b0cb5907ed63
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood-ns2-common.dtsi"
+
+/ {
+	model = "LaCie Network Space Lite v2";
+	compatible = "lacie,netspace_lite_v2", "marvell,kirkwood-88f6192", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+
+	ocp at f1000000 {
+		sata at 80000 {
+			pinctrl-0 = <&pmx_ns2_sata0>;
+			pinctrl-names = "default";
+			status = "okay";
+			nr-ports = <1>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		blue-sata {
+			label = "ns2:blue:sata";
+			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "disk-activity";
+		};
+	};
+};
+
+&ethphy0 { reg = <0>; };
arch/arm/dts/kirkwood-ns2max.dts new file +59 -0

59 lines not on this page · raw message

arch/arm/dts/kirkwood-ns2mini.dts new file +60 -0

60 lines not on this page · raw message

configs/inetspace_v2_defconfig +2 -1
index 9f8677b74471..2fb7209f31a6 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" IS v2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
configs/netspace_lite_v2_defconfig +2 -1
index d37146dc94bb..c0e3651e6e03 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2 Lite"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
configs/netspace_max_v2_defconfig +2 -1
index 9b639c017b30..db75e6d55060 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS Max v2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
configs/netspace_mini_v2_defconfig +2 -1
index ee7554fd3f98..fd774c722afb 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2 Mini"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -24,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -34,4 +36,3 @@ CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
-CONFIG_OF_LIBFDT=y
configs/netspace_v2_defconfig +2 -1
index 6421706de043..ebdb16b16f58 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

@@ -26,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

@@ -39,4 +41,3 @@ CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
include/dt-bindings/leds/leds-ns2.h new file +9 -0
new file mode 100644
index 000000000000..fd615749e703
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _DT_BINDINGS_LEDS_NS2_H
+#define _DT_BINDINGS_LEDS_NS2_H
+
+#define NS_V2_LED_OFF	0
+#define NS_V2_LED_ON	1
+#define NS_V2_LED_SATA	2
+
+#endif
Signature · 1 line
2.17.0
author
#6 lore raw

PATCH 6/6 ARM: kirkwood: Add device-tree for keymile

In reply to Chris Packham

Import the dts files from Linux 4.17 and enable CONFIG_OF_CONTROL.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/dts/kirkwood-km_common.dtsi  | 47 +++++++++++++++++++++++++++
 arch/arm/dts/kirkwood-km_kirkwood.dts | 31 ++++++++++++++++++
 configs/km_kirkwood_128m16_defconfig  |  3 +-
 configs/km_kirkwood_defconfig         |  3 +-
 configs/km_kirkwood_pci_defconfig     |  3 +-
 configs/kmcoge5un_defconfig           |  3 +-
 configs/kmnusa_defconfig              |  3 +-
 configs/kmsugp1_defconfig             |  3 +-
 configs/kmsuv31_defconfig             |  3 +-
 configs/mgcoge3un_defconfig           |  3 +-
 10 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-km_common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-km_kirkwood.dts
arch/arm/dts/kirkwood-km_common.dtsi new file +47 -0
new file mode 100644
index 000000000000..75dc83914f56
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0
+/ {
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+		stdout-path = &uart0;
+	};
+
+	ocp at f1000000 {
+		pinctrl: pin-controller at 10000 {
+			pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
+			pinctrl-names = "default";
+
+			pmx_i2c_gpio_sda: pmx-gpio-sda {
+				marvell,pins = "mpp8";
+				marvell,function = "gpio";
+			};
+			pmx_i2c_gpio_scl: pmx-gpio-scl {
+				marvell,pins = "mpp9";
+				marvell,function = "gpio";
+			};
+		};
+
+		serial at 12000 {
+			status = "okay";
+		};
+	};
+
+	i2c {
+		compatible = "i2c-gpio";
+		gpios = < &gpio0 8 GPIO_ACTIVE_HIGH		/* sda */
+			  &gpio0 9 GPIO_ACTIVE_HIGH>;		/* scl */
+		i2c-gpio,delay-us = <2>;	/* ~100 kHz */
+	};
+};
+
+&nand {
+	status = "okay";
+	chip-delay = <25>;
+};
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+	status = "okay";
+};
arch/arm/dts/kirkwood-km_kirkwood.dts new file +31 -0
new file mode 100644
index 000000000000..f035eff1c111
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-98dx4122.dtsi"
+#include "kirkwood-km_common.dtsi"
+
+/ {
+	model = "Keymile Kirkwood Reference Design";
+	compatible = "keymile,km_kirkwood", "marvell,kirkwood-98DX4122", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x08000000>;
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
configs/km_kirkwood_128m16_defconfig +2 -1
index 5d5b485cf716..e41ec8990d98 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile Kirkwood 128M16"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/km_kirkwood_defconfig +2 -1
index b07f36beaf47..fcab051ad63a 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile Kirkwood"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/km_kirkwood_pci_defconfig +2 -1
index 31dcd0ca1b17..4fc83a5ec813 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/kmcoge5un_defconfig +2 -1
index 116369acf79b..4b1edb4c0a5a 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile COGE5UN"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/kmnusa_defconfig +2 -1
index be7421ca58a4..90d9a557b3f4 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile NUSA"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/kmsugp1_defconfig +2 -1
index 535e8693b067..132db201ef3e 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile SUGP1"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/kmsuv31_defconfig +2 -1
index 59522e733e6c..7b5b016f2854 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile SUV31"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
configs/mgcoge3un_defconfig +2 -1
index abf9cdcbfaac..baee230c7041 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_IDENT_STRING="\nKeymile COGE3UN"
+CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -25,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y

@@ -37,4 +39,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.17.0
#7 lore raw

cover ARM: kirkwood: dts conversion round 2

In reply to Chris Packham
Quoted 3 lines · Chris Packham

This is the second round of updating kirkwood boards to OF_CONTROL. Most of these boards use spi flash so I've added the u-boot specific "spi-flash" compatible string where appropriate.

Hi Chris,

Thanks for converting the LaCie boards to device tree. I'll test them as soon as possible.

Simon

Quoted 60 lines

Chris Packham (6):
ARM: kirkwood: Add device-tree for d2net_v2 & net2big_v2
ARM: kirkwood: Add device-tree for dreamplug
ARM: kirkwood: Add device-tree for ds109
ARM: kirkwood: Add device-tree for lschlv2 & lsxhl
ARM: kirkwood: Add device-tree for netspace & inetspace
ARM: kirkwood: Add device-tree for keymile

 arch/arm/dts/kirkwood-d2net.dts         |  45 ++
 arch/arm/dts/kirkwood-dreamplug.dts     | 127 ++++
 arch/arm/dts/kirkwood-ds109.dts         |  40 ++
 arch/arm/dts/kirkwood-is2.dts           |  40 ++
 arch/arm/dts/kirkwood-km_common.dtsi    |  47 ++
 arch/arm/dts/kirkwood-km_kirkwood.dts   |  31 +
 arch/arm/dts/kirkwood-lschlv2.dts       |  20 +
 arch/arm/dts/kirkwood-lsxhl.dts         |  20 +
 arch/arm/dts/kirkwood-lsxl.dtsi         | 237 +++++++
 arch/arm/dts/kirkwood-net2big.dts       |  63 ++
 arch/arm/dts/kirkwood-netxbig.dtsi      | 232 +++++++
 arch/arm/dts/kirkwood-ns2-common.dtsi   |  97 +++
 arch/arm/dts/kirkwood-ns2.dts           |  40 ++
 arch/arm/dts/kirkwood-ns2lite.dts       |  35 +
 arch/arm/dts/kirkwood-ns2max.dts        |  59 ++
 arch/arm/dts/kirkwood-ns2mini.dts       |  60 ++
 arch/arm/dts/kirkwood-synology.dtsi     | 855 ++++++++++++++++++++++++
 configs/d2net_v2_defconfig              |   3 +-
 configs/dreamplug_defconfig             |   3 +-
 configs/ds109_defconfig                 |   2 +
 configs/inetspace_v2_defconfig          |   3 +-
 configs/km_kirkwood_128m16_defconfig    |   3 +-
 configs/km_kirkwood_defconfig           |   3 +-
 configs/km_kirkwood_pci_defconfig       |   3 +-
 configs/kmcoge5un_defconfig             |   3 +-
 configs/kmnusa_defconfig                |   3 +-
 configs/kmsugp1_defconfig               |   3 +-
 configs/kmsuv31_defconfig               |   3 +-
 configs/lschlv2_defconfig               |   3 +-
 configs/lsxhl_defconfig                 |   3 +-
 configs/mgcoge3un_defconfig             |   3 +-
 configs/net2big_v2_defconfig            |   3 +-
 configs/netspace_lite_v2_defconfig      |   3 +-
 configs/netspace_max_v2_defconfig       |   3 +-
 configs/netspace_mini_v2_defconfig      |   3 +-
 configs/netspace_v2_defconfig           |   3 +-
 include/dt-bindings/leds/leds-netxbig.h |  18 +
 include/dt-bindings/leds/leds-ns2.h     |   9 +
 38 files changed, 2113 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net.dts
 create mode 100644 arch/arm/dts/kirkwood-dreamplug.dts
 create mode 100644 arch/arm/dts/kirkwood-ds109.dts
 create mode 100644 arch/arm/dts/kirkwood-is2.dts
 create mode 100644 arch/arm/dts/kirkwood-km_common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-km_kirkwood.dts
 create mode 100644 arch/arm/dts/kirkwood-lschlv2.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxhl.dts
 create mode 100644 arch/arm/dts/kirkwood-lsxl.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/dts/kirkwood-netxbig.dtsi
Quoted 11 lines
 create mode 100644 arch/arm/dts/kirkwood-ns2-common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2lite.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2max.dts
 create mode 100644 arch/arm/dts/kirkwood-ns2mini.dts
 create mode 100644 arch/arm/dts/kirkwood-synology.dtsi
 create mode 100644 include/dt-bindings/leds/leds-netxbig.h
 create mode 100644 include/dt-bindings/leds/leds-ns2.h
Signature · 1 line
2.17.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180517/e877e839/attachment.sig>

#8 lore raw

cover ARM: kirkwood: dts conversion round 2

In reply to Chris Packham
Quoted 5 lines · Chris Packham

This is the second round of updating kirkwood boards to OF_CONTROL. Most of these boards use spi flash so I've added the u-boot specific "spi-flash" compatible string where appropriate.

Quoted 7 lines

Chris Packham (6):
ARM: kirkwood: Add device-tree for d2net_v2 & net2big_v2
ARM: kirkwood: Add device-tree for dreamplug
ARM: kirkwood: Add device-tree for ds109
ARM: kirkwood: Add device-tree for lschlv2 & lsxhl
ARM: kirkwood: Add device-tree for netspace & inetspace
ARM: kirkwood: Add device-tree for keymile

Series applied to u-boot-marvell/master

Thanks,
Stefan