* [PATCH 1/6] arm: mvebu: fix compatible string in armada-370-xp.dtsi
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 2/6] arm: mvebu: don't list all boards in dt compat field for Armada 370/XP Thomas Petazzoni
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
All the Device Tree files for Armada 370 and XP SoCs and boards use
the "armada-370-xp" common compatible string, except
armada-370-xp.dtsi which was specifying "armada_370_xp".
Fix this inconsistency by making armada-370-xp.dtsi declare a
compatible string of "armada-370-xp" like everyone else.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
This might be considered 3.7 material if not late. Otherwise, there's
no big deal if it goes into 3.8.
---
arch/arm/boot/dts/armada-370-xp.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 16cc82c..b113e0b 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -20,7 +20,7 @@
/ {
model = "Marvell Armada 370 and XP SoC";
- compatible = "marvell,armada_370_xp";
+ compatible = "marvell,armada-370-xp";
cpus {
cpu at 0 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/6] arm: mvebu: don't list all boards in dt compat field for Armada 370/XP
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 1/6] arm: mvebu: fix compatible string in armada-370-xp.dtsi Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 3/6] arm: mvebu: fix typo in machine name " Thomas Petazzoni
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
Instead of listing explicitly all boards in the .dt_compat field of
the DT_MACHINE_START structure for Armada 370/XP, use instead a
compatible string that is common to all boards using the Armada
370/XP.
This allows to add new boards by just using a different Device Tree,
without having to modify the source code of the kernel.
Note that the name of the array containing the compatible string is
also renamed, to reflect the fact that it no longer contains the list
of all boards.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
This might be considered 3.7 material if not late. Otherwise, there's
no big deal if it goes into 3.8.
---
arch/arm/mach-mvebu/armada-370-xp.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 49d7915..29c27cd 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -46,9 +46,8 @@ static void __init armada_370_xp_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-static const char * const armada_370_xp_dt_board_dt_compat[] = {
- "marvell,a370-db",
- "marvell,axp-db",
+static const char * const armada_370_xp_dt_compat[] = {
+ "marvell,armada-370-xp",
NULL,
};
@@ -59,5 +58,5 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
.handle_irq = armada_370_xp_handle_irq,
.timer = &armada_370_xp_timer,
.restart = mvebu_restart,
- .dt_compat = armada_370_xp_dt_board_dt_compat,
+ .dt_compat = armada_370_xp_dt_compat,
MACHINE_END
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/6] arm: mvebu: fix typo in machine name for Armada 370/XP
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 1/6] arm: mvebu: fix compatible string in armada-370-xp.dtsi Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 2/6] arm: mvebu: don't list all boards in dt compat field for Armada 370/XP Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 4/6] arm: mvebu: support for the PlatHome OpenBlocks AX3-4 board Thomas Petazzoni
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 29c27cd..a2f5bbc 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -51,7 +51,7 @@ static const char * const armada_370_xp_dt_compat[] = {
NULL,
};
-DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
+DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io,
.init_irq = armada_370_xp_init_irq,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] arm: mvebu: support for the PlatHome OpenBlocks AX3-4 board
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
` (2 preceding siblings ...)
2012-11-12 17:20 ` [PATCH 3/6] arm: mvebu: fix typo in machine name " Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 5/6] arm: mvebu: support for the Globalscale Mirabox board Thomas Petazzoni
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
This platform, available in Japan from PlatHome, has a dual-core
Armada XP, the MV78260. For now, only the two serial ports and the
three front LEDs are supported. Support for SMP, network, SATA, USB
and other peripherals will be added as drivers for them become
available for Armada XP in mainline.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
This is 3.8 material.
Changes since v2:
* Renamed the .dts file to armada-xp-openblocks-ax3-4.dts
* Removed the compatible string from armada-370-xp.c (which now only
lists the common SoC compatible string)
Changes since v1:
* Renamed the board to OpenBlocks AX3-4, since there is a variant
called AX3-2 which has less RAM, and no mini PCIe port. Requested
by Andrew Lunn.
* Fix the amount of memory to 3 GB. In fact, the board has 1 GB
soldered, and 2 GB in a SODIMM slot (which is therefore
removable). But as the board is delivered as is, we'll assume it
has 3 GB of memory by default.
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 69 ++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f37cf9f..718584d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -44,7 +44,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
msm8960-cdp.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
- armada-xp-db.dtb
+ armada-xp-db.dtb \
+ armada-xp-openblocks-ax3-4.dtb
dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
imx53-ard.dtb \
imx53-evk.dtb \
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
new file mode 100644
index 0000000..cb86853
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -0,0 +1,69 @@
+/*
+ * Device Tree file for OpenBlocks AX3-4 board
+ *
+ * Copyright (C) 2012 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-mv78260.dtsi"
+
+/ {
+ model = "PlatHome OpenBlocks AX3-4 board";
+ compatible = "plathome,openblocks-ax3-4", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp";
+
+ chosen {
+ bootargs = "console=ttyS0,115200 earlyprintk";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0xC0000000>; /* 3 GB */
+ };
+
+ soc {
+ serial at d0012000 {
+ clock-frequency = <250000000>;
+ status = "okay";
+ };
+ serial at d0012100 {
+ clock-frequency = <250000000>;
+ status = "okay";
+ };
+ pinctrl {
+ led_pins: led-pins-0 {
+ marvell,pins = "mpp49", "mpp51", "mpp53";
+ marvell,function = "gpio";
+ };
+ };
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&led_pins>;
+
+ red_led {
+ label = "red_led";
+ gpios = <&gpio1 17 1>;
+ default-state = "off";
+ };
+
+ yellow_led {
+ label = "yellow_led";
+ gpios = <&gpio1 19 1>;
+ default-state = "off";
+ };
+
+ green_led {
+ label = "green_led";
+ gpios = <&gpio1 21 1>;
+ default-state = "off";
+ linux,default-trigger = "heartbeat";
+ };
+ };
+ };
+};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/6] arm: mvebu: support for the Globalscale Mirabox board
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
` (3 preceding siblings ...)
2012-11-12 17:20 ` [PATCH 4/6] arm: mvebu: support for the PlatHome OpenBlocks AX3-4 board Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-12 17:20 ` [PATCH 6/6] arm: mvebu: add LED support in defconfig Thomas Petazzoni
2012-11-13 18:46 ` arm: mvebu: Pull request for 'marvell-boards' branch Jason Cooper
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
This platform, available from Globalscale has an Armada 370. For now,
only the serial port is supported. Support for network, USB and other
peripherals will be added as drivers for them become available for
Armada 370 in mainline.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
This is 3.8 material.
Changes from original version posted by Gregory:
* Renamed .dts file to armada-370-mirabox.dts
* Change compatible string to 'globalscale,mirabox'
* Remove compatible string from armada-370-xp.c
* Removed references to MBX0001
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/armada-370-mirabox.dts | 37 ++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 arch/arm/boot/dts/armada-370-mirabox.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 718584d..32d1d40 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -44,6 +44,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
msm8960-cdp.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
+ armada-370-mirabox.dtb \
armada-xp-db.dtb \
armada-xp-openblocks-ax3-4.dtb
dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
new file mode 100644
index 0000000..9eef8dd
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -0,0 +1,37 @@
+/*
+ * Device Tree file for Globalscale Mirabox
+ *
+ * Gregory CLEMENT <gregory.clement@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-370.dtsi"
+
+/ {
+ model = "Globalscale Mirabox";
+ compatible = "globalscale,mirabox", "marvell,armada370", "marvell,armada-370-xp";
+
+ chosen {
+ bootargs = "console=ttyS0,115200 earlyprintk";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>; /* 512 MB */
+ };
+
+ soc {
+ serial at d0012000 {
+ clock-frequency = <200000000>;
+ status = "okay";
+ };
+ timer at d0020300 {
+ clock-frequency = <600000000>;
+ status = "okay";
+ };
+ };
+};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/6] arm: mvebu: add LED support in defconfig
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
` (4 preceding siblings ...)
2012-11-12 17:20 ` [PATCH 5/6] arm: mvebu: support for the Globalscale Mirabox board Thomas Petazzoni
@ 2012-11-12 17:20 ` Thomas Petazzoni
2012-11-13 18:46 ` arm: mvebu: Pull request for 'marvell-boards' branch Jason Cooper
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2012-11-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
The recently added support for the PlatHome Openblocks AX3 platform
requires the LED framework, so let's add it to mvebu_defconfig.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
This is 3.8 material
---
arch/arm/configs/mvebu_defconfig | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 3458752..b7ca617 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -26,6 +26,11 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* arm: mvebu: Pull request for 'marvell-boards' branch
2012-11-12 17:20 arm: mvebu: Pull request for 'marvell-boards' branch Thomas Petazzoni
` (5 preceding siblings ...)
2012-11-12 17:20 ` [PATCH 6/6] arm: mvebu: add LED support in defconfig Thomas Petazzoni
@ 2012-11-13 18:46 ` Jason Cooper
6 siblings, 0 replies; 8+ messages in thread
From: Jason Cooper @ 2012-11-13 18:46 UTC (permalink / raw)
To: linux-arm-kernel
Thomas,
Nice to see a pull request from you guys!
Comments below:
On Mon, Nov 12, 2012 at 06:20:33PM +0100, Thomas Petazzoni wrote:
> Jason, Andrew,
>
> The following changes since commit 77b67063bb6bce6d475e910d3b886a606d0d91f7:
>
> Linux 3.7-rc5 (2012-11-11 13:44:33 +0100)
>
> are available in the git repository at:
>
> git at github.com:MISL-EBU-System-SW/mainline-public.git marvell-boards
>
> for you to fetch changes up to 39325a96e1d082bf71b7a4d9ac2d5806f80c6d13:
>
> arm: mvebu: add LED support in defconfig (2012-11-12 18:13:41 +0100)
>
> ----------------------------------------------------------------
I'd like to see a signed tag in here. If you could have gregory send me
a signed email with all the fingerprints you guys traded at ELCE, I'd
appreciate it.
In the future, could you please break these up into the following
branches:
> Gregory CLEMENT (1):
> arm: mvebu: support for the Globalscale Mirabox board
boards
> Thomas Petazzoni (5):
> arm: mvebu: fix compatible string in armada-370-xp.dtsi
> arm: mvebu: don't list all boards in dt compat field for Armada 370/XP
> arm: mvebu: fix typo in machine name for Armada 370/XP
cleanup (also, if any are fixing problems found in older kernels, please
add a CC to stable as appropriate)
> arm: mvebu: support for the PlatHome OpenBlocks AX3-4 board
boards
> arm: mvebu: add LED support in defconfig
defconfig
That would really help me out. Otherwise, I have to pull this branch
and cherry-pick the patches into different branches. Which kind of
defeats the purpose of the pull request. ;-)
thx,
Jason.
^ permalink raw reply [flat|nested] 8+ messages in thread