From 2e618261c96d72e5c5409d134d6d93e679683ab8 Mon Sep 17 00:00:00 2001 From: Afzal Mohammed Date: Wed, 29 Feb 2012 18:11:56 +0530 Subject: ARM: OMAP2+: nand: unify init functions Helper function for updating nand platform data has been added the capability to take timing structure arguement. Usage of omap_nand_flash_init() has been replaced by modifed one, omap_nand_flash_init was doing things similar to board_nand_init except that NAND CS# were being acquired based on bootloader setting. As CS# is hardwired for a given board, acquiring gpmc CS# has been removed, and updated with the value on board. NAND CS# used in beagle board & omap3evm was found to be CS0. Thomas Weber reported that value of devkit8000 to be CS0. Overo board was found to be using CS0 based on u-boot, while google grep says omap3touchbook too has CS0. Signed-off-by: Afzal Mohammed Reviewed-by: Jon Hunter Acked-by: Igor Grinberg --- arch/arm/mach-omap2/board-zoom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-omap2/board-zoom.c') diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 4994438e1f46..c39578c1fa6d 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -113,8 +113,9 @@ static void __init omap_zoom_init(void) usbhs_init(&usbhs_bdata); } - board_nand_init(zoom_nand_partitions, ARRAY_SIZE(zoom_nand_partitions), - ZOOM_NAND_CS, NAND_BUSWIDTH_16); + board_nand_init(zoom_nand_partitions, + ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS, + NAND_BUSWIDTH_16, nand_default_timings); zoom_debugboard_init(); zoom_peripherals_init(); -- cgit v1.2.2 From 8599e7c58786e3aef0bdb0fa093fd5150ae8a9bc Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 8 Oct 2012 09:11:22 -0700 Subject: ARM: OMAP2+: Make board-zoom.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-zoom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/board-zoom.c') diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index c39578c1fa6d..50e98795b09c 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -24,7 +24,7 @@ #include "common.h" #include -#include +#include "board-zoom.h" #include "board-flash.h" #include "mux.h" -- cgit v1.2.2 From 54db6eee06b51278a79e007765151fb5e71c370c Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 24 Oct 2012 14:26:18 -0700 Subject: ARM: OMAP2+: Introduce local usb.h Let's move what we can from plat/usb.h to the local usb.h for ARM common zImage support. This is needed so we can remove plat/usb.h for ARM common zImage support. Cc: Samuel Ortiz Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: Partha Basak Cc: Keshava Munegowda Cc: linux-usb@vger.kernel.org Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-zoom.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-omap2/board-zoom.c') diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 4994438e1f46..6e1afaeebfab 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -22,7 +22,6 @@ #include #include "common.h" -#include #include -- cgit v1.2.2