Skip to contentSkip to conversation

Add support for a new Armada XP based board

PATCH New Thomas Petazzoni 4 participants 15 messages Jul 30, 2013 – Aug 7, 2013

Subsystems (3)
Device tree bindings Arm (32-bit) Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

cover Add support for a new Armada XP based board

Hello,

The following two patches add support for a new Armada-XP board. The first patch adds the DTS file, the second patch updates the mvebu_defconfig file with some more interesting options.

Thanks,

Thomas

Thomas Petazzoni (2):
ARM: mvebu: add support for the AXP WiFi AP board
ARM: mvebu: add gpio-keys and input event support in defconfig

 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 arch/arm/configs/mvebu_defconfig          |   2 +
 3 files changed, 167 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
arch/arm/boot/dts/Makefile +1 -0
index 641b3c9..66bb64f 100644
@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
+	armada-xp-axpwifiap.dtb \
 	armada-xp-db.dtb \
 	armada-xp-gp.dtb \
 	armada-xp-openblocks-ax3-4.dtb
arch/arm/boot/dts/armada-xp-axpwifiap.dts new file +164 -0

164 lines not on this page · raw message

Signature · 1 line
1.8.1.2
Applied
#2 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts

Applied to mvebu/dt

thx,

Jason.

Applied
#3 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Post approval, but I've tested on my board too.
UART, USB3.0, mini-PCIe, SPI, Sata, and Ethernet - looking good.

Seif

-----Original Message-----
From: Jason Cooper [mailto:jason at lakedaemon.net]
Sent: Saturday, August 03, 2013 11:12 AM
To: Thomas Petazzoni
Cc: Andrew Lunn; Gregory Clement; Lior Amsalem; Seif Mazareeb; linux-arm-kernel at lists.infradead.org; Ezequiel Garcia
Subject: Re: [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 7 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 
++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts

Applied to mvebu/dt

thx,

Jason.

#4 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Seif,

For future reference, please don't toppost.

Quoted 2 lines · Seif Mazareeb

Post approval, but I've tested on my board too.
UART, USB3.0, mini-PCIe, SPI, Sata, and Ethernet - looking good.

Shall I consider this your Tested-by ?

I can amend the commits up until I send the PR.

thx,

Jason.

Quoted 32 lines

-----Original Message-----
From: Jason Cooper [mailto:jason at lakedaemon.net]
Sent: Saturday, August 03, 2013 11:12 AM
To: Thomas Petazzoni
Cc: Andrew Lunn; Gregory Clement; Lior Amsalem; Seif Mazareeb; linux-arm-kernel at lists.infradead.org; Ezequiel Garcia
Subject: Re: [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 7 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 
++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts

Applied to mvebu/dt

thx,

Jason.

#5 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

In reply to Seif Mazareeb

Seif,

Quoted 2 lines · Seif Mazareeb

Post approval, but I've tested on my board too.
UART, USB3.0, mini-PCIe, SPI, Sata, and Ethernet - looking good.

Added your Tested-by,

thx,

Jason.

Quoted 37 lines

-----Original Message-----
From: Jason Cooper [mailto:jason at lakedaemon.net]
Sent: Saturday, August 03, 2013 11:12 AM
To: Thomas Petazzoni
Cc: Andrew Lunn; Gregory Clement; Lior Amsalem; Seif Mazareeb; linux-arm-kernel at lists.infradead.org; Ezequiel Garcia
Subject: Re: [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 7 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 
++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts

Applied to mvebu/dt

thx,

Jason.

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

#6 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

In reply to Thomas Petazzoni

Ezequiel,

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts

When I merge this code with your MBus series I get the following warning:

DTC arch/arm/boot/dts/armada-xp-axpwifiap.dtb
Warning (ranges_format): "ranges" property in /soc has invalid length (32 bytes)
(parent #address-cells == 2, child #address-cells == 2, #size-cells == 1)

Could you please take a look and provide a separate patch to fix it up?

thx,

Jason.

Quoted 190 lines
arch/arm/boot/dts/Makefile +1 -0
index 641b3c9..66bb64f 100644
@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
+	armada-xp-axpwifiap.dtb \
 	armada-xp-db.dtb \
 	armada-xp-gp.dtb \
 	armada-xp-openblocks-ax3-4.dtb
arch/arm/boot/dts/armada-xp-axpwifiap.dts new file +164 -0
new file mode 100644
index 0000000..2a542bd
@@ -0,0 +1,164 @@
+/*
+ * Device Tree file for Marvell RD-AXPWiFiAP.
+ *
+ * Note: this board is shipped with a new generation boot loader that
+ * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
+ * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be
+ * used.
+ *
+ * Copyright (C) 2013 Marvell
+ *
+ * Thomas Petazzoni <[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/ "armada-xp-mv78230.dtsi"
+
+/ {
+	model = "Marvell RD-AXPWiFiAP";
+	compatible = "marvell,rd-axpwifiap", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp";
+
+	chosen {
+		bootargs = "console=ttyS0,115200 earlyprintk";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x00000000 0x00000000 0x40000000>; /* 1GB */
+	};
+
+	soc {
+		ranges = <0          0 0xf1000000 0x100000  /* Internal registers 1MiB */
+			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+
+		internal-regs {
+			pinctrl {
+				pinctrl-0 = <&pmx_phy_int>;
+				pinctrl-names = "default";
+
+				pmx_ge0: pmx-ge0 {
+					marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+						       "mpp4", "mpp5", "mpp6", "mpp7",
+						       "mpp8", "mpp9", "mpp10", "mpp11";
+					marvell,function = "ge0";
+				};
+
+				pmx_ge1: pmx-ge1 {
+					marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
+						       "mpp16", "mpp17", "mpp18", "mpp19",
+						       "mpp20", "mpp21", "mpp22", "mpp23";
+					marvell,function = "ge1";
+				};
+
+				pmx_keys: pmx-keys {
+					marvell,pins = "mpp33";
+					marvell,function = "gpio";
+				};
+
+				pmx_spi: pmx-spi {
+					marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
+					marvell,function = "spi";
+				};
+
+				pmx_phy_int: pmx-phy-int {
+					marvell,pins = "mpp32";
+					marvell,function = "gpio";
+				};
+			};
+
+			serial at 12000 {
+				clock-frequency = <250000000>;
+				status = "okay";
+			};
+
+			serial at 12100 {
+				clock-frequency = <250000000>;
+				status = "okay";
+			};
+
+			sata at a0000 {
+				nr-ports = <1>;
+				status = "okay";
+			};
+
+			mdio {
+				phy0: ethernet-phy at 0 {
+					reg = <0>;
+				};
+
+				phy1: ethernet-phy at 1 {
+					reg = <1>;
+				};
+			};
+
+			ethernet at 70000 {
+				pinctrl-0 = <&pmx_ge0>;
+				pinctrl-names = "default";
+				status = "okay";
+				phy = <&phy0>;
+				phy-mode = "rgmii-id";
+			};
+			ethernet at 74000 {
+				pinctrl-0 = <&pmx_ge1>;
+				pinctrl-names = "default";
+				status = "okay";
+				phy = <&phy1>;
+				phy-mode = "rgmii-id";
+			};
+
+			spi0: spi at 10600 {
+				status = "okay";
+				pinctrl-0 = <&pmx_spi>;
+				pinctrl-names = "default";
+
+				spi-flash at 0 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "n25q128a13";
+					reg = <0>; /* Chip select 0 */
+					spi-max-frequency = <108000000>;
+				};
+			};
+
+			pcie-controller {
+				status = "okay";
+
+				/* First mini-PCIe port */
+				pcie at 1,0 {
+					/* Port 0, Lane 0 */
+					status = "okay";
+				};
+
+				/* Second mini-PCIe port */
+				pcie at 2,0 {
+					/* Port 0, Lane 1 */
+					status = "okay";
+				};
+
+				/* Renesas uPD720202 USB 3.0 controller */
+				pcie at 3,0 {
+					/* Port 0, Lane 3 */
+					status = "okay";
+				};
+			};
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_keys>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Factory Reset Button";
+			linux,code = <141>; /* KEY_SETUP */
+			gpios = <&gpio1 1 1>;
+		};
+	};
+};
Signature · 7 lines
1.8.1.2


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

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Quoted 21 lines · Jason Cooper

Ezequiel,

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
Quoted 9 lines

When I merge this code with your MBus series I get the following warning:

DTC arch/arm/boot/dts/armada-xp-axpwifiap.dtb
Warning (ranges_format): "ranges" property in /soc has invalid length (32 bytes)
(parent #address-cells == 2, child #address-cells == 2, #size-cells == 1)

Could you please take a look and provide a separate patch to fix it up?

Sure. Let me take a look.

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#8 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

In reply to Jason Cooper
Quoted 21 lines · Jason Cooper

Ezequiel,

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
Quoted 9 lines

When I merge this code with your MBus series I get the following warning:

DTC arch/arm/boot/dts/armada-xp-axpwifiap.dtb
Warning (ranges_format): "ranges" property in /soc has invalid length (32 bytes)
(parent #address-cells == 2, child #address-cells == 2, #size-cells == 1)

Could you please take a look and provide a separate patch to fix it up?

Jason,

When I cherry-pick commit 704cc70179481c814d581597a7d2cdbbeb152bee (ARM: mvebu: add support for the AXP WiFi AP board) from mvebu/dt into mvebu/mbus_dt, I found it's needed to apply the changes below.

If they look fine feel free to pick them, or request any other base for them.

I don't have the board to test this, so maybe Seif can help testing them?

Thanks!

commit ad1821bf7fa0790f2d513f5551abcd13cf297303

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:45 2013 -0300

ARM: mvebu: Fix AXP-WiFi-AP DT for MBUS DT binding

The ranges property needs to be changed to use the new MBus DT binding. Also, the pcie-controller node needs to be relocated as according the MBus DT binding, it's now a child of the mbus-compatible node.

Signed-off-by Ezequiel Garcia <[email protected]>
arch/arm/boot/dts/armada-xp-axpwifiap.dts +25 -25
index 2a542bd..c5fe572 100644
@@ -16,7 +16,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78230.dtsi"
+#include "armada-xp-mv78230.dtsi"
 
 / {
 	model = "Marvell RD-AXPWiFiAP";

@@ -32,8 +32,30 @@
 	};
 
 	soc {
-		ranges = <0          0 0xf1000000 0x100000  /* Internal registers 1MiB */
-			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+		pcie-controller {
+			status = "okay";
+
+			/* First mini-PCIe port */
+			pcie at 1,0 {
+				/* Port 0, Lane 0 */
+				status = "okay";
+			};
+
+			/* Second mini-PCIe port */
+			pcie at 2,0 {
+				/* Port 0, Lane 1 */
+				status = "okay";
+			};
+
+			/* Renesas uPD720202 USB 3.0 controller */
+			pcie at 3,0 {
+				/* Port 0, Lane 3 */
+				status = "okay";
+			};
+		};
 
 		internal-regs {
 			pinctrl {

@@ -123,28 +145,6 @@
 					spi-max-frequency = <108000000>;
 				};
 			};
-
-			pcie-controller {
-				status = "okay";
-
-				/* First mini-PCIe port */
-				pcie at 1,0 {
-					/* Port 0, Lane 0 */
-					status = "okay";
-				};
-
-				/* Second mini-PCIe port */
-				pcie at 2,0 {
-					/* Port 0, Lane 1 */
-					status = "okay";
-				};
-
-				/* Renesas uPD720202 USB 3.0 controller */
-				pcie at 3,0 {
-					/* Port 0, Lane 3 */
-					status = "okay";
-				};
-			};
 		};
 	};

commit ae6c4bd3c2d337797ed1b8949b693d33c36ecbac

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:11 2013 -0300

ARM: mvebu: Fix missing DT preprocessor include

Fix the armada-xp-mv78230.dtsi file which lacked a proper #include to use the DT preprocessor.

Signed-off-by Ezequiel Garcia <[email protected]>
arch/arm/boot/dts/armada-xp-mv78230.dtsi +1 -1
index f093e39..e45e363 100644
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
 	model = "Marvell Armada XP MV78230 SoC";
Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#9 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Quoted 38 lines · Ezequiel Garcia
Quoted 21 lines · Jason Cooper

Ezequiel,

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
Quoted 9 lines

When I merge this code with your MBus series I get the following warning:

DTC arch/arm/boot/dts/armada-xp-axpwifiap.dtb
Warning (ranges_format): "ranges" property in /soc has invalid length (32 bytes)
(parent #address-cells == 2, child #address-cells == 2, #size-cells == 1)

Could you please take a look and provide a separate patch to fix it up?

Jason,

When I cherry-pick commit 704cc70179481c814d581597a7d2cdbbeb152bee (ARM: mvebu: add support for the AXP WiFi AP board) from mvebu/dt into mvebu/mbus_dt, I found it's needed to apply the changes below.

Quoted 5 lines

If they look fine feel free to pick them, or request any other base for them.

I don't have the board to test this, so maybe Seif can help testing them?

Thanks Ezequiel! Seif, would you mind giving this a spin and let me know if it's ok?

thx,

Jason.

Quoted 122 lines

commit ad1821bf7fa0790f2d513f5551abcd13cf297303

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:45 2013 -0300

ARM: mvebu: Fix AXP-WiFi-AP DT for MBUS DT binding

The ranges property needs to be changed to use the new MBus DT binding. Also, the pcie-controller node needs to be relocated as according the MBus DT binding, it's now a child of the mbus-compatible node.

Signed-off-by Ezequiel Garcia <[email protected]>
arch/arm/boot/dts/armada-xp-axpwifiap.dts +25 -25
index 2a542bd..c5fe572 100644
@@ -16,7 +16,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78230.dtsi"
+#include "armada-xp-mv78230.dtsi"
 
 / {
 	model = "Marvell RD-AXPWiFiAP";

@@ -32,8 +32,30 @@
 	};
 
 	soc {
-		ranges = <0          0 0xf1000000 0x100000  /* Internal registers 1MiB */
-			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+		pcie-controller {
+			status = "okay";
+
+			/* First mini-PCIe port */
+			pcie at 1,0 {
+				/* Port 0, Lane 0 */
+				status = "okay";
+			};
+
+			/* Second mini-PCIe port */
+			pcie at 2,0 {
+				/* Port 0, Lane 1 */
+				status = "okay";
+			};
+
+			/* Renesas uPD720202 USB 3.0 controller */
+			pcie at 3,0 {
+				/* Port 0, Lane 3 */
+				status = "okay";
+			};
+		};
 
 		internal-regs {
 			pinctrl {

@@ -123,28 +145,6 @@
 					spi-max-frequency = <108000000>;
 				};
 			};
-
-			pcie-controller {
-				status = "okay";
-
-				/* First mini-PCIe port */
-				pcie at 1,0 {
-					/* Port 0, Lane 0 */
-					status = "okay";
-				};
-
-				/* Second mini-PCIe port */
-				pcie at 2,0 {
-					/* Port 0, Lane 1 */
-					status = "okay";
-				};
-
-				/* Renesas uPD720202 USB 3.0 controller */
-				pcie at 3,0 {
-					/* Port 0, Lane 3 */
-					status = "okay";
-				};
-			};
 		};
 	};

commit ae6c4bd3c2d337797ed1b8949b693d33c36ecbac

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:11 2013 -0300

ARM: mvebu: Fix missing DT preprocessor include

Fix the armada-xp-mv78230.dtsi file which lacked a proper #include to use the DT preprocessor.

Signed-off-by Ezequiel Garcia <[email protected]>
arch/arm/boot/dts/armada-xp-mv78230.dtsi +1 -1
index f093e39..e45e363 100644
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
 	model = "Marvell Armada XP MV78230 SoC";
Signature · 9 lines
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

In reply to Ezequiel Garcia

Dear Ezequiel Garcia,

Quoted 9 lines · Ezequiel Garcia

When I cherry-pick commit 704cc70179481c814d581597a7d2cdbbeb152bee (ARM: mvebu: add support for the AXP WiFi AP board) from mvebu/dt into mvebu/mbus_dt, I found it's needed to apply the changes below.

If they look fine feel free to pick them, or request any other base for them.

I don't have the board to test this, so maybe Seif can help testing them?

Your two patches look good to me. Jason, if you merge them somewhere, it will make it easier for me to test them. I have the AXP WiFi AP board here to do the validation.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#11 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

Quoted 11 lines · Thomas Petazzoni

Dear Ezequiel Garcia,

Quoted 7 lines · Ezequiel Garcia

When I cherry-pick commit 704cc70179481c814d581597a7d2cdbbeb152bee (ARM: mvebu: add support for the AXP WiFi AP board) from mvebu/dt into mvebu/mbus_dt, I found it's needed to apply the changes below.

If they look fine feel free to pick them, or request any other base for them.

Quoted 6 lines
Quoted 2 lines

I don't have the board to test this, so maybe Seif can help testing them?

Your two patches look good to me. Jason, if you merge them somewhere, it will make it easier for me to test them. I have the AXP WiFi AP board here to do the validation.

Ok, I'm probably going to move the original patch over to mvebu/mbus_dt, then add Ezequiel's patch. That should prevent any unnecessary dependencies.

If I don't get to it tonight, it'll probably be sometime tomorrow (that and MSI).

thx,

Jason.

Applied
#12 lore raw

PATCH 1/2 ARM: mvebu: add support for the AXP WiFi AP board

In reply to Ezequiel Garcia
Quoted 50 lines · Ezequiel Garcia
Quoted 21 lines · Jason Cooper

Ezequiel,

Quoted 11 lines · Thomas Petazzoni

The AXP WiFi AP board is a Marvell platform based on the Armada XP MV78230 SoC. It has two mini-PCIe connectors, one USB 3.0 port powered by a USB 3.0 controller on PCIe, two Ethernet ports, 1 GB of RAM, 1 GB of NAND, 16 MB of SPI flash, one SATA port and one button, two UARTs

Successfully tested: USB 3.0 port, the mini-PCIe connectors, SPI flash, Ethernet ports, SATA port, button, UART.

Untested: NAND flash, due to lack of mainline support for the Armada 370/XP NAND controller for now.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
Quoted 9 lines

When I merge this code with your MBus series I get the following warning:

DTC arch/arm/boot/dts/armada-xp-axpwifiap.dtb
Warning (ranges_format): "ranges" property in /soc has invalid length (32 bytes)
(parent #address-cells == 2, child #address-cells == 2, #size-cells == 1)

Could you please take a look and provide a separate patch to fix it up?

Jason,

When I cherry-pick commit 704cc70179481c814d581597a7d2cdbbeb152bee (ARM: mvebu: add support for the AXP WiFi AP board) from mvebu/dt into mvebu/mbus_dt, I found it's needed to apply the changes below.

If they look fine feel free to pick them, or request any other base for them.

I don't have the board to test this, so maybe Seif can help testing them?

Thanks!

commit ad1821bf7fa0790f2d513f5551abcd13cf297303

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:45 2013 -0300
Quoted 7 lines

ARM: mvebu: Fix AXP-WiFi-AP DT for MBUS DT binding

The ranges property needs to be changed to use the new MBus DT binding. Also, the pcie-controller node needs to be relocated as according the MBus DT binding, it's now a child of the mbus-compatible node.

Signed-off-by Ezequiel Garcia <[email protected]>

Applied to mvebu/mbus_dt along with the original patch introducing the board. Also added a patch to use the dts pre-processor for mv78230.

thx,

Jason.

Quoted 111 lines
arch/arm/boot/dts/armada-xp-axpwifiap.dts +25 -25
index 2a542bd..c5fe572 100644
@@ -16,7 +16,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78230.dtsi"
+#include "armada-xp-mv78230.dtsi"
 
 / {
 	model = "Marvell RD-AXPWiFiAP";

@@ -32,8 +32,30 @@
 	};
 
 	soc {
-		ranges = <0          0 0xf1000000 0x100000  /* Internal registers 1MiB */
-			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+		pcie-controller {
+			status = "okay";
+
+			/* First mini-PCIe port */
+			pcie at 1,0 {
+				/* Port 0, Lane 0 */
+				status = "okay";
+			};
+
+			/* Second mini-PCIe port */
+			pcie at 2,0 {
+				/* Port 0, Lane 1 */
+				status = "okay";
+			};
+
+			/* Renesas uPD720202 USB 3.0 controller */
+			pcie at 3,0 {
+				/* Port 0, Lane 3 */
+				status = "okay";
+			};
+		};
 
 		internal-regs {
 			pinctrl {

@@ -123,28 +145,6 @@
 					spi-max-frequency = <108000000>;
 				};
 			};
-
-			pcie-controller {
-				status = "okay";
-
-				/* First mini-PCIe port */
-				pcie at 1,0 {
-					/* Port 0, Lane 0 */
-					status = "okay";
-				};
-
-				/* Second mini-PCIe port */
-				pcie at 2,0 {
-					/* Port 0, Lane 1 */
-					status = "okay";
-				};
-
-				/* Renesas uPD720202 USB 3.0 controller */
-				pcie at 3,0 {
-					/* Port 0, Lane 3 */
-					status = "okay";
-				};
-			};
 		};
 	};

commit ae6c4bd3c2d337797ed1b8949b693d33c36ecbac

Author: Ezequiel Garcia <[email protected]>
Date:   Tue Aug 6 14:02:11 2013 -0300

ARM: mvebu: Fix missing DT preprocessor include

Fix the armada-xp-mv78230.dtsi file which lacked a proper #include to use the DT preprocessor.

Signed-off-by Ezequiel Garcia <[email protected]>
arch/arm/boot/dts/armada-xp-mv78230.dtsi +1 -1
index f093e39..e45e363 100644
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
 	model = "Marvell Armada XP MV78230 SoC";
Signature · 9 lines
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

PATCH 2/2 ARM: mvebu: add gpio-keys and input event support in defconfig

In reply to Thomas Petazzoni

Some Armada 370/XP boards have GPIO buttons, so it makes sense to enable gpio-keys and the input event interface in mvebu_defconfig.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/configs/mvebu_defconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/configs/mvebu_defconfig +2 -0
index 731814e..594d706 100644
@@ -39,6 +39,8 @@ CONFIG_MVNETA=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MWIFIEX=y
 CONFIG_MWIFIEX_SDIO=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_I2C=y
Signature · 1 line
1.8.1.2
Applied
#14 lore raw

PATCH 2/2 ARM: mvebu: add gpio-keys and input event support in defconfig

Quoted 7 lines · Thomas Petazzoni

Some Armada 370/XP boards have GPIO buttons, so it makes sense to enable gpio-keys and the input event interface in mvebu_defconfig.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/configs/mvebu_defconfig | 2 ++
 1 file changed, 2 insertions(+)

Applied to mvebu/defconfig

thx,

Jason.