linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] Add support for a new Armada XP based board
@ 2013-07-30 15:44 Thomas Petazzoni
  2013-07-30 15:44 ` [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board Thomas Petazzoni
  2013-07-30 15:44 ` [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig Thomas Petazzoni
  0 siblings, 2 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2013-07-30 15:44 UTC (permalink / raw)
  To: linux-arm-kernel

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

-- 
1.8.1.2

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-07-30 15:44 [PATCH 0/2] Add support for a new Armada XP based board Thomas Petazzoni
@ 2013-07-30 15:44 ` Thomas Petazzoni
  2013-08-03 18:11   ` Jason Cooper
  2013-08-06 15:53   ` Jason Cooper
  2013-07-30 15:44 ` [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig Thomas Petazzoni
  1 sibling, 2 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2013-07-30 15:44 UTC (permalink / raw)
  To: linux-arm-kernel

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 <thomas.petazzoni@free-electrons.com>
---
 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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 641b3c9..66bb64f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
new file mode 100644
index 0000000..2a542bd
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -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 <thomas.petazzoni@free-electrons.com>
+ *
+ * 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>;
+		};
+	};
+};
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig
  2013-07-30 15:44 [PATCH 0/2] Add support for a new Armada XP based board Thomas Petazzoni
  2013-07-30 15:44 ` [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board Thomas Petazzoni
@ 2013-07-30 15:44 ` Thomas Petazzoni
  2013-08-03 18:14   ` Jason Cooper
  1 sibling, 1 reply; 15+ messages in thread
From: Thomas Petazzoni @ 2013-07-30 15:44 UTC (permalink / raw)
  To: linux-arm-kernel

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 <thomas.petazzoni@free-electrons.com>
---
 arch/arm/configs/mvebu_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 731814e..594d706 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -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
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-07-30 15:44 ` [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board Thomas Petazzoni
@ 2013-08-03 18:11   ` Jason Cooper
  2013-08-03 20:35     ` Seif Mazareeb
  2013-08-06 15:53   ` Jason Cooper
  1 sibling, 1 reply; 15+ messages in thread
From: Jason Cooper @ 2013-08-03 18:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
>  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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig
  2013-07-30 15:44 ` [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig Thomas Petazzoni
@ 2013-08-03 18:14   ` Jason Cooper
  0 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-03 18:14 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 30, 2013 at 05:44:51PM +0200, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/configs/mvebu_defconfig | 2 ++
>  1 file changed, 2 insertions(+)

Applied to mvebu/defconfig

thx,

Jason.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-03 18:11   ` Jason Cooper
@ 2013-08-03 20:35     ` Seif Mazareeb
  2013-08-03 20:43       ` Jason Cooper
  2013-08-04  1:06       ` Jason Cooper
  0 siblings, 2 replies; 15+ messages in thread
From: Seif Mazareeb @ 2013-08-03 20:35 UTC (permalink / raw)
  To: linux-arm-kernel

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

On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
>  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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-03 20:35     ` Seif Mazareeb
@ 2013-08-03 20:43       ` Jason Cooper
  2013-08-04  1:06       ` Jason Cooper
  1 sibling, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-03 20:43 UTC (permalink / raw)
  To: linux-arm-kernel

Seif,

For future reference, please don't toppost.

On Sat, Aug 03, 2013 at 01:35:34PM -0700, Seif Mazareeb wrote:
> 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.

> -----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
> 
> On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > 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 <thomas.petazzoni@free-electrons.com>
> > ---
> >  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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-03 20:35     ` Seif Mazareeb
  2013-08-03 20:43       ` Jason Cooper
@ 2013-08-04  1:06       ` Jason Cooper
  1 sibling, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-04  1:06 UTC (permalink / raw)
  To: linux-arm-kernel

Seif,

On Sat, Aug 03, 2013 at 01:35:34PM -0700, Seif Mazareeb wrote:
> 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.

> -----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
> 
> On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > 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 <thomas.petazzoni@free-electrons.com>
> > ---
> >  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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-07-30 15:44 ` [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board Thomas Petazzoni
  2013-08-03 18:11   ` Jason Cooper
@ 2013-08-06 15:53   ` Jason Cooper
  2013-08-06 16:32     ` Ezequiel Garcia
  2013-08-06 17:09     ` Ezequiel Garcia
  1 sibling, 2 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-06 15:53 UTC (permalink / raw)
  To: linux-arm-kernel

Ezequiel,

On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
>  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.

> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 641b3c9..66bb64f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -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
> diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> new file mode 100644
> index 0000000..2a542bd
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> @@ -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 <thomas.petazzoni@free-electrons.com>
> + *
> + * 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>;
> +		};
> +	};
> +};
> -- 
> 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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 15:53   ` Jason Cooper
@ 2013-08-06 16:32     ` Ezequiel Garcia
  2013-08-06 17:09     ` Ezequiel Garcia
  1 sibling, 0 replies; 15+ messages in thread
From: Ezequiel Garcia @ 2013-08-06 16:32 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 06, 2013 at 11:53:43AM -0400, Jason Cooper wrote:
> Ezequiel,
> 
> On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > 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 <thomas.petazzoni@free-electrons.com>
> > ---
> >  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?
> 

Sure. Let me take a look.
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 15:53   ` Jason Cooper
  2013-08-06 16:32     ` Ezequiel Garcia
@ 2013-08-06 17:09     ` Ezequiel Garcia
  2013-08-06 17:36       ` Jason Cooper
                         ` (2 more replies)
  1 sibling, 3 replies; 15+ messages in thread
From: Ezequiel Garcia @ 2013-08-06 17:09 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 06, 2013 at 11:53:43AM -0400, Jason Cooper wrote:
> Ezequiel,
> 
> On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > 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 <thomas.petazzoni@free-electrons.com>
> > ---
> >  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?
> 

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 <ezequiel.garcia@free-electrons.com>
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 <ezequiel.garcia@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 2a542bd..c5fe572 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -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 <ezequiel.garcia@free-electrons.com>
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 <ezequiel.garcia@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index f093e39..e45e363 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
 	model = "Marvell Armada XP MV78230 SoC";

-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 17:09     ` Ezequiel Garcia
@ 2013-08-06 17:36       ` Jason Cooper
  2013-08-06 18:00       ` Thomas Petazzoni
  2013-08-07 20:11       ` Jason Cooper
  2 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-06 17:36 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 06, 2013 at 02:09:42PM -0300, Ezequiel Garcia wrote:
> On Tue, Aug 06, 2013 at 11:53:43AM -0400, Jason Cooper wrote:
> > Ezequiel,
> > 
> > On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > > 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 <thomas.petazzoni@free-electrons.com>
> > > ---
> > >  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?
> > 
> 
> 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 Ezequiel!  Seif, would you mind giving this a spin and let me
know if it's ok?

thx,

Jason.

> commit ad1821bf7fa0790f2d513f5551abcd13cf297303
> Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> 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 <ezequiel.garcia@free-electrons.com>
> 
> diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> index 2a542bd..c5fe572 100644
> --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> @@ -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 <ezequiel.garcia@free-electrons.com>
> 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 <ezequiel.garcia@free-electrons.com>
> 
> diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> index f093e39..e45e363 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> @@ -13,7 +13,7 @@
>   * common to all Armada XP SoCs.
>   */
>  
> -/include/ "armada-xp.dtsi"
> +#include "armada-xp.dtsi"
>  
>  / {
>  	model = "Marvell Armada XP MV78230 SoC";
> 
> -- 
> 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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 17:09     ` Ezequiel Garcia
  2013-08-06 17:36       ` Jason Cooper
@ 2013-08-06 18:00       ` Thomas Petazzoni
  2013-08-06 18:04         ` Jason Cooper
  2013-08-07 20:11       ` Jason Cooper
  2 siblings, 1 reply; 15+ messages in thread
From: Thomas Petazzoni @ 2013-08-06 18:00 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Ezequiel Garcia,

On Tue, 6 Aug 2013 14:09:42 -0300, Ezequiel Garcia wrote:

> 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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 18:00       ` Thomas Petazzoni
@ 2013-08-06 18:04         ` Jason Cooper
  0 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-06 18:04 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 06, 2013 at 08:00:03PM +0200, Thomas Petazzoni wrote:
> Dear Ezequiel Garcia,
> 
> On Tue, 6 Aug 2013 14:09:42 -0300, Ezequiel Garcia wrote:
> 
> > 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.

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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board
  2013-08-06 17:09     ` Ezequiel Garcia
  2013-08-06 17:36       ` Jason Cooper
  2013-08-06 18:00       ` Thomas Petazzoni
@ 2013-08-07 20:11       ` Jason Cooper
  2 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2013-08-07 20:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 06, 2013 at 02:09:42PM -0300, Ezequiel Garcia wrote:
> On Tue, Aug 06, 2013 at 11:53:43AM -0400, Jason Cooper wrote:
> > Ezequiel,
> > 
> > On Tue, Jul 30, 2013 at 05:44:50PM +0200, Thomas Petazzoni wrote:
> > > 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 <thomas.petazzoni@free-electrons.com>
> > > ---
> > >  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?
> > 
> 
> 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 <ezequiel.garcia@free-electrons.com>
> 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 <ezequiel.garcia@free-electrons.com>

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.

> 
> diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> index 2a542bd..c5fe572 100644
> --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> @@ -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 <ezequiel.garcia@free-electrons.com>
> 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 <ezequiel.garcia@free-electrons.com>
> 
> diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> index f093e39..e45e363 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> @@ -13,7 +13,7 @@
>   * common to all Armada XP SoCs.
>   */
>  
> -/include/ "armada-xp.dtsi"
> +#include "armada-xp.dtsi"
>  
>  / {
>  	model = "Marvell Armada XP MV78230 SoC";
> 
> -- 
> 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

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2013-08-07 20:11 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-30 15:44 [PATCH 0/2] Add support for a new Armada XP based board Thomas Petazzoni
2013-07-30 15:44 ` [PATCH 1/2] ARM: mvebu: add support for the AXP WiFi AP board Thomas Petazzoni
2013-08-03 18:11   ` Jason Cooper
2013-08-03 20:35     ` Seif Mazareeb
2013-08-03 20:43       ` Jason Cooper
2013-08-04  1:06       ` Jason Cooper
2013-08-06 15:53   ` Jason Cooper
2013-08-06 16:32     ` Ezequiel Garcia
2013-08-06 17:09     ` Ezequiel Garcia
2013-08-06 17:36       ` Jason Cooper
2013-08-06 18:00       ` Thomas Petazzoni
2013-08-06 18:04         ` Jason Cooper
2013-08-07 20:11       ` Jason Cooper
2013-07-30 15:44 ` [PATCH 2/2] ARM: mvebu: add gpio-keys and input event support in defconfig Thomas Petazzoni
2013-08-03 18:14   ` Jason Cooper

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).