* [RESEND PATCH] arm:davinci: prepare to move aemif driver to drivers/mfd
@ 2012-01-23 15:12 Manjunathappa, Prakash
2012-01-23 17:04 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Manjunathappa, Prakash @ 2012-01-23 15:12 UTC (permalink / raw)
To: linux-arm-kernel, linux-mtd, linux-kernel
Cc: Sekhar Nori, davinci-linux-open-source, Russell King,
David Woodhouse, Samuel Ortiz, Manjunathappa, Prakash
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.
Patch series are based on the discussion and concerns expressed in
davinci-linux-open-source community. Here is the link for the same:
http://davinci-linux-open-source.1494791.n2.nabble.com/PATCH-arm-davinci-configure-davinci-aemif-chipselects-through-OF-tt7059739.html#none
Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
Adding: MFD maintainer and mailing list.
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/include/mach/aemif.h | 36 ----------------------------
drivers/mtd/nand/davinci_nand.c | 2 +-
include/linux/mfd/davinci_aemif.h | 36 ++++++++++++++++++++++++++++
6 files changed, 40 insertions(+), 40 deletions(-)
delete mode 100644 arch/arm/mach-davinci/include/mach/aemif.h
create mode 100644 include/linux/mfd/davinci_aemif.h
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 6b22b54..6dda013 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 "0:00"
diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/arch/arm/mach-davinci/include/mach/aemif.h
deleted file mode 100644
index 05b2934..0000000
--- a/arch/arm/mach-davinci/include/mach/aemif.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * TI DaVinci AEMIF support
- *
- * Copyright 2010 (C) Texas Instruments, Inc. http://www.ti.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.
- */
-#ifndef _MACH_DAVINCI_AEMIF_H
-#define _MACH_DAVINCI_AEMIF_H
-
-#define NRCSR_OFFSET 0x00
-#define AWCCR_OFFSET 0x04
-#define A1CR_OFFSET 0x10
-
-#define ACR_ASIZE_MASK 0x3
-#define ACR_EW_MASK BIT(30)
-#define ACR_SS_MASK BIT(31)
-
-/* All timings in nanoseconds */
-struct davinci_aemif_timing {
- u8 wsetup;
- u8 wstrobe;
- u8 whold;
-
- u8 rsetup;
- u8 rstrobe;
- u8 rhold;
-
- u8 ta;
-};
-
-int davinci_aemif_setup_timing(struct davinci_aemif_timing *t,
- void __iomem *base, unsigned cs);
-#endif
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/include/linux/mfd/davinci_aemif.h b/include/linux/mfd/davinci_aemif.h
new file mode 100644
index 0000000..05b2934
--- /dev/null
+++ b/include/linux/mfd/davinci_aemif.h
@@ -0,0 +1,36 @@
+/*
+ * TI DaVinci AEMIF support
+ *
+ * Copyright 2010 (C) Texas Instruments, Inc. http://www.ti.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.
+ */
+#ifndef _MACH_DAVINCI_AEMIF_H
+#define _MACH_DAVINCI_AEMIF_H
+
+#define NRCSR_OFFSET 0x00
+#define AWCCR_OFFSET 0x04
+#define A1CR_OFFSET 0x10
+
+#define ACR_ASIZE_MASK 0x3
+#define ACR_EW_MASK BIT(30)
+#define ACR_SS_MASK BIT(31)
+
+/* All timings in nanoseconds */
+struct davinci_aemif_timing {
+ u8 wsetup;
+ u8 wstrobe;
+ u8 whold;
+
+ u8 rsetup;
+ u8 rstrobe;
+ u8 rhold;
+
+ u8 ta;
+};
+
+int davinci_aemif_setup_timing(struct davinci_aemif_timing *t,
+ void __iomem *base, unsigned cs);
+#endif
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND PATCH] arm:davinci: prepare to move aemif driver to drivers/mfd
2012-01-23 15:12 [RESEND PATCH] arm:davinci: prepare to move aemif driver to drivers/mfd Manjunathappa, Prakash
@ 2012-01-23 17:04 ` Russell King - ARM Linux
2012-01-24 5:24 ` Manjunathappa, Prakash
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2012-01-23 17:04 UTC (permalink / raw)
To: Manjunathappa, Prakash
Cc: linux-arm-kernel, linux-mtd, linux-kernel, Sekhar Nori,
davinci-linux-open-source, David Woodhouse, Samuel Ortiz
On Mon, Jan 23, 2012 at 08:42:32PM +0530, Manjunathappa, Prakash wrote:
> Adding: MFD maintainer and mailing list.
>
> 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/include/mach/aemif.h | 36 ----------------------------
> drivers/mtd/nand/davinci_nand.c | 2 +-
> include/linux/mfd/davinci_aemif.h | 36 ++++++++++++++++++++++++++++
> 6 files changed, 40 insertions(+), 40 deletions(-)
> delete mode 100644 arch/arm/mach-davinci/include/mach/aemif.h
> create mode 100644 include/linux/mfd/davinci_aemif.h
As Linus has requested on many occasions, and it's a damned good
idea, use -M when generating diffstat - and its also a *really* good
idea to use -M if you're submitting patches which rename files for
review as well.
Obviously arch/arm/mach-davinci/include/mach/aemif.h was moved to
include/linux/mfd/davinci_aemif.h, but were there any changes to its
contents? Without -M, there only way of knowing is to compare each
file line by line. With -M, it'll tell us that it was renamed and
produce a diff between the old and new location.
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [RESEND PATCH] arm:davinci: prepare to move aemif driver to drivers/mfd
2012-01-23 17:04 ` Russell King - ARM Linux
@ 2012-01-24 5:24 ` Manjunathappa, Prakash
0 siblings, 0 replies; 3+ messages in thread
From: Manjunathappa, Prakash @ 2012-01-24 5:24 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-arm-kernel, linux-mtd, linux-kernel, Nori, Sekhar,
davinci-linux-open-source, David Woodhouse, Samuel Ortiz
Hi Russell King,
On Mon, Jan 23, 2012 at 22:34:36, Russell King - ARM Linux wrote:
> On Mon, Jan 23, 2012 at 08:42:32PM +0530, Manjunathappa, Prakash wrote:
> > Adding: MFD maintainer and mailing list.
> >
> > 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/include/mach/aemif.h | 36 ----------------------------
> > drivers/mtd/nand/davinci_nand.c | 2 +-
> > include/linux/mfd/davinci_aemif.h | 36 ++++++++++++++++++++++++++++
> > 6 files changed, 40 insertions(+), 40 deletions(-)
> > delete mode 100644 arch/arm/mach-davinci/include/mach/aemif.h
> > create mode 100644 include/linux/mfd/davinci_aemif.h
>
> As Linus has requested on many occasions, and it's a damned good
> idea, use -M when generating diffstat - and its also a *really* good
> idea to use -M if you're submitting patches which rename files for
> review as well.
>
> Obviously arch/arm/mach-davinci/include/mach/aemif.h was moved to
> include/linux/mfd/davinci_aemif.h, but were there any changes to its
> contents? Without -M, there only way of knowing is to compare each
> file line by line. With -M, it'll tell us that it was renamed and
> produce a diff between the old and new location.
>
Yes, I will make it a point to do this in next version and in future.
Thanks,
Prakash
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-24 5:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-23 15:12 [RESEND PATCH] arm:davinci: prepare to move aemif driver to drivers/mfd Manjunathappa, Prakash
2012-01-23 17:04 ` Russell King - ARM Linux
2012-01-24 5:24 ` Manjunathappa, Prakash
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).