[PATCH 0/2] Armada 375/38x MBus support

[PATCH 0/2] Armada 375/38x MBus support

[Ezequiel Garcia]

As part of the submission of the Armada 375/38x initial support, these
two small patches add MBus support.

You will find that despite the MBus support being identical for the whole
SoC family: Armada 370/XP/375 and 38x, we have per-SoC compatible for each
of them.

Such decision is being currently discussed; see:

http://www.spinics.net/lists/arm-kernel/msg306480.html

Gregory CLEMENT (1):
  bus: mvebu-mbus: Add support for the Armada 375 SoCs

Thomas Petazzoni (1):
  bus: mvebu: Add support for the Armada 38x SoCs

 Documentation/devicetree/bindings/bus/mvebu-mbus.txt | 2 ++
 drivers/bus/mvebu-mbus.c                             | 4 ++++
 2 files changed, 6 insertions(+)

-- 
1.8.1.5

[PATCH 1/2] bus: mvebu-mbus: Add support for the Armada 375 SoCs

[Ezequiel Garcia]

From: Gregory CLEMENT <gregory.clement@free-electrons.com>

The mvebu-mbus driver handles the special MBus mechanism of Marvell
EBU SoCs. The new members of the EBU family, the Armada 375, is
identical in terms of MBus handling, and share the same number of
windows and register organization as Armada 370/XP.

Therefore, this commit adds a new "marvell,armada375-mbus" compatible
string, which for now uses the same data structure as the one for
Armada 370 and Armada XP.

The SoC-specific compatible string is added in order to allow
the support of SoC-specific quirks in the future.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 Documentation/devicetree/bindings/bus/mvebu-mbus.txt | 1 +
 drivers/bus/mvebu-mbus.c                             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index 7586fb6..ac21b16 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -7,6 +7,7 @@ Required properties:
 		 marvell,armada370-mbus
 		 marvell,armadaxp-mbus
 		 marvell,armada370-mbus
+		 marvell,armada375-mbus
 		 marvell,armadaxp-mbus
 		 marvell,kirkwood-mbus
 		 marvell,dove-mbus
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 725c461..23af1b8 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -591,6 +591,8 @@ static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = {
 static const struct of_device_id of_mvebu_mbus_ids[] = {
 	{ .compatible = "marvell,armada370-mbus",
 	  .data = &armada_370_xp_mbus_data, },
+	{ .compatible = "marvell,armada375-mbus",
+	  .data = &armada_370_xp_mbus_data, },
 	{ .compatible = "marvell,armadaxp-mbus",
 	  .data = &armada_370_xp_mbus_data, },
 	{ .compatible = "marvell,kirkwood-mbus",
-- 
1.8.1.5

[PATCH 2/2] bus: mvebu: Add support for the Armada 38x SoCs

[Ezequiel Garcia]

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

The mvebu-mbus driver handles the special MBus mechanism of Marvell
EBU SoCs. The two new members of the EBU family, the Armada 380 and
Armada 385, are identical in terms of MBus handling, and share the
same number of windows and register organization as Armada 370/XP.

Therefore, this commit adds a new "marvell,armada380-mbus" compatible
string, which for now uses the same data structure as the one for
Armada 370 and Armada XP.

The SoC-specific compatible string is added in order to allow
the support of SoC-specific quirks in the future.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 Documentation/devicetree/bindings/bus/mvebu-mbus.txt | 1 +
 drivers/bus/mvebu-mbus.c                             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index ac21b16..d779921 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -8,6 +8,7 @@ Required properties:
 		 marvell,armadaxp-mbus
 		 marvell,armada370-mbus
 		 marvell,armada375-mbus
+		 marvell,armada380-mbus
 		 marvell,armadaxp-mbus
 		 marvell,kirkwood-mbus
 		 marvell,dove-mbus
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 23af1b8..74607c4 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -593,6 +593,8 @@ static const struct of_device_id of_mvebu_mbus_ids[] = {
 	  .data = &armada_370_xp_mbus_data, },
 	{ .compatible = "marvell,armada375-mbus",
 	  .data = &armada_370_xp_mbus_data, },
+	{ .compatible = "marvell,armada380-mbus",
+	  .data = &armada_370_xp_mbus_data, },
 	{ .compatible = "marvell,armadaxp-mbus",
 	  .data = &armada_370_xp_mbus_data, },
 	{ .compatible = "marvell,kirkwood-mbus",
-- 
1.8.1.5

[PATCH 0/2] Armada 375/38x MBus support

[Ezequiel Garcia]

On Mon, Feb 10, 2014 at 04:24:56PM -0300, Ezequiel Garcia wrote:
> As part of the submission of the Armada 375/38x initial support, these
> two small patches add MBus support.
> 
> You will find that despite the MBus support being identical for the whole
> SoC family: Armada 370/XP/375 and 38x, we have per-SoC compatible for each
> of them.
> 
> Such decision is being currently discussed; see:
> 
> http://www.spinics.net/lists/arm-kernel/msg306480.html
> 

These patches are not required, so please omit them entirely.
The new agreement [1] is to add SoC-specific compatible strings and also
declare the nodes as compatibles with the already supported SoC,
whenever appropriate.

For instance, the devicetrees for Armada 375 would have this mbus node:

  mbus {
    compatible = "marvell,armada375-mbus", "marvell,armada370-mbus"
  }

And therefore, we don't need any changes in the driver for now.

[1] http://www.spinics.net/lists/arm-kernel/msg306727.html
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com