Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell XOR driver cleanup and DT binding for 3.8

1 files changed, 5 insertions, 6 deletions

diff --git a/include/linux/platform_data/dma-mv_xor.h b/include/linux/platform_data/dma-mv_xor.h
index 2ba1f7d76eef..8ec18f64e396 100644
--- a/include/linux/platform_data/dma-mv_xor.h
+++ b/include/linux/platform_data/dma-mv_xor.h
@@ -10,15 +10,14 @@
 #include <linux/dmaengine.h>
 #include <linux/mbus.h>
 
-#define MV_XOR_SHARED_NAME      "mv_xor_shared"
-#define MV_XOR_NAME             "mv_xor"
+#define MV_XOR_NAME     "mv_xor"
 
-struct mv_xor_platform_data {
-        struct platform_device          *shared;
-        int                             hw_id;
+struct mv_xor_channel_data {
         dma_cap_mask_t                  cap_mask;
-        size_t                          pool_size;
 };
 
+struct mv_xor_platform_data {
+        struct mv_xor_channel_data    *channels;
+};
 
 #endif