Skip to contentSkip to conversation

ARM: Kirkwood: DT board setup for LaPlug

PATCH New Maxime Hadjinlian 5 participants 9 messages Nov 16, 2013 – Dec 24, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

This patch adds DT board setup for the LaCie NAS LaPlug.

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts
arch/arm/boot/dts/Makefile +1 -0
index d57c1a6..38b0604 100644
@@ -96,6 +96,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-ns2mini.dtb \
 	kirkwood-nsa310.dtb \
 	kirkwood-nsa310a.dtb \
+	kirkwood-nsplug.dtb \
 	kirkwood-openblocks_a6.dtb \
 	kirkwood-openblocks_a7.dtb \
 	kirkwood-sheevaplug.dtb \
arch/arm/boot/dts/kirkwood-nsplug.dts new file +178 -0

178 lines not on this page · raw message

Signature · 1 line
1.8.4.2
#1 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

Hi Maxime

Overall, this looks good.

I have a few minor comments though:

Please ensure the Marvell Maintainers get a copy of patches like this. I added them to this reply.

Quoted 46 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts
arch/arm/boot/dts/Makefile +1 -0
index d57c1a6..38b0604 100644
@@ -96,6 +96,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-ns2mini.dtb \
 	kirkwood-nsa310.dtb \
 	kirkwood-nsa310a.dtb \
+	kirkwood-nsplug.dtb \
 	kirkwood-openblocks_a6.dtb \
 	kirkwood-openblocks_a7.dtb \
 	kirkwood-sheevaplug.dtb \
arch/arm/boot/dts/kirkwood-nsplug.dts new file +11 -0
new file mode 100644
index 0000000..45ab517
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2013 Maxime Hadjinlian <[email protected]>
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"

arch/arm/boot/dts/kirkwood-nsplug.dts line 21

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+#include "kirkwood-6281.dtsi"
+
+/ {
+  model = "LaCie LaPlug";
+  compatible = "lacie,nsplug", "marvell,kirkwood-88f6192", "marvell,kirkwood";
+
+  memory {
+    device_type = "memory";
+    reg = <0x00000000 0x8000000>; /* 128 MB */
+  };

I'm not aware of an indentation standard for DT files. However, for kirkwood, we use tabs.

Quoted 62 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +62 -0
+
+  chosen {
+    bootargs = "console=ttyS0,115200n8 earlyprintk";
+  };
+
+  mbus {
+    ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+    pcie-controller {
+      status = "okay";
+      pcie at 1,0 {
+        status = "okay";
+      };
+    };
+  };
+
+  ocp at f1000000 {
+
+    serial at 12000 {
+      pinctrl-0 = <&pmx_uart0>;
+      pinctrl-names = "default";
+      status = "okay";
+    };
+
+    i2c at 11000 {
+      pinctrl-0 = <&pmx_twsi0>;
+      pinctrl-names = "default";
+      status = "okay";
+
+      eeprom at 50 {
+        compatible = "at,24c04";
+        pagesize = <16>;
+        reg = <0x50>;
+      };
+    };
+
+    pinctrl: pinctrl at 10000 {
+      pmx_usb_power_enable: pmx-usb-power-enable {
+        marvell,pins = "mpp14";
+        marvell,function = "gpio";
+      };
+    };
+
+    nand at 3000000 {
+      /* Total size : 512MB */
+      status = "okay";
+
+      partition at 0 {
+        label = "u-boot";
+        reg = <0x0 0x100000>; /* 1MB */
+        read-only;
+      };
+
+      partition at 100000 {
+        label = "uImage";
+        reg = <0x100000 0x1000000>; /* 16MB */
+      };
+
+      partition at 1100000 {
+        label = "rootfs";
+        reg = <0x1100000 0x1EF00000>; /* 495MB */
+      };
+    };

arch/arm/boot/dts/kirkwood-nsplug.dts line 93

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+  };
+
+  gpio_keys {
+    compatible = "gpio-keys";
+    #address-cells = <1>;
+    #size-cells = <0>;
+
+    button at 1{
+      label = "Power push button";
+      linux,code = <116>;

You could use <dt-bindings/input/input.h> and symbolic names instead of 116.

arch/arm/boot/dts/kirkwood-nsplug.dts line 94

Quoted 1 line
arch/arm/boot/dts/kirkwood-nsplug.dts new file +1 -0
+      gpios = <&gpio1 0 0>;

And here you can use <dt-bindings/gpio/gpio.h> and use GPIO_ACTIVE_HIGH.

None of the kirkwood .dtb files actually use these yet, but it is something we want to change to.

Thanks
Andrew

Quoted 92 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +84 -0
+    };
+  };
+
+  gpio-leds {
+    compatible = "gpio-leds";
+
+    red-fail {
+      label = "ns_plug_v2:red:power";
+      gpios = <&gpio0 12 0>;
+    };
+    blue-power {
+      label = "ns_plug_v2:blue:power";
+      gpios = <&gpio0 29 0>;
+      linux,default-trigger = "default-on";
+    };
+  };
+
+  gpio_poweroff {
+    compatible = "gpio-poweroff";
+    gpios = <&gpio0 31 0>;
+  };
+
+  regulators {
+    compatible = "simple-bus";
+    #address-cells = <1>;
+    #size-cells = <0>;
+    pinctrl-0 = <&pmx_usb_power_enable>;
+    pinctrl-names = "default";
+
+    usb_power_back1: regulator at 1 {
+      compatible = "regulator-fixed";
+      reg = <1>;
+      regulator-name = "USB Power Back 1";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 15 0>;
+    };
+
+    usb_power_back2: regulator at 2 {
+      compatible = "regulator-fixed";
+      reg = <2>;
+      regulator-name = "USB Power Back 2";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 28 0>;
+    };
+
+    usb_power_front: regulator at 3 {
+      compatible = "regulator-fixed";
+      reg = <3>;
+      regulator-name = "USB Power Front";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio1 3 0>;
+    };
+  };
+
+};
+
+&mdio {
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";
+    reg = <0>;
+  };
+};
+
+&eth0 {
+  status = "okay";
+  ethernet0-port at 0 {
+    phy-handle = <&ethphy0>;
+  };
+};
+
Signature · 7 lines
1.8.4.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

In reply to Maxime Hadjinlian
Quoted 1 line · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

[adding MVEBU maintainers, please do that always from now on]

Maxime,

first of all, thanks for providing this. Anyway, I do have some remarks below.

Quoted 40 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
  arch/arm/boot/dts/Makefile            |   1 +
  arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
  2 files changed, 179 insertions(+)

create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts

arch/arm/boot/dts/Makefile +1 -0
index d57c1a6..38b0604 100644
@@ -96,6 +96,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
  	kirkwood-ns2mini.dtb \
  	kirkwood-nsa310.dtb \
  	kirkwood-nsa310a.dtb \
+	kirkwood-nsplug.dtb \
  	kirkwood-openblocks_a6.dtb \
  	kirkwood-openblocks_a7.dtb \
  	kirkwood-sheevaplug.dtb \
arch/arm/boot/dts/kirkwood-nsplug.dts new file +5 -0
new file mode 100644
index 0000000..45ab517
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2013 Maxime Hadjinlian <[email protected]>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any

arch/arm/boot/dts/kirkwood-nsplug.dts line 15

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+  model = "LaCie LaPlug";

For the whole file, please indent with tabs, not spaces.

arch/arm/boot/dts/kirkwood-nsplug.dts line 16

Quoted 1 line
arch/arm/boot/dts/kirkwood-nsplug.dts new file +1 -0
+  compatible = "lacie,nsplug", "marvell,kirkwood-88f6192", "marvell,kirkwood";

If it is Kirkwood 6192, why is it including 6281? Do you know the differences? I guess at least, the pinctrl is different, so please fork a new kirkwood-6192.dtsi and include that.

Quoted 11 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +11 -0
+  memory {
+    device_type = "memory";
+    reg = <0x00000000 0x8000000>; /* 128 MB */
+  };
+
+  chosen {
+    bootargs = "console=ttyS0,115200n8 earlyprintk";
+  };
+
+  mbus {
+    ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;

arch/arm/boot/dts/kirkwood-nsplug.dts line 38

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+    pcie-controller {
+      status = "okay";
+      pcie at 1,0 {
+        status = "okay";
+      };
+    };
+  };
+
+  ocp at f1000000 {
+

remove blank line above.

Quoted 38 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +38 -0
+    serial at 12000 {
+      pinctrl-0 = <&pmx_uart0>;
+      pinctrl-names = "default";
+      status = "okay";
+    };
+
+    i2c at 11000 {
+      pinctrl-0 = <&pmx_twsi0>;
+      pinctrl-names = "default";
+      status = "okay";
+
+      eeprom at 50 {
+        compatible = "at,24c04";
+        pagesize = <16>;
+        reg = <0x50>;
+      };
+    };
+
+    pinctrl: pinctrl at 10000 {
+      pmx_usb_power_enable: pmx-usb-power-enable {
+        marvell,pins = "mpp14";
+        marvell,function = "gpio";
+      };
+    };
+
+    nand at 3000000 {
+      /* Total size : 512MB */
+      status = "okay";
+
+      partition at 0 {
+        label = "u-boot";
+        reg = <0x0 0x100000>; /* 1MB */
+        read-only;
+      };
+
+      partition at 100000 {
+        label = "uImage";
+        reg = <0x100000 0x1000000>; /* 16MB */

arch/arm/boot/dts/kirkwood-nsplug.dts line 86

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+      };
+
+      partition at 1100000 {
+        label = "rootfs";
+        reg = <0x1100000 0x1EF00000>; /* 495MB */
+      };
+    };
+  };
+
+  gpio_keys {

gpio-keys above

arch/arm/boot/dts/kirkwood-nsplug.dts line 89

Quoted 3 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +3 -0
+    compatible = "gpio-keys";
+    #address-cells = <1>;
+    #size-cells = <0>;

It is not a "bus", so remove #*-cells above.

arch/arm/boot/dts/kirkwood-nsplug.dts line 94

Quoted 5 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +5 -0
+
+    button at 1{
+      label = "Power push button";
+      linux,code = <116>;
+      gpios = <&gpio1 0 0>;

#include <dt-bindings/gpio/gpio.h>

and use GPIO_ACTIVE_HIGH / _LOW for the last cell of every gpios property.

arch/arm/boot/dts/kirkwood-nsplug.dts line 104

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+    };
+  };
+
+  gpio-leds {
+    compatible = "gpio-leds";
+
+    red-fail {
+      label = "ns_plug_v2:red:power";
+      gpios = <&gpio0 12 0>;
+    };

ditto.

arch/arm/boot/dts/kirkwood-nsplug.dts line 107

Quoted 3 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +3 -0
+    blue-power {
+      label = "ns_plug_v2:blue:power";
+      gpios = <&gpio0 29 0>;

ditto.

arch/arm/boot/dts/kirkwood-nsplug.dts line 112

Quoted 5 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +5 -0
+      linux,default-trigger = "default-on";
+    };
+  };
+
+  gpio_poweroff {

gpio-poweroff above.

arch/arm/boot/dts/kirkwood-nsplug.dts line 114

Quoted 2 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +2 -0
+    compatible = "gpio-poweroff";
+    gpios = <&gpio0 31 0>;

GPIO_ACTIVE_ above.

Quoted 9 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +9 -0
+  };
+
+  regulators {
+    compatible = "simple-bus";
+    #address-cells = <1>;
+    #size-cells = <0>;
+    pinctrl-0 = <&pmx_usb_power_enable>;
+    pinctrl-names = "default";
+

arch/arm/boot/dts/kirkwood-nsplug.dts line 133

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+    usb_power_back1: regulator at 1 {
+      compatible = "regulator-fixed";
+      reg = <1>;
+      regulator-name = "USB Power Back 1";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 15 0>;

ditto.

arch/arm/boot/dts/kirkwood-nsplug.dts line 145

Quoted 12 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +12 -0
+    };
+
+    usb_power_back2: regulator at 2 {
+      compatible = "regulator-fixed";
+      reg = <2>;
+      regulator-name = "USB Power Back 2";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 28 0>;

ditto.

arch/arm/boot/dts/kirkwood-nsplug.dts line 157

Quoted 12 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +12 -0
+    };
+
+    usb_power_front: regulator at 3 {
+      compatible = "regulator-fixed";
+      reg = <3>;
+      regulator-name = "USB Power Front";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio1 3 0>;

ditto.

arch/arm/boot/dts/kirkwood-nsplug.dts line 167

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+    };
+  };
+
+};
+
+&mdio {
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";

If you know the type of PHY used here, please add
a compatible like "marvell,88e1318s"

Sebastian

Quoted 12 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +11 -0
+    reg = <0>;
+  };
+};
+
+&eth0 {
+  status = "okay";
+  ethernet0-port at 0 {
+    phy-handle = <&ethphy0>;
+  };
+};
+
#3 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

Quoted 26 lines · Sebastian Hesselbarth
Quoted 1 line · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

[adding MVEBU maintainers, please do that always from now on]

Maxime,

first of all, thanks for providing this. Anyway, I do have some remarks below.

Quoted 16 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts

...

Quoted 8 lines

arch/arm/boot/dts/kirkwood-nsplug.dts line 167

Quoted 5 lines

+&mdio {

arch/arm/boot/dts/kirkwood-nsplug.dts new file +4 -0
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";

If you know the type of PHY used here, please add
a compatible like "marvell,88e1318s"

Please be aware of the current conversation [1] started by Jason Gunthorpe regarding the compatible string choice here. Once that's resolved, please resend.

thx,

Jason.

[1] http://www.spinics.net/lists/arm-kernel/msg288496.html

#4 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

Quoted 34 lines · Jason Cooper
Quoted 26 lines · Sebastian Hesselbarth
Quoted 1 line · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

[adding MVEBU maintainers, please do that always from now on]

Maxime,

first of all, thanks for providing this. Anyway, I do have some remarks below.

Quoted 16 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts

...

Quoted 6 lines
Quoted 5 lines

+&mdio {

arch/arm/boot/dts/kirkwood-nsplug.dts new file +4 -0
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";
Quoted 6 lines
Quoted 2 lines

If you know the type of PHY used here, please add
a compatible like "marvell,88e1318s"

Please be aware of the current conversation [1] started by Jason Gunthorpe regarding the compatible string choice here. Once that's resolved, please resend.

Looks like we chose to dodge the issue. Mind resending with the a comment identifying the phy?

thx,

Jason.

Quoted 1 line

[1] http://www.spinics.net/lists/arm-kernel/msg288496.html

#5 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

Quoted 38 lines · Jason Cooper
Quoted 37 lines · Jason Cooper
Quoted 26 lines · Sebastian Hesselbarth
Quoted 1 line · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

[adding MVEBU maintainers, please do that always from now on]

Maxime,

first of all, thanks for providing this. Anyway, I do have some remarks below.

Quoted 16 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts

...

Quoted 8 lines

arch/arm/boot/dts/kirkwood-nsplug.dts line 167

Quoted 5 lines

+&mdio {

arch/arm/boot/dts/kirkwood-nsplug.dts new file +4 -0
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";

If you know the type of PHY used here, please add
a compatible like "marvell,88e1318s"

Quoted 6 lines
Quoted 3 lines

Please be aware of the current conversation [1] started by Jason Gunthorpe regarding the compatible string choice here. Once that's resolved, please resend.

Looks like we chose to dodge the issue. Mind resending with the a comment identifying the phy?

Well, I was going to take this version and fix up the phy node, but re-reading the thread I see there were quite a few comments that were never addressed. Please resend a V2 if you'd like to add support for this board.

thx,

Jason.

#6 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

I have resent the patch with an issue regarding the NAND device. Sorry that it took so long...

Quoted 54 lines · Jason Cooper
Quoted 38 lines · Jason Cooper
Quoted 37 lines · Jason Cooper
Quoted 26 lines · Sebastian Hesselbarth
Quoted 1 line · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

[adding MVEBU maintainers, please do that always from now on]

Maxime,

first of all, thanks for providing this. Anyway, I do have some remarks below.

Quoted 16 lines

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts

...

Quoted 8 lines

arch/arm/boot/dts/kirkwood-nsplug.dts line 167

Quoted 5 lines

+&mdio {

arch/arm/boot/dts/kirkwood-nsplug.dts new file +4 -0
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";

If you know the type of PHY used here, please add
a compatible like "marvell,88e1318s"

Quoted 6 lines
Quoted 3 lines

Please be aware of the current conversation [1] started by Jason Gunthorpe regarding the compatible string choice here. Once that's resolved, please resend.

Looks like we chose to dodge the issue. Mind resending with the a comment identifying the phy?

Well, I was going to take this version and fix up the phy node, but re-reading the thread I see there were quite a few comments that were never addressed. Please resend a V2 if you'd like to add support for this board.

thx,

Jason.

#7 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

Quoted 2 lines · Maxime Hadjinlian

I have resent the patch with an issue regarding the NAND device. Sorry that it took so long...

No problem, thanks for submitting the new version.

thx,

Jason.

#8 lore raw

PATCH 1/1 ARM: Kirkwood: DT board setup for LaPlug

In reply to Maxime Hadjinlian
Quoted 11 lines · Maxime Hadjinlian

This patch adds DT board setup for the LaCie NAS LaPlug.

Chipset list:
- CPU MARVELL 88FR131 800Mhz
- SDRAM memory: 128MB DDR2-800 400Mhz
- 1 Ethernet Gigabit port (PHY MARVELL 88E1318)
- 1 Mini PCI-Express port
- 1 NAND 512 MB
- 1 push button
- 2 LEDs (red and blue)
- 4 USB Ports

Hi Maxime,

Thanks for this patch.

Quoted 32 lines
---
 arch/arm/boot/dts/Makefile            |   1 +
 arch/arm/boot/dts/kirkwood-nsplug.dts | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-nsplug.dts
arch/arm/boot/dts/Makefile +1 -0
index d57c1a6..38b0604 100644
@@ -96,6 +96,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-ns2mini.dtb \
 	kirkwood-nsa310.dtb \
 	kirkwood-nsa310a.dtb \
+	kirkwood-nsplug.dtb \
 	kirkwood-openblocks_a6.dtb \
 	kirkwood-openblocks_a7.dtb \
 	kirkwood-sheevaplug.dtb \
arch/arm/boot/dts/kirkwood-nsplug.dts new file +6 -0
new file mode 100644
index 0000000..45ab517
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2013 Maxime Hadjinlian <[email protected]>
+ *
+ * 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.

arch/arm/boot/dts/kirkwood-nsplug.dts line 16

Quoted 10 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +10 -0
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+  model = "LaCie LaPlug";
+  compatible = "lacie,nsplug", "marvell,kirkwood-88f6192", "marvell,kirkwood";

I think you should use "lacie,laplug" as a primary compatible string and also fix the LED device names accordingly.

Simon

Quoted 164 lines
arch/arm/boot/dts/kirkwood-nsplug.dts new file +162 -0
+
+  memory {
+    device_type = "memory";
+    reg = <0x00000000 0x8000000>; /* 128 MB */
+  };
+
+  chosen {
+    bootargs = "console=ttyS0,115200n8 earlyprintk";
+  };
+
+  mbus {
+    ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+    pcie-controller {
+      status = "okay";
+      pcie at 1,0 {
+        status = "okay";
+      };
+    };
+  };
+
+  ocp at f1000000 {
+
+    serial at 12000 {
+      pinctrl-0 = <&pmx_uart0>;
+      pinctrl-names = "default";
+      status = "okay";
+    };
+
+    i2c at 11000 {
+      pinctrl-0 = <&pmx_twsi0>;
+      pinctrl-names = "default";
+      status = "okay";
+
+      eeprom at 50 {
+        compatible = "at,24c04";
+        pagesize = <16>;
+        reg = <0x50>;
+      };
+    };
+
+    pinctrl: pinctrl at 10000 {
+      pmx_usb_power_enable: pmx-usb-power-enable {
+        marvell,pins = "mpp14";
+        marvell,function = "gpio";
+      };
+    };
+
+    nand at 3000000 {
+      /* Total size : 512MB */
+      status = "okay";
+
+      partition at 0 {
+        label = "u-boot";
+        reg = <0x0 0x100000>; /* 1MB */
+        read-only;
+      };
+
+      partition at 100000 {
+        label = "uImage";
+        reg = <0x100000 0x1000000>; /* 16MB */
+      };
+
+      partition at 1100000 {
+        label = "rootfs";
+        reg = <0x1100000 0x1EF00000>; /* 495MB */
+      };
+    };
+  };
+
+  gpio_keys {
+    compatible = "gpio-keys";
+    #address-cells = <1>;
+    #size-cells = <0>;
+
+    button at 1{
+      label = "Power push button";
+      linux,code = <116>;
+      gpios = <&gpio1 0 0>;
+    };
+  };
+
+  gpio-leds {
+    compatible = "gpio-leds";
+
+    red-fail {
+      label = "ns_plug_v2:red:power";
+      gpios = <&gpio0 12 0>;
+    };
+    blue-power {
+      label = "ns_plug_v2:blue:power";
+      gpios = <&gpio0 29 0>;
+      linux,default-trigger = "default-on";
+    };
+  };
+
+  gpio_poweroff {
+    compatible = "gpio-poweroff";
+    gpios = <&gpio0 31 0>;
+  };
+
+  regulators {
+    compatible = "simple-bus";
+    #address-cells = <1>;
+    #size-cells = <0>;
+    pinctrl-0 = <&pmx_usb_power_enable>;
+    pinctrl-names = "default";
+
+    usb_power_back1: regulator at 1 {
+      compatible = "regulator-fixed";
+      reg = <1>;
+      regulator-name = "USB Power Back 1";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 15 0>;
+    };
+
+    usb_power_back2: regulator at 2 {
+      compatible = "regulator-fixed";
+      reg = <2>;
+      regulator-name = "USB Power Back 2";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio0 28 0>;
+    };
+
+    usb_power_front: regulator at 3 {
+      compatible = "regulator-fixed";
+      reg = <3>;
+      regulator-name = "USB Power Front";
+      regulator-min-microvolt = <5000000>;
+      regulator-max-microvolt = <5000000>;
+      enable-active-high;
+      regulator-always-on;
+      regulator-boot-on;
+      gpio = <&gpio1 3 0>;
+    };
+  };
+
+};
+
+&mdio {
+  status = "okay";
+
+  ethphy0: ethernet-phy at 0 {
+    device_type = "ethernet-phy";
+    reg = <0>;
+  };
+};
+
+&eth0 {
+  status = "okay";
+  ethernet0-port at 0 {
+    phy-handle = <&ethphy0>;
+  };
+};
+
Signature · 1 line
1.8.4.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131117/bcc13457/attachment.sig>