Hello.
On 12-11-2010 11:02, Savinay Dharmappa wrote:
From: Aleksey Makarov<[email protected]>
Adds platform support for OMAP-L137/AM17x NOR flash driver.
Also, configures chip select 3 to control NOR flash's upper
address lines.
Please add back my signoff, omitted in this version. Some of the code,
including bug fixes, was authored by me.
Signed-off-by: Aleksey Makarov <[email protected]>
Signed-off-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Savinay Dharmappa <[email protected]>
diff --git a/arch/arm/mach-davinci/board-da830-evm.c
b/arch/arm/mach-davinci/board-da830-evm.c
index 1bb89d3..cd35198 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
[...]
@@ -429,6 +431,221 @@ static inline void da830_evm_init_nand(int mux_mode)
static inline void da830_evm_init_nand(int mux_mode) { }
#endif
+#ifdef CONFIG_DA830_UI_NOR
+/*
+ * Number of Address line
Only "lines".
going to the NOR flash that are latched using
+ * AEMIF address lines B_EMIF_BA0-B_EMIF_A12 on CS2.
+#define NOR_WINDOW_SIZE_LOG2 15
+#define NOR_WINDOW_SIZE (1 << NOR_WINDOW_SIZE_LOG2)
+
+static struct {
+ struct clk *clk;
+ struct {
+ struct resource *res;
You're not using this field outside da830_evm_nor_init() now, so there's
not much point in keeping it...
+ void __iomem *addr;
+ } latch, aemif;
+} da830_evm_nor;
+static void da830_evm_nor_set_window(unsigned long offset, void *data)
+{
+ /*
+ * CS2 and CS3 address lines are used to address NOR flash. Address
+ * line A0-A14 going to the NOR flash are latched using AEMIF address
+ * lines B_EMIF_BA0-B_EMIF_A12 on CS2.
Are they really latched, and not just used live when the NOR chip is
accessed? What's the point of latching them?
+static int da830_evm_nor_init(void *data, int cs)
+{
+ /* Turn on AEMIF clocks */
+ da830_evm_nor.clk = clk_get(NULL, "aemif");
+ if (IS_ERR(da830_evm_nor.clk)) {
+ pr_err("%s: could not get AEMIF clock\n", __func__);
+ da830_evm_nor.clk = NULL;
+ return -ENODEV;
+ }
+ clk_enable(da830_evm_nor.clk);
+
+ da830_evm_nor.aemif.res = request_mem_region(DA8XX_AEMIF_CTL_BASE,
+ SZ_32K, "AEMIF control");
No need to store it -- you don't use it afterwards.
+ if (da830_evm_nor.aemif.res == NULL) {
+ pr_err("%s: could not request AEMIF control region\n",
+ __func__);
+ goto err_clk;
+ }
[...]
+ /* Setup the window to access the latch */
+ da830_evm_nor.latch.res =
+ request_mem_region(DA8XX_AEMIF_CS3_BASE, PAGE_SIZE,
+ "DA830 UI NOR address latch");
Same comment here...
+ if (da830_evm_nor.latch.res == NULL) {
+ pr_err("%s: could not request address latch region\n",
+ __func__);
+ goto err_aemif_ioremap;
+ }
[...]
+static inline void da830_evm_init_nor(int mux_mode)
+{
+ int ret;
+
+ if (HAS_MMC) {
+ pr_warning("WARNING: both MMC/SD and NOR are "
+ "enabled, but they share AEMIF pins.\n"
+ "\tDisable MMC/SD for NOR support.\n");
This line is over-indented.
WBR, Sergei
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
