[PATCH v3 1/3] arm:davinci: prepare to move aemif driver to drivers/mfd
From: Manjunathappa, Prakash <hidden>
Date: 2012-02-07 15:30:57
Also in:
lkml
Subsystem:
arm port, memory technology devices (mtd), multifunction devices (mfd), nand flash subsystem, the rest, ti davinci machine support · Maintainers:
Russell King, Miquel Raynal, Richard Weinberger, Vignesh Raghavendra, Lee Jones, Linus Torvalds, Bartosz Golaszewski
Patch moves emif header file appropriately as a part preparation to move emif driver from arch/arm/mach-davinci/ to drivers/mfd folder. There by it isolates modifications in emif interface depicting as platform code change. Signed-off-by: Manjunathappa, Prakash <redacted> --- Since v2: No change Since v1: Patch generated using -M option. arch/arm/mach-davinci/aemif.c | 2 +- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- drivers/mtd/nand/davinci_nand.c | 2 +- .../aemif.h => include/linux/mfd/davinci_aemif.h | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/mfd/davinci_aemif.h (100%)
diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
index 1ce70a9..b67c115 100644
--- a/arch/arm/mach-davinci/aemif.c
+++ b/arch/arm/mach-davinci/aemif.c@@ -15,7 +15,7 @@ #include <linux/module.h> #include <linux/time.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> /* Timing value configuration */
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index dc1afe5..0b43554 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c@@ -31,7 +31,7 @@ #include <mach/nand.h> #include <mach/da8xx.h> #include <mach/usb.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> #include <mach/spi.h> #define DA830_EVM_PHY_ID ""
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index d508890..9f2a544 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c@@ -41,7 +41,7 @@ #include <mach/da8xx.h> #include <mach/nand.h> #include <mach/mux.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> #include <mach/spi.h> #define DA850_EVM_PHY_ID "davinci_mdio-0:00"
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 1247ecd..99a6639 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c@@ -38,7 +38,7 @@ #include <mach/nand.h> #include <mach/mmc.h> #include <mach/usb.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> #define DM644X_EVM_PHY_ID "davinci_mdio-0:01" #define LXT971_PHY_ID (0x001378e2)
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 872ac69..af55a9d 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c@@ -43,7 +43,7 @@ #include <mach/nand.h> #include <mach/clock.h> #include <mach/cdce949.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> #include "clock.h"
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 6e56615..f19151b 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c@@ -35,7 +35,7 @@ #include <linux/slab.h> #include <mach/nand.h> -#include <mach/aemif.h> +#include <linux/mfd/davinci_aemif.h> /* * This is a device driver for the NAND flash controller found on the
diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/include/linux/mfd/davinci_aemif.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/mfd/davinci_aemif.h
--
1.7.1