From b0ee20e80db09d1a387787f380199c090c9b9af0 Mon Sep 17 00:00:00 2001
From: Graf Yang <graf.yang@analog.com>
Date: Wed, 20 May 2009 06:06:15 +0000
Subject: [PATCH] --- yaml --- r: 148559 b: refs/heads/master c:
 ee0263cc2e7d774655bba6a6750a06099a3cebf0 h: refs/heads/master i:   148557:
 ee9deb8f762406a06ab745fad85f7ac53164c1b8   148555:
 af9875b53d3b503a8f797f9f9c62742790456f64   148551:
 0c60f6c401662eaea98101422c7d61cd9b02002f   148543:
 7f3de34954bbce0263afcdd063e622e6f7ecddcf v: v3

---
 [refs]                                                | 2 +-
 trunk/arch/blackfin/mach-bf518/boards/ezbrd.c         | 9 +++++++++
 trunk/arch/blackfin/mach-bf518/include/mach/portmux.h | 6 +++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eeb1809fbf0d..aa9126f99e16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f3aee3c187641ec7c7e260d9cabb71ac4ac9f7c
+refs/heads/master: ee0263cc2e7d774655bba6a6750a06099a3cebf0
diff --git a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
index 41f2eacfef20..602dce028b7b 100644
--- a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -82,7 +82,11 @@ static struct physmap_flash_data ezbrd_flash_data = {
 
 static struct resource ezbrd_flash_resource = {
 	.start = 0x20000000,
+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
+	.end   = 0x202fffff,
+#else
 	.end   = 0x203fffff,
+#endif
 	.flags = IORESOURCE_MEM,
 };
 
@@ -678,6 +682,11 @@ static int __init ezbrd_init(void)
 				ARRAY_SIZE(bfin_i2c_board_info));
 	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
+	/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */
+	peripheral_request(P_AMS2, "ParaFlash");
+#if !defined(CONFIG_SPI_BFIN) && !defined(CONFIG_SPI_BFIN_MODULE)
+	peripheral_request(P_AMS3, "ParaFlash");
+#endif
 	return 0;
 }
 
diff --git a/trunk/arch/blackfin/mach-bf518/include/mach/portmux.h b/trunk/arch/blackfin/mach-bf518/include/mach/portmux.h
index f618b487b2b0..a0fc77fd3315 100644
--- a/trunk/arch/blackfin/mach-bf518/include/mach/portmux.h
+++ b/trunk/arch/blackfin/mach-bf518/include/mach/portmux.h
@@ -185,6 +185,10 @@
 #define P_PTP_PPS		(P_DEFINED | P_IDENT(GPIO_PG12) | P_FUNCT(2))
 #define P_PTP_CLKOUT		(P_DEFINED | P_IDENT(GPIO_PG13) | P_FUNCT(2))
 
-#define P_HWAIT		(P_DEFINED | P_IDENT(GPIO_PG000000000) | P_FUNCT(1))
+/* AMS */
+#define P_AMS2			(P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(1))
+#define P_AMS3			(P_DEFINED | P_IDENT(GPIO_PG15) | P_FUNCT(2))
+
+#define P_HWAIT			(P_DEFINED | P_IDENT(GPIO_PG000000000) | P_FUNCT(1))
 
 #endif				/* _MACH_PORTMUX_H_ */