omap updates for 2.6.34 merge window, part 1
Subsystems (8)
Tony Lindgren
maintainercover omap updates for 2.6.34 merge window, part 1
Hi all,
Over the next few days I'll be posting total of 66 omap patches for review. Here's part 1.
Regards,
Tony
---
Felipe Balbi (4):
omap1: mailbox: kill compile warning omap2/3/4: mailbox: kill compile warning in mailbox.c omap2/3/4: gpmc: kill compile warning omap2/3/4: gpmc: avoid section definitions on headers
Hiroshi DOYU (3):
omap iommu: cleanup iommu page address mask and definitions
omap: iommu: fix incorrect address for supersection 1st entry omap iommu: fix incorrect address for largepage 1st entry
Janusz Krzysztofik (4):
omap: McBSP: Use macros for all register read/write operations
omap: McBSP: Modify macros/functions API for easy cache access
omap: McBSP: Introduce caching in register write operations
omap: McBSP: Use cache when modifying individual register bits
Ladislav Michl (2):
omap: convert boards to use physmap-flash
MTD: remove no longer used OMAP flash map
Vimal Singh (3):
omap2/3/4: Introducing 'gpmc-nand.c' for GPMC specific NAND init
omap3: SDP: Introducing 'board-sdp-flash.c' for flash init
omap3: Add support for flash on 3430SDP board
vikram pandita (1):
omap2/3/4: serial: fix coding style indentaion
arch/arm/mach-omap1/Makefile | 2 arch/arm/mach-omap1/board-fsample.c | 9 - arch/arm/mach-omap1/board-h2.c | 9 - arch/arm/mach-omap1/board-h3.c | 9 - arch/arm/mach-omap1/board-innovator.c | 9 - arch/arm/mach-omap1/board-osk.c | 9 - arch/arm/mach-omap1/board-palmte.c | 9 - arch/arm/mach-omap1/board-palmtt.c | 9 - arch/arm/mach-omap1/board-palmz71.c | 10 - arch/arm/mach-omap1/board-perseus2.c | 9 - arch/arm/mach-omap1/board-sx1.c | 11 - arch/arm/mach-omap1/board-voiceblue.c | 9 - arch/arm/mach-omap1/devices.c | 2 arch/arm/mach-omap1/flash.c | 33 ++ arch/arm/mach-omap1/mailbox.c | 9 - arch/arm/mach-omap1/mcbsp.c | 16 + arch/arm/mach-omap2/Makefile | 6 arch/arm/mach-omap2/board-2430sdp.c | 7 arch/arm/mach-omap2/board-3430sdp.c | 111 ++++++++ arch/arm/mach-omap2/board-h4.c | 7 arch/arm/mach-omap2/board-sdp-flash.c | 272 +++++++++++++++++++ arch/arm/mach-omap2/gpmc-nand.c | 139 ++++++++++ arch/arm/mach-omap2/gpmc.c | 6 arch/arm/mach-omap2/include/mach/board-sdp.h | 21 + arch/arm/mach-omap2/mailbox.c | 2 arch/arm/mach-omap2/mcbsp.c | 20 + arch/arm/mach-omap2/serial.c | 19 + arch/arm/plat-omap/include/plat/flash.h | 16 + arch/arm/plat-omap/include/plat/gpmc.h | 4 arch/arm/plat-omap/include/plat/mcbsp.h | 3 arch/arm/plat-omap/include/plat/nand.h | 10 + arch/arm/plat-omap/iommu.c | 6 arch/arm/plat-omap/iopgtable.h | 50 +++- arch/arm/plat-omap/mcbsp.c | 366 +++++++++++++------------- drivers/mtd/maps/Kconfig | 9 - drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ------------- drivers/mtd/nand/omap2.c | 35 -- 38 files changed, 962 insertions(+), 500 deletions(-) create mode 100644 arch/arm/mach-omap1/flash.c create mode 100644 arch/arm/mach-omap2/board-sdp-flash.c create mode 100644 arch/arm/mach-omap2/gpmc-nand.c create mode 100644 arch/arm/mach-omap2/include/mach/board-sdp.h create mode 100644 arch/arm/plat-omap/include/plat/flash.h
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/17 omap: convert boards to use physmap-flash
From: Ladislav Michl <[email protected]>
Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree
--- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/board-fsample.c | 9 +++++--- arch/arm/mach-omap1/board-h2.c | 9 +++++--- arch/arm/mach-omap1/board-h3.c | 9 +++++--- arch/arm/mach-omap1/board-innovator.c | 9 +++++--- arch/arm/mach-omap1/board-osk.c | 9 +++++--- arch/arm/mach-omap1/board-palmte.c | 9 +++++--- arch/arm/mach-omap1/board-palmtt.c | 9 +++++--- arch/arm/mach-omap1/board-palmz71.c | 10 +++++---- arch/arm/mach-omap1/board-perseus2.c | 9 +++++--- arch/arm/mach-omap1/board-sx1.c | 11 ++++++---- arch/arm/mach-omap1/board-voiceblue.c | 9 +++++--- arch/arm/mach-omap1/flash.c | 33 +++++++++++++++++++++++++++++++ arch/arm/mach-omap2/board-2430sdp.c | 7 +++---- arch/arm/mach-omap2/board-h4.c | 7 +++---- arch/arm/plat-omap/include/plat/flash.h | 16 +++++++++++++++ 16 files changed, 112 insertions(+), 55 deletions(-) create mode 100644 arch/arm/mach-omap1/flash.c create mode 100644 arch/arm/plat-omap/include/plat/flash.h
arch/arm/mach-omap1/Makefile +1 -1
@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o irq.o mux.o serial.o devices.o +obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
arch/arm/mach-omap1/board-fsample.c +5 -4
@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <plat/keypad.h> #include <plat/common.h>
@@ -150,9 +151,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -164,7 +165,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-h2.c +5 -4
@@ -26,6 +26,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/i2c/tps65010.h> #include <linux/smc91x.h>
@@ -35,7 +36,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h>
@@ -45,6 +45,7 @@#include <plat/usb.h> #include <plat/keypad.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h2.h"
@@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { } }; -static struct flash_platform_data h2_nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h2_nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = h2_nor_partitions, .nr_parts =ARRAY_SIZE (h2_nor_partitions), };
@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { };static struct platform_device h2_nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h2_nor_data,
arch/arm/mach-omap1/board-h3.c +5 -4
@@ -25,6 +25,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/i2c/tps65010.h>
@@ -37,7 +38,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/irqs.h>
@@ -47,6 +47,7 @@#include <plat/keypad.h> #include <plat/dma.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h3.h"
@@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { } }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -139,7 +140,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-innovator.c +5 -4
@@ -22,16 +22,17 @@#include <linux/delay.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <mach/gpio.h> #include <plat/tc.h>
@@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = { } }; -static struct flash_platform_data innovator_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data innovator_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = innovator_partitions, .nr_parts =ARRAY_SIZE (innovator_partitions), };
@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = { };static struct platform_device innovator_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &innovator_flash_data,
arch/arm/mach-omap1/board-osk.c +5 -4
@@ -37,6 +37,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h>
@@ -46,8 +47,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> +#include <plat/flash.h> #include <plat/usb.h> #include <plat/mux.h> #include <plat/tc.h>
@@ -94,9 +95,9 @@ static struct mtd_partition osk_partitions[] = { } }; -static struct flash_platform_data osk_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data osk_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = osk_partitions, .nr_parts =ARRAY_SIZE (osk_partitions), };
@@ -107,7 +108,7 @@ static struct resource osk_flash_resource = { };static struct platform_device osk5912_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &osk_flash_data,
arch/arm/mach-omap1/board-palmte.c +5 -4
@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/apm-emulation.h>
@@ -31,9 +32,9 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/tc.h>
@@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { }, }; -static struct flash_platform_data palmte_rom_data = { - .map_name ="map_rom" , +static struct physmap_flash_data palmte_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmte_rom_partitions, .nr_parts =ARRAY_SIZE (palmte_rom_partitions), };
@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { };static struct platform_device palmte_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmte_rom_data,
arch/arm/mach-omap1/board-palmtt.c +5 -4
@@ -21,16 +21,17 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/leds.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/led.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { } }; -static struct flash_platform_data palmtt_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data palmtt_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmtt_partitions, .nr_parts =ARRAY_SIZE (palmtt_partitions), };
@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { };static struct platform_device palmtt_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &palmtt_flash_data,
arch/arm/mach-omap1/board-palmz71.c +5 -5
@@ -25,14 +25,15 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { }, }; -static struct flash_platform_data palmz71_rom_data = { - .map_name ="map_rom" , - .name ="onboardrom" , +static struct physmap_flash_data palmz71_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmz71_rom_partitions, .nr_parts =ARRAY_SIZE (palmz71_rom_partitions), };
@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { };static struct platform_device palmz71_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmz71_rom_data,
arch/arm/mach-omap1/board-perseus2.c +5 -4
@@ -18,19 +18,20 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/keypad.h> #include <plat/common.h> #include <plat/board.h>
@@ -117,9 +118,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -131,7 +132,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-sx1.c +6 -5
@@ -22,6 +22,7 @@#include <linux/notifier.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/types.h> #include <linux/i2c.h> #include <linux/errno.h>
@@ -29,10 +30,10 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/irda.h>
@@ -287,9 +288,9 @@ static struct mtd_partition sx1_partitions[] = { } }; -static struct flash_platform_data sx1_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sx1_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = sx1_partitions, .nr_parts =ARRAY_SIZE (sx1_partitions), };
@@ -310,7 +311,7 @@ static struct resource sx1_old_flash_resource[] = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
@@ -327,7 +328,7 @@ static struct resource sx1_new_flash_resource = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
arch/arm/mach-omap1/board-voiceblue.c +5 -4
@@ -18,6 +18,7 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mtd/physmap.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/serial_8250.h>
@@ -27,11 +28,11 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/common.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h> #include <plat/usb.h>
@@ -86,9 +87,9 @@ static int __init ext_uart_init(void) }arch_initcall (ext_uart_init); -static struct flash_platform_data voiceblue_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data voiceblue_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, };static struct resource voiceblue_flash_resource = {
@@ -98,7 +99,7 @@ static struct resource voiceblue_flash_resource = { };static struct platform_device voiceblue_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &voiceblue_flash_data,
arch/arm/mach-omap1/flash.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Flash support for OMAP1 +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/mtd/mtd.h> +#include <linux/mtd/map.h> + +#include <plat/io.h> +#include <plat/tc.h> + +void omap1_set_vpp (struct map_info *map,int enable) +{ +static int count; +u32 l; + +if (enable) { +if (count++ ==0 ) { + l =omap_readl (EMIFS_CONFIG ); + l |=OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + }else { +if (count && (--count ==0 )) { + l =omap_readl (EMIFS_CONFIG ); + l &= ~OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + } +}
arch/arm/mach-omap2/board-2430sdp.c +3 -4
@@ -18,6 +18,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/i2c/twl.h> #include <linux/err.h>
@@ -28,7 +29,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> #include <plat/mux.h>
@@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = { } }; -static struct flash_platform_data sdp2430_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sdp2430_flash_data = { .width =2 , .parts = sdp2430_partitions, .nr_parts =ARRAY_SIZE (sdp2430_partitions),
@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = { };static struct platform_device sdp2430_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sdp2430_flash_data,
arch/arm/mach-omap2/board-h4.c +3 -4
@@ -16,6 +16,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h>
@@ -29,7 +30,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/control.h> #include <mach/gpio.h>
@@ -115,8 +115,7 @@ static struct mtd_partition h4_partitions[] = { } }; -static struct flash_platform_data h4_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h4_flash_data = { .width =2 , .parts = h4_partitions, .nr_parts =ARRAY_SIZE (h4_partitions),
@@ -127,7 +126,7 @@ static struct resource h4_flash_resource = { };static struct platform_device h4_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h4_flash_data,
arch/arm/plat-omap/include/plat/flash.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Flash support for OMAP1 +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __OMAP_FLASH_H +#define __OMAP_FLASH_H + +#include <linux/mtd/map.h> + +extern void omap1_set_vpp (struct map_info *map,int enable); + +#endif
Tony Lindgren
maintainerPATCH 2/17 MTD: remove no longer used OMAP flash map
In reply to Tony LindgrenFrom: Ladislav Michl <[email protected]>
All OMAP boards are now using physmap-flash.
--- drivers/mtd/maps/Kconfig | 9 -- drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ------------------------------------------- 3 files changed, 0 insertions(+), 198 deletions(-)
drivers/mtd/maps/Kconfig +0 -9
@@ -428,15 +428,6 @@ config MTD_H720X This enables access to the flash chips on the Hynix evaluation boards. If you have such a board, say 'Y'. -config MTD_OMAP_NOR - tristate "TI OMAP board mappings" - depends on MTD_CFI && ARCH_OMAP - help - This enables access to the NOR flash chips on TI OMAP-based - boards defining flash platform devices and flash platform data. - These boards include the Innovator, H2, H3, OSK, Perseus2, and - more. If you have such a board, say 'Y'. - # This needs CFI or JEDEC, depending on the cards found. config MTD_PCI tristate "PCI MTD driver"
drivers/mtd/maps/Makefile +0 -1
@@ -55,7 +55,6 @@ obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o obj-$(CONFIG_MTD_DMV182) += dmv182.o obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o -obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
drivers/mtd/maps/omap_nor.c +0 -188
188 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 3/17 omap iommu: cleanup iommu page address mask and definitions
In reply to Tony LindgrenFrom: Hiroshi DOYU <[email protected]>
This is just a cleanup, but adds a few macros here, which can be used in the proceeding patches.
--- arch/arm/plat-omap/iopgtable.h | 50 +++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 11 deletions(-)
arch/arm/plat-omap/iopgtable.h +39 -11
@@ -1,7 +1,7 @@/* * omap iommu: pagetable definitions * -* Copyright (C) 2008-2009 Nokia Corporation +* Copyright (C) 2008-2010 Nokia Corporation * * Written by Hiroshi DOYU <[email protected]> *
@@ -13,26 +13,52 @@#ifndef __PLAT_OMAP_IOMMU_H#define __PLAT_OMAP_IOMMU_H +/* +* "L2 table" address mask and size definitions. +*/ #define IOPGD_SHIFT 20 -#define IOPGD_SIZE (1 << IOPGD_SHIFT) +#define IOPGD_SIZE (1UL << IOPGD_SHIFT)#define IOPGD_MASK (~(IOPGD_SIZE - 1)) -#define IOSECTION_MASK IOPGD_MASK -#define PTRS_PER_IOPGD (1 << (32 - IOPGD_SHIFT)) -#define IOPGD_TABLE_SIZE (PTRS_PER_IOPGD * sizeof(u32)) -#define IOSUPER_SIZE (IOPGD_SIZE << 4) +/* +* "section" address mask and size definitions. +*/ +#define IOSECTION_SHIFT 20 +#define IOSECTION_SIZE (1UL << IOSECTION_SHIFT) +#define IOSECTION_MASK (~(IOSECTION_SIZE - 1)) + +/* +* "supersection" address mask and size definitions. +*/ +#define IOSUPER_SHIFT 24 +#define IOSUPER_SIZE (1UL << IOSUPER_SHIFT)#define IOSUPER_MASK (~(IOSUPER_SIZE - 1)) +#define PTRS_PER_IOPGD (1UL << (32 - IOPGD_SHIFT)) +#define IOPGD_TABLE_SIZE (PTRS_PER_IOPGD * sizeof(u32)) + +/* +* "small page" address mask and size definitions. +*/ #define IOPTE_SHIFT 12 -#define IOPTE_SIZE (1 << IOPTE_SHIFT) +#define IOPTE_SIZE (1UL << IOPTE_SHIFT)#define IOPTE_MASK (~(IOPTE_SIZE - 1)) -#define IOPAGE_MASK IOPTE_MASK -#define PTRS_PER_IOPTE (1 << (IOPGD_SHIFT - IOPTE_SHIFT)) -#define IOPTE_TABLE_SIZE (PTRS_PER_IOPTE * sizeof(u32)) -#define IOLARGE_SIZE (IOPTE_SIZE << 4) +/* +* "large page" address mask and size definitions. +*/ +#define IOLARGE_SHIFT 16 +#define IOLARGE_SIZE (1UL << IOLARGE_SHIFT)#define IOLARGE_MASK (~(IOLARGE_SIZE - 1)) +#define PTRS_PER_IOPTE (1UL << (IOPGD_SHIFT - IOPTE_SHIFT)) +#define IOPTE_TABLE_SIZE (PTRS_PER_IOPTE * sizeof(u32)) + +#define IOPAGE_MASK IOPTE_MASK + +/* +* some descriptor attributes. +*/ #define IOPGD_TABLE (1 << 0)#define IOPGD_SECTION (2 << 0)#define IOPGD_SUPER (1 << 18 | 2 << 0)
@@ -40,12 +66,14 @@#define IOPTE_SMALL (2 << 0)#define IOPTE_LARGE (1 << 0) +/* to find an entry in a page-table-directory */ #define iopgd_index (da) (((da) >> IOPGD_SHIFT) & (PTRS_PER_IOPGD - 1))#define iopgd_offset (obj, da) ((obj)->iopgd + iopgd_index(da))#define iopte_paddr (iopgd) (*iopgd & ~((1 << 10) - 1))#define iopte_vaddr (iopgd) ((u32 *)phys_to_virt(iopte_paddr(iopgd))) +/* to find an entry in the second-level page table. */ #define iopte_index (da) (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1))#define iopte_offset (iopgd, da) (iopte_vaddr(iopgd) + iopte_index(da))
Tony Lindgren
maintainerPATCH 4/17 omap: iommu: fix incorrect address for supersection 1st entry
In reply to Tony LindgrenFrom: Hiroshi DOYU <[email protected]>
There was a potential risk that the following "memset" could override its range if a given address was not the 1st entry of a supersection. This is not the case for "iovmm".
--- arch/arm/plat-omap/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/iommu.c +1 -1
@@ -667,7 +667,7 @@ static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)if ((*iopgd &IOPGD_SUPER ) ==IOPGD_SUPER ) { nent *=16 ;/* rewind to the 1st entry */ - iopgd = (u32 *)((u32 )iopgd &IOSUPER_MASK ); + iopgd =iopgd_offset (obj, (da &IOSUPER_MASK )); } bytes *= nent; }
Tony Lindgren
maintainerPATCH 5/17 omap iommu: fix incorrect address for largepage 1st entry
In reply to Tony LindgrenFrom: Hiroshi DOYU <[email protected]>
There was a potential risk that the following "memset" could override its range if a given address was not the 1st entry of a largepage. This is not the case for "iovmm".
--- arch/arm/plat-omap/iommu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-omap/iommu.c +2 -2
@@ -1,7 +1,7 @@/* * omap iommu: tlb and pagetable primitives * -* Copyright (C) 2008-2009 Nokia Corporation +* Copyright (C) 2008-2010 Nokia Corporation * * Written by Hiroshi DOYU <[email protected]>, * Paul Mundt and Toshihiro Kobayashi
@@ -646,7 +646,7 @@ static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)if (*iopte &IOPTE_LARGE ) { nent *=16 ;/* rewind to the 1st entry */ - iopte = (u32 *)((u32 )iopte &IOLARGE_MASK ); + iopte =iopte_offset (iopgd, (da &IOLARGE_MASK )); } bytes *= nent;memset (iopte,0 , nent *sizeof (*iopte));
Tony Lindgren
maintainerPATCH 6/17 omap: McBSP: Use macros for all register read/write operations
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
There are several places where readw()/writew() functions are used instead of OMAP_MCBSP_READ()/WRITE() macros for manipulating McBSP registers. Replace them with macros to ensure consistent behaviour after caching is introduced.
Tested on OMAP1510 based Amstrad Delta.
Compile-tested with omap_3430sdp_defconfig.
--- arch/arm/plat-omap/mcbsp.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-)
arch/arm/plat-omap/mcbsp.c +22 -22
@@ -636,26 +636,26 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) mcbsp =id_to_mcbsp_ptr (id); base = mcbsp->io_base; -writew (buf, base +OMAP_MCBSP_REG_DXR1 ); +OMAP_MCBSP_WRITE (base,DXR1 , buf);/* if frame sync error - clear the error */ -if (readw (base +OMAP_MCBSP_REG_SPCR2 ) &XSYNC_ERR ) { +if (OMAP_MCBSP_READ (base,SPCR2 ) &XSYNC_ERR ) {/* clear error */ -writew (readw (base +OMAP_MCBSP_REG_SPCR2 ) & (~XSYNC_ERR ), - base +OMAP_MCBSP_REG_SPCR2 ); +OMAP_MCBSP_WRITE (base,SPCR2 , +OMAP_MCBSP_READ (base,SPCR2 ) & (~XSYNC_ERR ));/* resend */ return -1 ; }else {/* wait for transmit confirmation */ int attemps =0 ; -while (!(readw (base +OMAP_MCBSP_REG_SPCR2 ) &XRDY )) { +while (!(OMAP_MCBSP_READ (base,SPCR2 ) &XRDY )) {if (attemps++ >1000 ) { -writew (readw (base +OMAP_MCBSP_REG_SPCR2 ) & - (~XRST ), - base +OMAP_MCBSP_REG_SPCR2 ); +OMAP_MCBSP_WRITE (base,SPCR2 , +OMAP_MCBSP_READ (base,SPCR2 ) & + (~XRST ));udelay (10 ); -writew (readw (base +OMAP_MCBSP_REG_SPCR2 ) | - (XRST ), - base +OMAP_MCBSP_REG_SPCR2 ); +OMAP_MCBSP_WRITE (base,SPCR2 , +OMAP_MCBSP_READ (base,SPCR2 ) | + (XRST ));udelay (10 );dev_err (mcbsp->dev,"Could not write to" " McBSP%d Register\n" , mcbsp->id);
@@ -681,24 +681,24 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) base = mcbsp->io_base;/* if frame sync error - clear the error */ -if (readw (base +OMAP_MCBSP_REG_SPCR1 ) &RSYNC_ERR ) { +if (OMAP_MCBSP_READ (base,SPCR1 ) &RSYNC_ERR ) {/* clear error */ -writew (readw (base +OMAP_MCBSP_REG_SPCR1 ) & (~RSYNC_ERR ), - base +OMAP_MCBSP_REG_SPCR1 ); +OMAP_MCBSP_WRITE (base,SPCR1 , +OMAP_MCBSP_READ (base,SPCR1 ) & (~RSYNC_ERR ));/* resend */ return -1 ; }else {/* wait for recieve confirmation */ int attemps =0 ; -while (!(readw (base +OMAP_MCBSP_REG_SPCR1 ) &RRDY )) { +while (!(OMAP_MCBSP_READ (base,SPCR1 ) &RRDY )) {if (attemps++ >1000 ) { -writew (readw (base +OMAP_MCBSP_REG_SPCR1 ) & - (~RRST ), - base +OMAP_MCBSP_REG_SPCR1 ); +OMAP_MCBSP_WRITE (base,SPCR1 , +OMAP_MCBSP_READ (base,SPCR1 ) & + (~RRST ));udelay (10 ); -writew (readw (base +OMAP_MCBSP_REG_SPCR1 ) | - (RRST ), - base +OMAP_MCBSP_REG_SPCR1 ); +OMAP_MCBSP_WRITE (base,SPCR1 , +OMAP_MCBSP_READ (base,SPCR1 ) | + (RRST ));udelay (10 );dev_err (mcbsp->dev,"Could not read from" " McBSP%d Register\n" , mcbsp->id);
@@ -706,7 +706,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) } } } - *buf =readw (base +OMAP_MCBSP_REG_DRR1 ); + *buf =OMAP_MCBSP_READ (base,DRR1 );return 0 ; }
Tony Lindgren
maintainerPATCH 7/17 omap: McBSP: Modify macros/functions API for easy cache access
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
OMAP_MCBSP_READ()/_WRITE() macros and omap_mcbsp_read()/_write() functions accept McBSP register base address as an argument. In order to support caching, that must be replaced with an address of the omap_mcbsp structure that would provide addresses for both register AND cache access.
Since OMAP_ prefix seems obvious in macro names, drop it off in order to minimize line wrapping throughout the file.
Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with omap_3430sdp_defconfig.
--- arch/arm/plat-omap/mcbsp.c | 281 ++++++++++++++++++++------------------------ 1 files changed, 125 insertions(+), 156 deletions(-)
arch/arm/plat-omap/mcbsp.c +125 -156
@@ -30,26 +30,26 @@struct omap_mcbsp **mcbsp_ptr;int omap_mcbsp_count; -void omap_mcbsp_write (void __iomem *io_base,u16 reg,u32 val) +void omap_mcbsp_write (struct omap_mcbsp *mcbsp,u16 reg,u32 val) {if (cpu_class_is_omap1 () ||cpu_is_omap2420 ()) -__raw_writew ((u16 )val, io_base + reg); +__raw_writew ((u16 )val, mcbsp->io_base + reg);else -__raw_writel (val, io_base + reg); +__raw_writel (val, mcbsp->io_base + reg); } -int omap_mcbsp_read (void __iomem *io_base,u16 reg) +int omap_mcbsp_read (struct omap_mcbsp *mcbsp,u16 reg) {if (cpu_class_is_omap1 () ||cpu_is_omap2420 ()) -return __raw_readw (io_base + reg); +return __raw_readw (mcbsp->io_base + reg);else -return __raw_readl (io_base + reg); +return __raw_readl (mcbsp->io_base + reg); } -#define OMAP_MCBSP_READ (base, reg) \ - omap_mcbsp_read(base, OMAP_MCBSP_REG_##reg) -#define OMAP_MCBSP_WRITE (base, reg, val) \ - omap_mcbsp_write(base, OMAP_MCBSP_REG_##reg, val) +#define MCBSP_READ (mcbsp, reg) \ + omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg) +#define MCBSP_WRITE (mcbsp, reg, val) \ + omap_mcbsp_write(mcbsp, OMAP_MCBSP_REG_##reg, val)#define omap_mcbsp_check_valid_id (id) (id < omap_mcbsp_count)#define id_to_mcbsp_ptr (id) mcbsp_ptr[id];
@@ -60,31 +60,31 @@ static void omap_mcbsp_dump_reg(u8 id)dev_dbg (mcbsp->dev,"**** McBSP%d regs ****\n" , mcbsp->id);dev_dbg (mcbsp->dev,"DRR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,DRR2 )); +MCBSP_READ (mcbsp,DRR2 ));dev_dbg (mcbsp->dev,"DRR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,DRR1 )); +MCBSP_READ (mcbsp,DRR1 ));dev_dbg (mcbsp->dev,"DXR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,DXR2 )); +MCBSP_READ (mcbsp,DXR2 ));dev_dbg (mcbsp->dev,"DXR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,DXR1 )); +MCBSP_READ (mcbsp,DXR1 ));dev_dbg (mcbsp->dev,"SPCR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,SPCR2 )); +MCBSP_READ (mcbsp,SPCR2 ));dev_dbg (mcbsp->dev,"SPCR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,SPCR1 )); +MCBSP_READ (mcbsp,SPCR1 ));dev_dbg (mcbsp->dev,"RCR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,RCR2 )); +MCBSP_READ (mcbsp,RCR2 ));dev_dbg (mcbsp->dev,"RCR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,RCR1 )); +MCBSP_READ (mcbsp,RCR1 ));dev_dbg (mcbsp->dev,"XCR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,XCR2 )); +MCBSP_READ (mcbsp,XCR2 ));dev_dbg (mcbsp->dev,"XCR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,XCR1 )); +MCBSP_READ (mcbsp,XCR1 ));dev_dbg (mcbsp->dev,"SRGR2: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,SRGR2 )); +MCBSP_READ (mcbsp,SRGR2 ));dev_dbg (mcbsp->dev,"SRGR1: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,SRGR1 )); +MCBSP_READ (mcbsp,SRGR1 ));dev_dbg (mcbsp->dev,"PCR0: 0x%04x\n" , -OMAP_MCBSP_READ (mcbsp->io_base,PCR0 )); +MCBSP_READ (mcbsp,PCR0 ));dev_dbg (mcbsp->dev,"***********************\n" ); }
@@ -93,15 +93,14 @@ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)struct omap_mcbsp *mcbsp_tx = dev_id;u16 irqst_spcr2; - irqst_spcr2 =OMAP_MCBSP_READ (mcbsp_tx->io_base,SPCR2 ); + irqst_spcr2 =MCBSP_READ (mcbsp_tx,SPCR2 );dev_dbg (mcbsp_tx->dev,"TX IRQ callback : 0x%x\n" , irqst_spcr2);if (irqst_spcr2 &XSYNC_ERR ) {dev_err (mcbsp_tx->dev,"TX Frame Sync Error! : 0x%x\n" , irqst_spcr2);/* Writing zero to XSYNC_ERR clears the IRQ */ -OMAP_MCBSP_WRITE (mcbsp_tx->io_base,SPCR2 , - irqst_spcr2 & ~(XSYNC_ERR )); +MCBSP_WRITE (mcbsp_tx,SPCR2 , irqst_spcr2 & ~(XSYNC_ERR )); }else {complete (&mcbsp_tx->tx_irq_completion); }
@@ -114,15 +113,14 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)struct omap_mcbsp *mcbsp_rx = dev_id;u16 irqst_spcr1; - irqst_spcr1 =OMAP_MCBSP_READ (mcbsp_rx->io_base,SPCR1 ); + irqst_spcr1 =MCBSP_READ (mcbsp_rx,SPCR1 );dev_dbg (mcbsp_rx->dev,"RX IRQ callback : 0x%x\n" , irqst_spcr1);if (irqst_spcr1 &RSYNC_ERR ) {dev_err (mcbsp_rx->dev,"RX Frame Sync Error! : 0x%x\n" , irqst_spcr1);/* Writing zero to RSYNC_ERR clears the IRQ */ -OMAP_MCBSP_WRITE (mcbsp_rx->io_base,SPCR1 , - irqst_spcr1 & ~(RSYNC_ERR )); +MCBSP_WRITE (mcbsp_rx,SPCR1 , irqst_spcr1 & ~(RSYNC_ERR )); }else {complete (&mcbsp_rx->tx_irq_completion); }
@@ -135,7 +133,7 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data)struct omap_mcbsp *mcbsp_dma_tx = data;dev_dbg (mcbsp_dma_tx->dev,"TX DMA callback : 0x%x\n" , -OMAP_MCBSP_READ (mcbsp_dma_tx->io_base,SPCR2 )); +MCBSP_READ (mcbsp_dma_tx,SPCR2 ));/* We can free the channels */ omap_free_dma (mcbsp_dma_tx->dma_tx_lch);
@@ -149,7 +147,7 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)struct omap_mcbsp *mcbsp_dma_rx = data;dev_dbg (mcbsp_dma_rx->dev,"RX DMA callback : 0x%x\n" , -OMAP_MCBSP_READ (mcbsp_dma_rx->io_base,SPCR2 )); +MCBSP_READ (mcbsp_dma_rx,SPCR2 ));/* We can free the channels */ omap_free_dma (mcbsp_dma_rx->dma_rx_lch);
@@ -167,7 +165,6 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)void omap_mcbsp_config (unsigned int id,const struct omap_mcbsp_reg_cfg *config) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;if (!omap_mcbsp_check_valid_id (id)) {printk (KERN_ERR "%s: Invalid id (%d)\n" , __func__, id +1 );
@@ -175,25 +172,24 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base;dev_dbg (mcbsp->dev,"Configuring McBSP%d phys_base: 0x%08lx\n" , mcbsp->id, mcbsp->phys_base);/* We write the given config */ -OMAP_MCBSP_WRITE (io_base,SPCR2 , config->spcr2); -OMAP_MCBSP_WRITE (io_base,SPCR1 , config->spcr1); -OMAP_MCBSP_WRITE (io_base,RCR2 , config->rcr2); -OMAP_MCBSP_WRITE (io_base,RCR1 , config->rcr1); -OMAP_MCBSP_WRITE (io_base,XCR2 , config->xcr2); -OMAP_MCBSP_WRITE (io_base,XCR1 , config->xcr1); -OMAP_MCBSP_WRITE (io_base,SRGR2 , config->srgr2); -OMAP_MCBSP_WRITE (io_base,SRGR1 , config->srgr1); -OMAP_MCBSP_WRITE (io_base,MCR2 , config->mcr2); -OMAP_MCBSP_WRITE (io_base,MCR1 , config->mcr1); -OMAP_MCBSP_WRITE (io_base,PCR0 , config->pcr0); +MCBSP_WRITE (mcbsp,SPCR2 , config->spcr2); +MCBSP_WRITE (mcbsp,SPCR1 , config->spcr1); +MCBSP_WRITE (mcbsp,RCR2 , config->rcr2); +MCBSP_WRITE (mcbsp,RCR1 , config->rcr1); +MCBSP_WRITE (mcbsp,XCR2 , config->xcr2); +MCBSP_WRITE (mcbsp,XCR1 , config->xcr1); +MCBSP_WRITE (mcbsp,SRGR2 , config->srgr2); +MCBSP_WRITE (mcbsp,SRGR1 , config->srgr1); +MCBSP_WRITE (mcbsp,MCR2 , config->mcr2); +MCBSP_WRITE (mcbsp,MCR1 , config->mcr1); +MCBSP_WRITE (mcbsp,PCR0 , config->pcr0);if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ()) { -OMAP_MCBSP_WRITE (io_base,XCCR , config->xccr); -OMAP_MCBSP_WRITE (io_base,RCCR , config->rccr); +MCBSP_WRITE (mcbsp,XCCR , config->xccr); +MCBSP_WRITE (mcbsp,RCCR , config->rccr); } }EXPORT_SYMBOL (omap_mcbsp_config);
@@ -207,7 +203,6 @@ EXPORT_SYMBOL(omap_mcbsp_config);void omap_mcbsp_set_tx_threshold (unsigned int id,u16 threshold) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;if (!cpu_is_omap34xx ())return ;
@@ -217,9 +212,8 @@ void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold)return ; } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; -OMAP_MCBSP_WRITE (io_base,THRSH2 , threshold); +MCBSP_WRITE (mcbsp,THRSH2 , threshold); }EXPORT_SYMBOL (omap_mcbsp_set_tx_threshold);
@@ -231,7 +225,6 @@ EXPORT_SYMBOL(omap_mcbsp_set_tx_threshold);void omap_mcbsp_set_rx_threshold (unsigned int id,u16 threshold) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;if (!cpu_is_omap34xx ())return ;
@@ -241,9 +234,8 @@ void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold)return ; } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; -OMAP_MCBSP_WRITE (io_base,THRSH1 , threshold); +MCBSP_WRITE (mcbsp,THRSH1 , threshold); }EXPORT_SYMBOL (omap_mcbsp_set_rx_threshold);
@@ -313,19 +305,18 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp)if (cpu_is_omap34xx ()) {u16 syscon; - syscon =OMAP_MCBSP_READ (mcbsp->io_base,SYSCON ); + syscon =MCBSP_READ (mcbsp,SYSCON ); syscon &= ~(ENAWAKEUP |SIDLEMODE (0x03 ) |CLOCKACTIVITY (0x03 ));if (mcbsp->dma_op_mode ==MCBSP_DMA_MODE_THRESHOLD ) { syscon |= (ENAWAKEUP |SIDLEMODE (0x02 ) |CLOCKACTIVITY (0x02 )); -OMAP_MCBSP_WRITE (mcbsp->io_base,WAKEUPEN , -XRDYEN |RRDYEN ); +MCBSP_WRITE (mcbsp,WAKEUPEN ,XRDYEN |RRDYEN ); }else { syscon |=SIDLEMODE (0x01 ); } -OMAP_MCBSP_WRITE (mcbsp->io_base,SYSCON , syscon); +MCBSP_WRITE (mcbsp,SYSCON , syscon); } }
@@ -337,7 +328,7 @@ static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp)if (cpu_is_omap34xx ()) {u16 syscon; - syscon =OMAP_MCBSP_READ (mcbsp->io_base,SYSCON ); + syscon =MCBSP_READ (mcbsp,SYSCON ); syscon &= ~(ENAWAKEUP |SIDLEMODE (0x03 ) |CLOCKACTIVITY (0x03 ));/* * HW bug workaround - If no_idle mode is taken, we need to
@@ -345,12 +336,12 @@ static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp)* device will not hit retention anymore. */ syscon |=SIDLEMODE (0x02 ); -OMAP_MCBSP_WRITE (mcbsp->io_base,SYSCON , syscon); +MCBSP_WRITE (mcbsp,SYSCON , syscon); syscon &= ~(SIDLEMODE (0x03 )); -OMAP_MCBSP_WRITE (mcbsp->io_base,SYSCON , syscon); +MCBSP_WRITE (mcbsp,SYSCON , syscon); - OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, 0); + MCBSP_WRITE(mcbsp, WAKEUPEN, 0); } }#else
@@ -424,8 +415,8 @@ int omap_mcbsp_request(unsigned int id)* Make sure that transmitter, receiver and sample-rate generator are * not running before activating IRQs. */ -OMAP_MCBSP_WRITE (mcbsp->io_base,SPCR1 ,0 ); -OMAP_MCBSP_WRITE (mcbsp->io_base,SPCR2 ,0 ); +MCBSP_WRITE (mcbsp,SPCR1 ,0 ); +MCBSP_WRITE (mcbsp,SPCR2 ,0 );if (mcbsp->io_type ==OMAP_MCBSP_IRQ_IO ) {/* We need to get IRQs here */
@@ -515,7 +506,6 @@ EXPORT_SYMBOL(omap_mcbsp_free);void omap_mcbsp_start (unsigned int id,int tx,int rx) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;int idle;u16 w;
@@ -524,28 +514,26 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)return ; } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; - mcbsp->rx_word_length = (OMAP_MCBSP_READ (io_base,RCR1 ) >>5 ) &0x7 ; - mcbsp->tx_word_length = (OMAP_MCBSP_READ (io_base,XCR1 ) >>5 ) &0x7 ; + mcbsp->rx_word_length = (MCBSP_READ (mcbsp,RCR1 ) >>5 ) &0x7 ; + mcbsp->tx_word_length = (MCBSP_READ (mcbsp,XCR1 ) >>5 ) &0x7 ; - idle = !((OMAP_MCBSP_READ (io_base,SPCR2 ) | -OMAP_MCBSP_READ (io_base,SPCR1 )) &1 ); + idle = !((MCBSP_READ (mcbsp,SPCR2 ) |MCBSP_READ (mcbsp,SPCR1 )) &1 );if (idle) {/* Start the sample generator */ - w =OMAP_MCBSP_READ (io_base,SPCR2 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , w | (1 <<6 )); + w =MCBSP_READ (mcbsp,SPCR2 ); +MCBSP_WRITE (mcbsp,SPCR2 , w | (1 <<6 )); }/* Enable transmitter and receiver */ tx &=1 ; - w =OMAP_MCBSP_READ (io_base,SPCR2 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , w | tx); + w =MCBSP_READ (mcbsp,SPCR2 ); +MCBSP_WRITE (mcbsp,SPCR2 , w | tx); rx &=1 ; - w =OMAP_MCBSP_READ (io_base,SPCR1 ); -OMAP_MCBSP_WRITE (io_base,SPCR1 , w | rx); + w =MCBSP_READ (mcbsp,SPCR1 ); +MCBSP_WRITE (mcbsp,SPCR1 , w | rx);/* * Worst case: CLKSRG*2 = 8000khz: (1/8000) * 2 * 2 usec
@@ -557,18 +545,18 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)if (idle) {/* Start frame sync */ - w =OMAP_MCBSP_READ (io_base,SPCR2 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , w | (1 <<7 )); + w =MCBSP_READ (mcbsp,SPCR2 ); +MCBSP_WRITE (mcbsp,SPCR2 , w | (1 <<7 )); }if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) {/* Release the transmitter and receiver */ - w =OMAP_MCBSP_READ (io_base,XCCR ); + w =MCBSP_READ (mcbsp,XCCR ); w &= ~(tx ?XDISABLE :0 ); -OMAP_MCBSP_WRITE (io_base,XCCR , w); - w =OMAP_MCBSP_READ (io_base,RCCR ); +MCBSP_WRITE (mcbsp,XCCR , w); + w =MCBSP_READ (mcbsp,RCCR ); w &= ~(rx ?RDISABLE :0 ); -OMAP_MCBSP_WRITE (io_base,RCCR , w); +MCBSP_WRITE (mcbsp,RCCR , w); }/* Dump McBSP Regs */
@@ -579,7 +567,6 @@ EXPORT_SYMBOL(omap_mcbsp_start);void omap_mcbsp_stop (unsigned int id,int tx,int rx) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;int idle;u16 w;
@@ -589,35 +576,33 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx) } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base;/* Reset transmitter */ tx &=1 ;if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) { - w =OMAP_MCBSP_READ (io_base,XCCR ); + w =MCBSP_READ (mcbsp,XCCR ); w |= (tx ?XDISABLE :0 ); -OMAP_MCBSP_WRITE (io_base,XCCR , w); +MCBSP_WRITE (mcbsp,XCCR , w); } - w =OMAP_MCBSP_READ (io_base,SPCR2 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , w & ~tx); + w =MCBSP_READ (mcbsp,SPCR2 ); +MCBSP_WRITE (mcbsp,SPCR2 , w & ~tx);/* Reset receiver */ rx &=1 ;if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) { - w =OMAP_MCBSP_READ (io_base,RCCR ); + w =MCBSP_READ (mcbsp,RCCR ); w |= (rx ?RDISABLE :0 ); -OMAP_MCBSP_WRITE (io_base,RCCR , w); +MCBSP_WRITE (mcbsp,RCCR , w); } - w =OMAP_MCBSP_READ (io_base,SPCR1 ); -OMAP_MCBSP_WRITE (io_base,SPCR1 , w & ~rx); + w =MCBSP_READ (mcbsp,SPCR1 ); +MCBSP_WRITE (mcbsp,SPCR1 , w & ~rx); - idle = !((OMAP_MCBSP_READ (io_base,SPCR2 ) | -OMAP_MCBSP_READ (io_base,SPCR1 )) &1 ); + idle = !((MCBSP_READ (mcbsp,SPCR2 ) |MCBSP_READ (mcbsp,SPCR1 )) &1 );if (idle) {/* Reset the sample rate generator */ - w =OMAP_MCBSP_READ (io_base,SPCR2 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , w & ~(1 <<6 )); + w =MCBSP_READ (mcbsp,SPCR2 ); +MCBSP_WRITE (mcbsp,SPCR2 , w & ~(1 <<6 )); } }EXPORT_SYMBOL (omap_mcbsp_stop);
@@ -626,7 +611,6 @@ EXPORT_SYMBOL(omap_mcbsp_stop);int omap_mcbsp_pollwrite (unsigned int id,u16 buf) {struct omap_mcbsp *mcbsp; -void __iomem *base;if (!omap_mcbsp_check_valid_id (id)) {printk (KERN_ERR "%s: Invalid id (%d)\n" , __func__, id +1 );
@@ -634,28 +618,25 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) } mcbsp =id_to_mcbsp_ptr (id); - base = mcbsp->io_base; -OMAP_MCBSP_WRITE (base,DXR1 , buf); +MCBSP_WRITE (mcbsp,DXR1 , buf);/* if frame sync error - clear the error */ -if (OMAP_MCBSP_READ (base,SPCR2 ) &XSYNC_ERR ) { +if (MCBSP_READ (mcbsp,SPCR2 ) &XSYNC_ERR ) {/* clear error */ -OMAP_MCBSP_WRITE (base,SPCR2 , -OMAP_MCBSP_READ (base,SPCR2 ) & (~XSYNC_ERR )); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ (mcbsp,SPCR2 ) & (~XSYNC_ERR ));/* resend */ return -1 ; }else {/* wait for transmit confirmation */ int attemps =0 ; -while (!(OMAP_MCBSP_READ (base,SPCR2 ) &XRDY )) { +while (!(MCBSP_READ (mcbsp,SPCR2 ) &XRDY )) {if (attemps++ >1000 ) { -OMAP_MCBSP_WRITE (base,SPCR2 , -OMAP_MCBSP_READ (base,SPCR2 ) & - (~XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ (mcbsp,SPCR2 ) & (~XRST ));udelay (10 ); -OMAP_MCBSP_WRITE (base,SPCR2 , -OMAP_MCBSP_READ (base,SPCR2 ) | - (XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ (mcbsp,SPCR2 ) | (XRST ));udelay (10 );dev_err (mcbsp->dev,"Could not write to" " McBSP%d Register\n" , mcbsp->id);
@@ -671,7 +652,6 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite);int omap_mcbsp_pollread (unsigned int id,u16 *buf) {struct omap_mcbsp *mcbsp; -void __iomem *base;if (!omap_mcbsp_check_valid_id (id)) {printk (KERN_ERR "%s: Invalid id (%d)\n" , __func__, id +1 );
@@ -679,26 +659,23 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) } mcbsp =id_to_mcbsp_ptr (id); - base = mcbsp->io_base;/* if frame sync error - clear the error */ -if (OMAP_MCBSP_READ (base,SPCR1 ) &RSYNC_ERR ) { +if (MCBSP_READ (mcbsp,SPCR1 ) &RSYNC_ERR ) {/* clear error */ -OMAP_MCBSP_WRITE (base,SPCR1 , -OMAP_MCBSP_READ (base,SPCR1 ) & (~RSYNC_ERR )); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ (mcbsp,SPCR1 ) & (~RSYNC_ERR ));/* resend */ return -1 ; }else {/* wait for recieve confirmation */ int attemps =0 ; -while (!(OMAP_MCBSP_READ (base,SPCR1 ) &RRDY )) { +while (!(MCBSP_READ (mcbsp,SPCR1 ) &RRDY )) {if (attemps++ >1000 ) { -OMAP_MCBSP_WRITE (base,SPCR1 , -OMAP_MCBSP_READ (base,SPCR1 ) & - (~RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ (mcbsp,SPCR1 ) & (~RRST ));udelay (10 ); -OMAP_MCBSP_WRITE (base,SPCR1 , -OMAP_MCBSP_READ (base,SPCR1 ) | - (RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ (mcbsp,SPCR1 ) | (RRST ));udelay (10 );dev_err (mcbsp->dev,"Could not read from" " McBSP%d Register\n" , mcbsp->id);
@@ -706,7 +683,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) } } } - *buf =OMAP_MCBSP_READ (base,DRR1 ); + *buf =MCBSP_READ (mcbsp,DRR1 );return 0 ; }
@@ -718,7 +695,6 @@ EXPORT_SYMBOL(omap_mcbsp_pollread);void omap_mcbsp_xmit_word (unsigned int id,u32 word) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;omap_mcbsp_word_length word_length;if (!omap_mcbsp_check_valid_id (id)) {
@@ -727,21 +703,19 @@ void omap_mcbsp_xmit_word(unsigned int id, u32 word) } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; word_length = mcbsp->tx_word_length;wait_for_completion (&mcbsp->tx_irq_completion);if (word_length >OMAP_MCBSP_WORD_16 ) -OMAP_MCBSP_WRITE (io_base,DXR2 , word >>16 ); -OMAP_MCBSP_WRITE (io_base,DXR1 , word &0xffff ); +MCBSP_WRITE (mcbsp,DXR2 , word >>16 ); +MCBSP_WRITE (mcbsp,DXR1 , word &0xffff ); }EXPORT_SYMBOL (omap_mcbsp_xmit_word);u32 omap_mcbsp_recv_word (unsigned int id) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;u16 word_lsb, word_msb =0 ;omap_mcbsp_word_length word_length;
@@ -752,13 +726,12 @@ u32 omap_mcbsp_recv_word(unsigned int id) mcbsp =id_to_mcbsp_ptr (id); word_length = mcbsp->rx_word_length; - io_base = mcbsp->io_base;wait_for_completion (&mcbsp->rx_irq_completion);if (word_length >OMAP_MCBSP_WORD_16 ) - word_msb =OMAP_MCBSP_READ (io_base,DRR2 ); - word_lsb =OMAP_MCBSP_READ (io_base,DRR1 ); + word_msb =MCBSP_READ (mcbsp,DRR2 ); + word_lsb =MCBSP_READ (mcbsp,DRR1 );return (word_lsb | (word_msb <<16 )); }
@@ -767,7 +740,6 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word);int omap_mcbsp_spi_master_xmit_word_poll (unsigned int id,u32 word) {struct omap_mcbsp *mcbsp; -void __iomem *io_base;omap_mcbsp_word_length tx_word_length;omap_mcbsp_word_length rx_word_length;u16 spcr2, spcr1, attempts =0 , word_lsb, word_msb =0 ;
@@ -777,7 +749,6 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)return -ENODEV ; } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; tx_word_length = mcbsp->tx_word_length; rx_word_length = mcbsp->rx_word_length;
@@ -785,14 +756,14 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)return -EINVAL ;/* First we wait for the transmitter to be ready */ - spcr2 =OMAP_MCBSP_READ (io_base,SPCR2 ); + spcr2 =MCBSP_READ (mcbsp,SPCR2 );while (!(spcr2 &XRDY )) { - spcr2 =OMAP_MCBSP_READ (io_base,SPCR2 ); + spcr2 =MCBSP_READ (mcbsp,SPCR2 );if (attempts++ >1000 ) {/* We must reset the transmitter */ -OMAP_MCBSP_WRITE (io_base,SPCR2 , spcr2 & (~XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , spcr2 & (~XRST ));udelay (10 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , spcr2 |XRST ); +MCBSP_WRITE (mcbsp,SPCR2 , spcr2 |XRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d transmitter not " "ready\n" , mcbsp->id);
@@ -802,18 +773,18 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)/* Now we can push the data */ if (tx_word_length >OMAP_MCBSP_WORD_16 ) -OMAP_MCBSP_WRITE (io_base,DXR2 , word >>16 ); -OMAP_MCBSP_WRITE (io_base,DXR1 , word &0xffff ); +MCBSP_WRITE (mcbsp,DXR2 , word >>16 ); +MCBSP_WRITE (mcbsp,DXR1 , word &0xffff );/* We wait for the receiver to be ready */ - spcr1 =OMAP_MCBSP_READ (io_base,SPCR1 ); + spcr1 =MCBSP_READ (mcbsp,SPCR1 );while (!(spcr1 &RRDY )) { - spcr1 =OMAP_MCBSP_READ (io_base,SPCR1 ); + spcr1 =MCBSP_READ (mcbsp,SPCR1 );if (attempts++ >1000 ) {/* We must reset the receiver */ -OMAP_MCBSP_WRITE (io_base,SPCR1 , spcr1 & (~RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , spcr1 & (~RRST ));udelay (10 ); -OMAP_MCBSP_WRITE (io_base,SPCR1 , spcr1 |RRST ); +MCBSP_WRITE (mcbsp,SPCR1 , spcr1 |RRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d receiver not " "ready\n" , mcbsp->id);
@@ -823,8 +794,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)/* Receiver is ready, let's read the dummy data */ if (rx_word_length >OMAP_MCBSP_WORD_16 ) - word_msb =OMAP_MCBSP_READ (io_base,DRR2 ); - word_lsb =OMAP_MCBSP_READ (io_base,DRR1 ); + word_msb =MCBSP_READ (mcbsp,DRR2 ); + word_lsb =MCBSP_READ (mcbsp,DRR1 );return 0 ; }
@@ -834,7 +805,6 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) {struct omap_mcbsp *mcbsp;u32 clock_word =0 ; -void __iomem *io_base;omap_mcbsp_word_length tx_word_length;omap_mcbsp_word_length rx_word_length;u16 spcr2, spcr1, attempts =0 , word_lsb, word_msb =0 ;
@@ -845,7 +815,6 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) } mcbsp =id_to_mcbsp_ptr (id); - io_base = mcbsp->io_base; tx_word_length = mcbsp->tx_word_length; rx_word_length = mcbsp->rx_word_length;
@@ -854,14 +823,14 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)return -EINVAL ;/* First we wait for the transmitter to be ready */ - spcr2 =OMAP_MCBSP_READ (io_base,SPCR2 ); + spcr2 =MCBSP_READ (mcbsp,SPCR2 );while (!(spcr2 &XRDY )) { - spcr2 =OMAP_MCBSP_READ (io_base,SPCR2 ); + spcr2 =MCBSP_READ (mcbsp,SPCR2 );if (attempts++ >1000 ) {/* We must reset the transmitter */ -OMAP_MCBSP_WRITE (io_base,SPCR2 , spcr2 & (~XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , spcr2 & (~XRST ));udelay (10 ); -OMAP_MCBSP_WRITE (io_base,SPCR2 , spcr2 |XRST ); +MCBSP_WRITE (mcbsp,SPCR2 , spcr2 |XRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d transmitter not " "ready\n" , mcbsp->id);
@@ -871,18 +840,18 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)/* We first need to enable the bus clock */ if (tx_word_length >OMAP_MCBSP_WORD_16 ) -OMAP_MCBSP_WRITE (io_base,DXR2 , clock_word >>16 ); -OMAP_MCBSP_WRITE (io_base,DXR1 , clock_word &0xffff ); +MCBSP_WRITE (mcbsp,DXR2 , clock_word >>16 ); +MCBSP_WRITE (mcbsp,DXR1 , clock_word &0xffff );/* We wait for the receiver to be ready */ - spcr1 =OMAP_MCBSP_READ (io_base,SPCR1 ); + spcr1 =MCBSP_READ (mcbsp,SPCR1 );while (!(spcr1 &RRDY )) { - spcr1 =OMAP_MCBSP_READ (io_base,SPCR1 ); + spcr1 =MCBSP_READ (mcbsp,SPCR1 );if (attempts++ >1000 ) {/* We must reset the receiver */ -OMAP_MCBSP_WRITE (io_base,SPCR1 , spcr1 & (~RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , spcr1 & (~RRST ));udelay (10 ); -OMAP_MCBSP_WRITE (io_base,SPCR1 , spcr1 |RRST ); +MCBSP_WRITE (mcbsp,SPCR1 , spcr1 |RRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d receiver not " "ready\n" , mcbsp->id);
@@ -892,8 +861,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)/* Receiver is ready, there is something for us */ if (rx_word_length >OMAP_MCBSP_WORD_16 ) - word_msb =OMAP_MCBSP_READ (io_base,DRR2 ); - word_lsb =OMAP_MCBSP_READ (io_base,DRR1 ); + word_msb =MCBSP_READ (mcbsp,DRR2 ); + word_lsb =MCBSP_READ (mcbsp,DRR1 ); word[0 ] = (word_lsb | (word_msb <<16 ));
Tony Lindgren
maintainerPATCH 8/17 omap: McBSP: Introduce caching in register write operations
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
Determine cache size required per McBSP port at init time, based on processor type running on.
Allocate space for storing cached copies of McBSP register values at port request.
Modify omap_msbcp_write() function to update the cache with every register write operation.
Modify omap_mcbsp_read() to support reading from cache or hardware.
Update MCBSP_READ() macro for modified omap_mcbsp_read() function API.
Introduce a new macro that reads from the cache.
Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with: omap_perseus2_730_defconfig, omap_generic_1610_defconfig, omap_generic_2420_defconfig, omap_2430sdp_defconfig, omap_3430sdp_defconfig, omap_4430sdp_defconfig with CONFIG_OMAP_MCBSP=y selected.
--- arch/arm/mach-omap1/mcbsp.c | 16 +++++- arch/arm/mach-omap2/mcbsp.c | 20 ++++++-- arch/arm/plat-omap/include/plat/mcbsp.h | 3 + arch/arm/plat-omap/mcbsp.c | 77 +++++++++++++++++++++---------- 4 files changed, 84 insertions(+), 32 deletions(-)
arch/arm/mach-omap1/mcbsp.c +13 -3
@@ -99,9 +99,11 @@ static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = { }, };#define OMAP7XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap7xx_mcbsp_pdata) +#define OMAP7XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)#else #define omap7xx_mcbsp_pdata NULL#define OMAP7XX_MCBSP_PDATA_SZ 0 +#define OMAP7XX_MCBSP_REG_NUM 0#endif #ifdef CONFIG_ARCH_OMAP15XX
@@ -132,9 +134,11 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { }, };#define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata) +#define OMAP15XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)#else #define omap15xx_mcbsp_pdata NULL#define OMAP15XX_MCBSP_PDATA_SZ 0 +#define OMAP15XX_MCBSP_REG_NUM 0#endif #ifdef CONFIG_ARCH_OMAP16XX
@@ -165,19 +169,25 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { }, };#define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata) +#define OMAP16XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)#else #define omap16xx_mcbsp_pdata NULL#define OMAP16XX_MCBSP_PDATA_SZ 0 +#define OMAP16XX_MCBSP_REG_NUM 0#endif int __init omap1_mcbsp_init (void ) { -if (cpu_is_omap7xx ()) +if (cpu_is_omap7xx ()) { omap_mcbsp_count =OMAP7XX_MCBSP_PDATA_SZ ; -if (cpu_is_omap15xx ()) + omap_mcbsp_cache_size =OMAP7XX_MCBSP_REG_NUM *sizeof (u16); + }else if (cpu_is_omap15xx ()) { omap_mcbsp_count =OMAP15XX_MCBSP_PDATA_SZ ; -if (cpu_is_omap16xx ()) + omap_mcbsp_cache_size =OMAP15XX_MCBSP_REG_NUM *sizeof (u16); + }else if (cpu_is_omap16xx ()) { omap_mcbsp_count =OMAP16XX_MCBSP_PDATA_SZ ; + omap_mcbsp_cache_size =OMAP16XX_MCBSP_REG_NUM *sizeof (u16); + } mcbsp_ptr =kzalloc (omap_mcbsp_count *sizeof (struct omap_mcbsp *),GFP_KERNEL );
arch/arm/mach-omap2/mcbsp.c +16 -4
@@ -65,9 +65,11 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { }, };#define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata) +#define OMAP2420_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)#else #define omap2420_mcbsp_pdata NULL#define OMAP2420_MCBSP_PDATA_SZ 0 +#define OMAP2420_MCBSP_REG_NUM 0#endif #ifdef CONFIG_ARCH_OMAP2430
@@ -114,9 +116,11 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { }, };#define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata) +#define OMAP2430_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)#else #define omap2430_mcbsp_pdata NULL#define OMAP2430_MCBSP_PDATA_SZ 0 +#define OMAP2430_MCBSP_REG_NUM 0#endif #ifdef CONFIG_ARCH_OMAP3
@@ -168,9 +172,11 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { }, };#define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) +#define OMAP34XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)#else #define omap34xx_mcbsp_pdata NULL#define OMAP34XX_MCBSP_PDATA_SZ 0 +#define OMAP34XX_MCBSP_REG_NUM 0#endif static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
@@ -208,17 +214,23 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = { }, };#define OMAP44XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap44xx_mcbsp_pdata) +#define OMAP44XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)static int __init omap2_mcbsp_init (void ) { -if (cpu_is_omap2420 ()) +if (cpu_is_omap2420 ()) { omap_mcbsp_count =OMAP2420_MCBSP_PDATA_SZ ; -if (cpu_is_omap2430 ()) + omap_mcbsp_cache_size =OMAP2420_MCBSP_REG_NUM *sizeof (u16); + }else if (cpu_is_omap2430 ()) { omap_mcbsp_count =OMAP2430_MCBSP_PDATA_SZ ; -if (cpu_is_omap34xx ()) + omap_mcbsp_cache_size =OMAP2430_MCBSP_REG_NUM *sizeof (u32); + }else if (cpu_is_omap34xx ()) { omap_mcbsp_count =OMAP34XX_MCBSP_PDATA_SZ ; -if (cpu_is_omap44xx ()) + omap_mcbsp_cache_size =OMAP34XX_MCBSP_REG_NUM *sizeof (u32); + }else if (cpu_is_omap44xx ()) { omap_mcbsp_count =OMAP44XX_MCBSP_PDATA_SZ ; + omap_mcbsp_cache_size =OMAP44XX_MCBSP_REG_NUM *sizeof (u32); + } mcbsp_ptr =kzalloc (omap_mcbsp_count *sizeof (struct omap_mcbsp *),GFP_KERNEL );
arch/arm/plat-omap/include/plat/mcbsp.h +2 -1
@@ -414,9 +414,10 @@ struct omap_mcbsp {u16 max_tx_thres;u16 max_rx_thres;#endif +void *reg_cache; };extern struct omap_mcbsp **mcbsp_ptr; -extern int omap_mcbsp_count; +extern int omap_mcbsp_count, omap_mcbsp_cache_size;int omap_mcbsp_init (void ); void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
arch/arm/plat-omap/mcbsp.c +53 -24
154 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 9/17 omap: McBSP: Use cache when modifying individual register bits
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
Change the way McBSP registers are updated: use cached values instead of relying upon those read back from the device.
With this patch, I have finally managed to get rid of all random playback/recording hangups on my OMAP1510 based Amstrad Delta hardware. Before that, values read back from McBSP registers to be used for updating them happened to be errornous.
Quoted 1 line
From the hardware side, the issue appeared to be caused by a relatively high
power requirements of an external USB adapter connected to the board's printer dedicated USB port.
I think there is one important point that makes this patch worth of applying, apart from my hardware quality. With the current code, if it ever happens to any machine, no matter if OMAP1510 or newer, to read incorrect value from a McBSP register, this wrong value will get written back without any checking. That can lead to hardware damage if, for example, an input pin is turned into output as a result.
Applies on top of patch 3 from this series:
[PATCH v9 3/4] OMAP: McBSP: Introduce caching in register write operations
Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with omap_3430sdp_defconfig.
--- arch/arm/plat-omap/mcbsp.c | 78 +++++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 31 deletions(-)
arch/arm/plat-omap/mcbsp.c +47 -31
@@ -114,7 +114,8 @@ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)dev_err (mcbsp_tx->dev,"TX Frame Sync Error! : 0x%x\n" , irqst_spcr2);/* Writing zero to XSYNC_ERR clears the IRQ */ -MCBSP_WRITE (mcbsp_tx,SPCR2 , irqst_spcr2 & ~(XSYNC_ERR )); +MCBSP_WRITE (mcbsp_tx,SPCR2 , +MCBSP_READ_CACHE (mcbsp_tx,SPCR2 ) & ~(XSYNC_ERR )); }else {complete (&mcbsp_tx->tx_irq_completion); }
@@ -134,7 +135,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)dev_err (mcbsp_rx->dev,"RX Frame Sync Error! : 0x%x\n" , irqst_spcr1);/* Writing zero to RSYNC_ERR clears the IRQ */ -MCBSP_WRITE (mcbsp_rx,SPCR1 , irqst_spcr1 & ~(RSYNC_ERR )); +MCBSP_WRITE (mcbsp_rx,SPCR1 , +MCBSP_READ_CACHE (mcbsp_rx,SPCR1 ) & ~(RSYNC_ERR )); }else {complete (&mcbsp_rx->tx_irq_completion); }
@@ -544,24 +546,25 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx) } mcbsp =id_to_mcbsp_ptr (id); - mcbsp->rx_word_length = (MCBSP_READ (mcbsp,RCR1 ) >>5 ) &0x7 ; - mcbsp->tx_word_length = (MCBSP_READ (mcbsp,XCR1 ) >>5 ) &0x7 ; + mcbsp->rx_word_length = (MCBSP_READ_CACHE (mcbsp,RCR1 ) >>5 ) &0x7 ; + mcbsp->tx_word_length = (MCBSP_READ_CACHE (mcbsp,XCR1 ) >>5 ) &0x7 ; - idle = !((MCBSP_READ (mcbsp,SPCR2 ) |MCBSP_READ (mcbsp,SPCR1 )) &1 ); + idle = !((MCBSP_READ_CACHE (mcbsp,SPCR2 ) | +MCBSP_READ_CACHE (mcbsp,SPCR1 )) &1 );if (idle) {/* Start the sample generator */ - w =MCBSP_READ (mcbsp,SPCR2 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR2 );MCBSP_WRITE (mcbsp,SPCR2 , w | (1 <<6 )); }/* Enable transmitter and receiver */ tx &=1 ; - w =MCBSP_READ (mcbsp,SPCR2 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR2 );MCBSP_WRITE (mcbsp,SPCR2 , w | tx); rx &=1 ; - w =MCBSP_READ (mcbsp,SPCR1 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR1 );MCBSP_WRITE (mcbsp,SPCR1 , w | rx);/*
@@ -574,16 +577,16 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)if (idle) {/* Start frame sync */ - w =MCBSP_READ (mcbsp,SPCR2 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR2 );MCBSP_WRITE (mcbsp,SPCR2 , w | (1 <<7 )); }if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) {/* Release the transmitter and receiver */ - w =MCBSP_READ (mcbsp,XCCR ); + w =MCBSP_READ_CACHE (mcbsp,XCCR ); w &= ~(tx ?XDISABLE :0 );MCBSP_WRITE (mcbsp,XCCR , w); - w =MCBSP_READ (mcbsp,RCCR ); + w =MCBSP_READ_CACHE (mcbsp,RCCR ); w &= ~(rx ?RDISABLE :0 );MCBSP_WRITE (mcbsp,RCCR , w); }
@@ -609,28 +612,29 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx)/* Reset transmitter */ tx &=1 ;if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) { - w =MCBSP_READ (mcbsp,XCCR ); + w =MCBSP_READ_CACHE (mcbsp,XCCR ); w |= (tx ?XDISABLE :0 );MCBSP_WRITE (mcbsp,XCCR , w); } - w =MCBSP_READ (mcbsp,SPCR2 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR2 );MCBSP_WRITE (mcbsp,SPCR2 , w & ~tx);/* Reset receiver */ rx &=1 ;if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) { - w =MCBSP_READ (mcbsp,RCCR ); + w =MCBSP_READ_CACHE (mcbsp,RCCR ); w |= (rx ?RDISABLE :0 );MCBSP_WRITE (mcbsp,RCCR , w); } - w =MCBSP_READ (mcbsp,SPCR1 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR1 );MCBSP_WRITE (mcbsp,SPCR1 , w & ~rx); - idle = !((MCBSP_READ (mcbsp,SPCR2 ) |MCBSP_READ (mcbsp,SPCR1 )) &1 ); + idle = !((MCBSP_READ_CACHE (mcbsp,SPCR2 ) | +MCBSP_READ_CACHE (mcbsp,SPCR1 )) &1 );if (idle) {/* Reset the sample rate generator */ - w =MCBSP_READ (mcbsp,SPCR2 ); + w =MCBSP_READ_CACHE (mcbsp,SPCR2 );MCBSP_WRITE (mcbsp,SPCR2 , w & ~(1 <<6 )); } }
@@ -653,7 +657,7 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)if (MCBSP_READ (mcbsp,SPCR2 ) &XSYNC_ERR ) {/* clear error */ MCBSP_WRITE (mcbsp,SPCR2 , -MCBSP_READ (mcbsp,SPCR2 ) & (~XSYNC_ERR )); +MCBSP_READ_CACHE (mcbsp,SPCR2 ) & (~XSYNC_ERR ));/* resend */ return -1 ; }else {
@@ -662,10 +666,12 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)while (!(MCBSP_READ (mcbsp,SPCR2 ) &XRDY )) {if (attemps++ >1000 ) {MCBSP_WRITE (mcbsp,SPCR2 , -MCBSP_READ (mcbsp,SPCR2 ) & (~XRST )); +MCBSP_READ_CACHE (mcbsp,SPCR2 ) & + (~XRST ));udelay (10 );MCBSP_WRITE (mcbsp,SPCR2 , -MCBSP_READ (mcbsp,SPCR2 ) | (XRST )); +MCBSP_READ_CACHE (mcbsp,SPCR2 ) | + (XRST ));udelay (10 );dev_err (mcbsp->dev,"Could not write to" " McBSP%d Register\n" , mcbsp->id);
@@ -692,7 +698,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)if (MCBSP_READ (mcbsp,SPCR1 ) &RSYNC_ERR ) {/* clear error */ MCBSP_WRITE (mcbsp,SPCR1 , -MCBSP_READ (mcbsp,SPCR1 ) & (~RSYNC_ERR )); +MCBSP_READ_CACHE (mcbsp,SPCR1 ) & (~RSYNC_ERR ));/* resend */ return -1 ; }else {
@@ -701,10 +707,12 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)while (!(MCBSP_READ (mcbsp,SPCR1 ) &RRDY )) {if (attemps++ >1000 ) {MCBSP_WRITE (mcbsp,SPCR1 , -MCBSP_READ (mcbsp,SPCR1 ) & (~RRST )); +MCBSP_READ_CACHE (mcbsp,SPCR1 ) & + (~RRST ));udelay (10 );MCBSP_WRITE (mcbsp,SPCR1 , -MCBSP_READ (mcbsp,SPCR1 ) | (RRST )); +MCBSP_READ_CACHE (mcbsp,SPCR1 ) | + (RRST ));udelay (10 );dev_err (mcbsp->dev,"Could not read from" " McBSP%d Register\n" , mcbsp->id);
@@ -790,9 +798,11 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) spcr2 =MCBSP_READ (mcbsp,SPCR2 );if (attempts++ >1000 ) {/* We must reset the transmitter */ -MCBSP_WRITE (mcbsp,SPCR2 , spcr2 & (~XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ_CACHE (mcbsp,SPCR2 ) & (~XRST ));udelay (10 ); -MCBSP_WRITE (mcbsp,SPCR2 , spcr2 |XRST ); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ_CACHE (mcbsp,SPCR2 ) |XRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d transmitter not " "ready\n" , mcbsp->id);
@@ -811,9 +821,11 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) spcr1 =MCBSP_READ (mcbsp,SPCR1 );if (attempts++ >1000 ) {/* We must reset the receiver */ -MCBSP_WRITE (mcbsp,SPCR1 , spcr1 & (~RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ_CACHE (mcbsp,SPCR1 ) & (~RRST ));udelay (10 ); -MCBSP_WRITE (mcbsp,SPCR1 , spcr1 |RRST ); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ_CACHE (mcbsp,SPCR1 ) |RRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d receiver not " "ready\n" , mcbsp->id);
@@ -857,9 +869,11 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) spcr2 =MCBSP_READ (mcbsp,SPCR2 );if (attempts++ >1000 ) {/* We must reset the transmitter */ -MCBSP_WRITE (mcbsp,SPCR2 , spcr2 & (~XRST )); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ_CACHE (mcbsp,SPCR2 ) & (~XRST ));udelay (10 ); -MCBSP_WRITE (mcbsp,SPCR2 , spcr2 |XRST ); +MCBSP_WRITE (mcbsp,SPCR2 , +MCBSP_READ_CACHE (mcbsp,SPCR2 ) |XRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d transmitter not " "ready\n" , mcbsp->id);
@@ -878,9 +892,11 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) spcr1 =MCBSP_READ (mcbsp,SPCR1 );if (attempts++ >1000 ) {/* We must reset the receiver */ -MCBSP_WRITE (mcbsp,SPCR1 , spcr1 & (~RRST )); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ_CACHE (mcbsp,SPCR1 ) & (~RRST ));udelay (10 ); -MCBSP_WRITE (mcbsp,SPCR1 , spcr1 |RRST ); +MCBSP_WRITE (mcbsp,SPCR1 , +MCBSP_READ_CACHE (mcbsp,SPCR1 ) |RRST );udelay (10 );dev_err (mcbsp->dev,"McBSP%d receiver not " "ready\n" , mcbsp->id);
Tony Lindgren
maintainerPATCH 10/17 omap1: mailbox: kill compile warning
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
use ioremap and remove unused variable to get rid
of compile warnings.
--- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/mailbox.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/arm/mach-omap1/devices.c +1 -1
@@ -73,7 +73,7 @@ static inline void omap_init_rtc(void) {}# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1#endif -#define OMAP1_MBOX_BASE OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE) +#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASEstatic struct resource mbox_resources[] = { {
arch/arm/mach-omap1/mailbox.c +7 -2
@@ -146,7 +146,6 @@ EXPORT_SYMBOL(mbox_dsp_info);static int __devinit omap1_mbox_probe (struct platform_device *pdev) {struct resource *res; -int ret =0 ;if (pdev->num_resources !=2 ) { dev_err(&pdev->dev, "invalid number of resources: %d\n",
@@ -160,12 +159,18 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)dev_err (&pdev->dev,"invalid mem resource\n" );return -ENODEV ; } - mbox_base = res->start; + + mbox_base =ioremap (res->start,resource_size (res)); +if (!mbox_base) { +dev_err (&pdev->dev,"ioremap failed\n" ); +return -ENODEV ; + }/* DSP IRQ */ res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (unlikely (!res)) {dev_err (&pdev->dev,"invalid irq resource\n" ); +iounmap (mbox_base);return -ENODEV ; } mbox_dsp_info.irq = res->start;
Tony Lindgren
maintainerPATCH 11/17 omap2/3/4: mailbox: kill compile warning in mailbox.c
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
Change %d to %ld to avoid the compile warning.
--- arch/arm/mach-omap2/mailbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/mailbox.c +1 -1
@@ -93,7 +93,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) mbox_ick_handle =clk_get (NULL ,"mailboxes_ick" );if (IS_ERR (mbox_ick_handle)) { -printk (KERN_ERR "Could not get mailboxes_ick: %d\n" , +printk (KERN_ERR "Could not get mailboxes_ick: %ld\n" ,PTR_ERR (mbox_ick_handle));return PTR_ERR (mbox_ick_handle); }
Tony Lindgren
maintainerPATCH 12/17 omap2/3/4: gpmc: kill compile warning
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
Get rid of the following warnings:
arch/arm/mach-omap2/gpmc.c:550:30: warning: non-ANSI function declaration of function 'omap3_gpmc_save_context'
arch/arm/mach-omap2/gpmc.c:581:33: warning: non-ANSI function declaration of function 'omap3_gpmc_restore_context'
--- arch/arm/mach-omap2/gpmc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/gpmc.c +4 -2
@@ -552,9 +552,10 @@ void __init gpmc_init(void)#ifdef CONFIG_ARCH_OMAP3 static struct omap3_gpmc_regs gpmc_context; -void omap3_gpmc_save_context () +void omap3_gpmc_save_context (void ) {int i; + gpmc_context.sysconfig =gpmc_read_reg (GPMC_SYSCONFIG ); gpmc_context.irqenable =gpmc_read_reg (GPMC_IRQENABLE ); gpmc_context.timeout_ctrl =gpmc_read_reg (GPMC_TIMEOUT_CONTROL );
@@ -583,9 +584,10 @@ void omap3_gpmc_save_context() } } -void omap3_gpmc_restore_context () +void omap3_gpmc_restore_context (void ) {int i; +gpmc_write_reg (GPMC_SYSCONFIG , gpmc_context.sysconfig);gpmc_write_reg (GPMC_IRQENABLE , gpmc_context.irqenable);gpmc_write_reg (GPMC_TIMEOUT_CONTROL , gpmc_context.timeout_ctrl);
Tony Lindgren
maintainerPATCH 13/17 omap2/3/4: gpmc: avoid section definitions on headers
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
trivial patch, no functional changes.
--- arch/arm/plat-omap/include/plat/gpmc.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/include/plat/gpmc.h +1 -1
@@ -110,6 +110,6 @@ extern void gpmc_prefetch_reset(void);extern int gpmc_prefetch_status (void );extern void omap3_gpmc_save_context (void );extern void omap3_gpmc_restore_context (void ); -extern void __init gpmc_init (void ); +extern void gpmc_init (void );#endif
Tony Lindgren
maintainerPATCH 14/17 omap2/3/4: serial: fix coding style indentaion
In reply to Tony LindgrenQuoted 1 line
From
8f4ec0907030d94a66572017e86d82cd1b8cf7aaMon Sep 17 00:00:00 2001
From: vikram pandita <[email protected]>
Date: Wed, 10 Feb 2010 18:22:54 -0800
Subject: [PATCH] omap2/3/4: serial: fix coding style indentaion
No logical code change
Fix coding style indentaion as per checkpatch.pl Fix multi-line comment style reported by Nishanth Menon
arch/arm/mach-omap2/serial.c +10 -9
@@ -716,15 +716,16 @@ void __init omap_serial_init_port(int port)DEV_CREATE_FILE (dev, &dev_attr_sleep_timeout); } -/* omap44xx: Never read empty UART fifo -* omap3xxx: Never read empty UART fifo on UARTs -* with IP rev >=0x52 -*/ -if (cpu_is_omap44xx ()) - uart->p->serial_in = serial_in_override; -else if ((serial_read_reg (uart->p,UART_OMAP_MVER ) &0xFF ) - >=UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV ) - uart->p->serial_in = serial_in_override; +/* +* omap44xx: Never read empty UART fifo +* omap3xxx: Never read empty UART fifo on UARTs +* with IP rev >=0x52 +*/ +if (cpu_is_omap44xx ()) + uart->p->serial_in = serial_in_override; +else if ((serial_read_reg (uart->p,UART_OMAP_MVER ) &0xFF ) + >=UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV ) + uart->p->serial_in = serial_in_override; }/**
Tony Lindgren
maintainerPATCH 15/17 omap2/3/4: Introducing 'gpmc-nand.c' for GPMC specific NAND init
In reply to Tony LindgrenQuoted 1 line
From
2cf160e424cdb4efa29e1078841a649a44f50c79Mon Sep 17 00:00:00 2001
From: Vimal Singh <[email protected]>
Date: Wed, 10 Feb 2010 18:22:54 -0800
Subject: [PATCH] omap2/3/4: Introducing 'gpmc-nand.c' for GPMC specific NAND init
Introducing 'gpmc-nand.c' for GPMC specific NAND init. For example: GPMC timing parameters and all.
This patch also migrates gpmc related calls from 'nand/omap2.c' to 'gpmc-nand.c'.
arch/arm/mach-omap2/Makefile +3 -0
@@ -135,5 +135,8 @@ obj-y += usb-ehci.o onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o obj-y += $(onenand-m) $(onenand-y) +nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o +obj-y += $(nand-m) $(nand-y) + smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o obj-y += $(smc91x-m) $(smc91x-y)
arch/arm/mach-omap2/gpmc-nand.c new file +139 -0
139 lines not on this page · raw message
arch/arm/plat-omap/include/plat/nand.h +9 -1
@@ -15,10 +15,18 @@ struct omap_nand_platform_data {int cs;int gpio_irq;struct mtd_partition *parts; +struct gpmc_timings *gpmc_t;int nr_parts; -int (*nand_setup)(void __iomem *); +int (*nand_setup)(void );int (*dev_ready)(struct omap_nand_platform_data *);int dma_channel; +unsigned long phys_base;void __iomem *gpmc_cs_baseaddr;void __iomem *gpmc_baseaddr; +int devsize; }; + +/* size (4 KiB) for IO mapping */ +#define NAND_IO_SIZE SZ_4K + +extern int gpmc_nand_init (struct omap_nand_platform_data *d);
drivers/mtd/nand/omap2.c +4 -31
@@ -30,12 +30,8 @@#define DRIVER_NAME "omap2-nand" -/* size (4 KiB) for IO mapping */ -#define NAND_IO_SIZE SZ_4K -#define NAND_WP_OFF 0#define NAND_WP_BIT 0x00000010 -#define WR_RD_PIN_MONITORING 0x00600000#define GPMC_BUF_FULL 0x00000001#define GPMC_BUF_EMPTY 0x00000000
@@ -882,8 +878,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)struct omap_nand_info *info;struct omap_nand_platform_data *pdata;int err; -unsigned long val; - pdata = pdev->dev.platform_data;if (pdata ==NULL ) {
@@ -905,28 +899,14 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) info->gpmc_cs = pdata->cs; info->gpmc_baseaddr = pdata->gpmc_baseaddr; info->gpmc_cs_baseaddr = pdata->gpmc_cs_baseaddr; + info->phys_base = pdata->phys_base; info->mtd.priv = &info->nand; info->mtd.name =dev_name (&pdev->dev); info->mtd.owner =THIS_MODULE ; - err =gpmc_cs_request (info->gpmc_cs,NAND_IO_SIZE , &info->phys_base); -if (err <0 ) { -dev_err (&pdev->dev,"Cannot request GPMC CS\n" ); - goto out_free_info; - } - -/* Enable RD PIN Monitoring Reg */ -if (pdata->dev_ready) { - val =gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG1 ); - val |=WR_RD_PIN_MONITORING ; -gpmc_cs_write_reg (info->gpmc_cs,GPMC_CS_CONFIG1 , val); - } - - val =gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG7 ); - val &= ~(0xf <<8 ); - val |= (0xc &0xf ) <<8 ; -gpmc_cs_write_reg (info->gpmc_cs,GPMC_CS_CONFIG7 , val); + info->nand.options |= pdata->devsize ?NAND_BUSWIDTH_16 :0 ; + info->nand.options |=NAND_SKIP_BBTSCAN ;/* NAND write protect off */ omap_nand_wp (&info->mtd,NAND_WP_OFF );
@@ -934,7 +914,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)if (!request_mem_region (info->phys_base,NAND_IO_SIZE , pdev->dev.driver->name)) { err = -EBUSY ; - goto out_free_cs; + goto out_free_info; } info->nand.IO_ADDR_R =ioremap (info->phys_base,NAND_IO_SIZE );
@@ -963,11 +943,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) info->nand.chip_delay =50 ; } - info->nand.options |=NAND_SKIP_BBTSCAN ; -if ((gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG1 ) &0x3000 ) - ==0x1000 ) - info->nand.options |=NAND_BUSWIDTH_16 ; -if (use_prefetch) {/* copy the virtual address of nand base for fifo access */ info->nand_pref_fifo_add = info->nand.IO_ADDR_R;
@@ -1043,8 +1018,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) out_release_mem_region:release_mem_region (info->phys_base,NAND_IO_SIZE ); -out_free_cs: -gpmc_cs_free (info->gpmc_cs); out_free_info:kfree (info);
Tony Lindgren
maintainerPATCH 16/17 omap3: SDP: Introducing 'board-sdp-flash.c' for flash init
In reply to Tony LindgrenQuoted 2 lines
From
6351a5d5dc656b348074d3ef67a63420c054041aMon Sep 17 00:00:00 2001
From: Vimal Singh <[email protected]>
Date: Wed, 10 Feb 2010 18:22:55 -0800
Subject: [PATCH] omap3: SDP: Introducing 'board-sdp-flash.c' for flash init
This patch adds 'board-sdp-flash.c', which could be utilized by boards similar to 3430SDP. (For ex: 2430sdp, 36030sdp).
This file does initialization for all three flash devices present in SDP boards (NOR, NAND, OneNAND), by finding there 'cs' number dynamically using switch setting information (S8: 1-4). This also expects partition information from core board files (for
ex: board-3430sdp.c). Which allows to choose different default partitions for different boards.
A new structure is created for this purpose: 'flash_partitions' in 'mach/board-sdp.h'. This has two members:
1. struct mtd_partition *parts
2. int nr_parts
A board file is expected to fill this structure and pass it to 'sdp-flsash-init'. Partition information should be passed in structure array of 'flash_partitions'. Partition information should be passed in below sequence in array:
NOR
OneNAND
NAND
arch/arm/mach-omap2/board-sdp-flash.c new file +272 -0
@@ -0,0 +1,272 @@ +/* +* board-sdp-flash.c +* Modified from mach-omap2/board-3430sdp-flash.c +* +* Copyright (C) 2009 Nokia Corporation +* Copyright (C) 2009 Texas Instruments +* +* Vimal Singh <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/mtd/physmap.h> +#include <linux/io.h> + +#include <plat/gpmc.h> +#include <plat/nand.h> +#include <plat/onenand.h> +#include <plat/tc.h> +#include <mach/board-sdp.h> + +#define REG_FPGA_REV 0x10 +#define REG_FPGA_DIP_SWITCH_INPUT2 0x60 +#define MAX_SUPPORTED_GPMC_CONFIG 3 + +#define DEBUG_BASE 0x08000000/* debug board */ + +#define PDC_NOR 1 +#define PDC_NAND 2 +#define PDC_ONENAND 3 +#define DBG_MPDB 4 + +/* various memory sizes */ +#define FLASH_SIZE_SDPV1 SZ_64M/* NOR flash (64 Meg aligned) */ +#define FLASH_SIZE_SDPV2 SZ_128M/* NOR flash (256 Meg aligned) */ + +/* +* SDP3430 V2 Board CS organization +* Different from SDP3430 V1. Now 4 switches used to specify CS +* +* See also the Switch S8 settings in the comments. +* +* REVISIT: Add support for 2430 SDP +*/ +static const unsigned char chip_sel_sdp[][GPMC_CS_NUM ] = { + {PDC_NOR ,PDC_NAND ,PDC_ONENAND ,DBG_MPDB ,0 ,0 ,0 ,0 },/* S8:1111 */ + {PDC_ONENAND ,PDC_NAND ,PDC_NOR ,DBG_MPDB ,0 ,0 ,0 ,0 },/* S8:1110 */ + {PDC_NAND ,PDC_ONENAND ,PDC_NOR ,DBG_MPDB ,0 ,0 ,0 ,0 },/* S8:1101 */ +}; + +static struct physmap_flash_data sdp_nor_data = { + .width =2 , +}; + +static struct resource sdp_nor_resource = { + .flags =IORESOURCE_MEM , +}; + +static struct platform_device sdp_nor_device = { + .name ="physmap-flash" , + .id =0 , + .dev = { + .platform_data = &sdp_nor_data, + }, + .num_resources =1 , + .resource = &sdp_nor_resource, +}; + +static void +__init board_nor_init (struct flash_partitions sdp_nor_parts,u8 cs) +{ +int err; + + sdp_nor_data.parts = sdp_nor_parts.parts; + sdp_nor_data.nr_parts = sdp_nor_parts.nr_parts; + +/* Configure start address and size of NOR device */ +if (omap_rev () >=OMAP3430_REV_ES1_0 ) { + err =gpmc_cs_request (cs,FLASH_SIZE_SDPV2 -1 , + (unsigned long *)&sdp_nor_resource.start); + sdp_nor_resource.end = sdp_nor_resource.start + +FLASH_SIZE_SDPV2 -1 ; + }else { + err =gpmc_cs_request (cs,FLASH_SIZE_SDPV1 -1 , + (unsigned long *)&sdp_nor_resource.start); + sdp_nor_resource.end = sdp_nor_resource.start + +FLASH_SIZE_SDPV1 -1 ; + } +if (err <0 ) { +printk (KERN_ERR "NOR: Can't request GPMC CS\n" ); +return ; + } +if (platform_device_register (&sdp_nor_device) <0 ) +printk (KERN_ERR "Unable to register NOR device\n" ); +} + +#if defined(CONFIG_MTD_ONENAND_OMAP2 ) || \ + defined(CONFIG_MTD_ONENAND_OMAP2_MODULE ) +static struct omap_onenand_platform_data board_onenand_data = { + .dma_channel =-1 ,/* disable DMA in OMAP OneNAND driver */ +}; + +static void +__init board_onenand_init (struct flash_partitions sdp_onenand_parts,u8 cs) +{ + board_onenand_data.cs = cs; + board_onenand_data.parts = sdp_onenand_parts.parts; + board_onenand_data.nr_parts = sdp_onenand_parts.nr_parts; + +gpmc_onenand_init (&board_onenand_data); +} +#else +static void +__init board_onenand_init (struct flash_partitions sdp_onenand_parts,u8 cs) +{ +} +#endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */ + +#if defined(CONFIG_MTD_NAND_OMAP2 ) || \ + defined(CONFIG_MTD_NAND_OMAP2_MODULE ) + +/* Note that all values in this struct are in nanoseconds */ +static struct gpmc_timings nand_timings = { + + .sync_clk =0 , + + .cs_on =0 , + .cs_rd_off =36 , + .cs_wr_off =36 , + + .adv_on =6 , + .adv_rd_off =24 , + .adv_wr_off =36 , + + .we_off =30 , + .oe_off =48 , + + .access =54 , + .rd_cycle =72 , + .wr_cycle =72 , + + .wr_access =30 , + .wr_data_mux_bus =0 , +}; + +static struct omap_nand_platform_data sdp_nand_data = { + .nand_setup =NULL , + .gpmc_t = &nand_timings, + .dma_channel =-1 ,/* disable DMA in OMAP NAND driver */ + .dev_ready =NULL , + .devsize =0 ,/* '0' for 8-bit, '1' for 16-bit device */ +}; + +static void +__init board_nand_init (struct flash_partitions sdp_nand_parts,u8 cs) +{ + sdp_nand_data.cs = cs; + sdp_nand_data.parts = sdp_nand_parts.parts; + sdp_nand_data.nr_parts = sdp_nand_parts.nr_parts; + + sdp_nand_data.gpmc_cs_baseaddr = (void *)(OMAP34XX_GPMC_VIRT + +GPMC_CS0_BASE + + cs *GPMC_CS_SIZE ); + sdp_nand_data.gpmc_baseaddr = (void *) (OMAP34XX_GPMC_VIRT ); + +gpmc_nand_init (&sdp_nand_data); +} +#else +static void +__init board_nand_init (struct flash_partitions sdp_nand_parts,u8 cs) +{ +} +#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */ + +/** +* get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get +* the various cs values. +*/ +static u8 get_gpmc0_type (void ) +{ +u8 cs =0 ; +void __iomem *fpga_map_addr; + + fpga_map_addr =ioremap (DEBUG_BASE ,4096 ); +if (!fpga_map_addr) +return -ENOMEM ; + +if (!(__raw_readw (fpga_map_addr +REG_FPGA_REV ))) +/* we dont have an DEBUG FPGA??? */ +/* Depend on #defines!! default to strata boot return param */ + goto unmap; + +/* S8-DIP-OFF = 1, S8-DIP-ON = 0 */ + cs =__raw_readw (fpga_map_addr +REG_FPGA_DIP_SWITCH_INPUT2 ) &0xf ; + +/* ES2.0 SDP's onwards 4 dip switches are provided for CS */ +if (omap_rev () >=OMAP3430_REV_ES1_0 ) +/* change (S8-1:4=DS-2:0) to (S8-4:1=DS-2:0) */ + cs = ((cs &8 ) >>3 ) | ((cs &4 ) >>1 ) | + ((cs &2 ) <<1 ) | ((cs &1 ) <<3 ); +else +/* change (S8-1:3=DS-2:0) to (S8-3:1=DS-2:0) */ + cs = ((cs &4 ) >>2 ) | (cs &2 ) | ((cs &1 ) <<2 ); +unmap: +iounmap (fpga_map_addr); +return cs; +} + +/** +* sdp3430_flash_init - Identify devices connected to GPMC and register. +* +* @return - void. +*/ +void __init sdp_flash_init (struct flash_partitions sdp_partition_info[]) +{ +u8 cs =0 ; +u8 norcs =GPMC_CS_NUM +1 ; +u8 nandcs =GPMC_CS_NUM +1 ; +u8 onenandcs =GPMC_CS_NUM +1 ; +u8 idx; +unsigned char *config_sel =NULL ; + +/* REVISIT: Is this return correct idx for 2430 SDP? +* for which cs configuration matches for 2430 SDP? +*/ + idx =get_gpmc0_type (); +if (idx >=MAX_SUPPORTED_GPMC_CONFIG ) { +printk (KERN_ERR "%s: Invalid chip select: %d\n" , __func__, cs); +return ; + } + config_sel = (unsigned char *)(chip_sel_sdp[idx]); + +while (cs <GPMC_CS_NUM ) { +switch (config_sel[cs]) { +case PDC_NOR : +if (norcs >GPMC_CS_NUM ) + norcs = cs; +break ; +case PDC_NAND : +if (nandcs >GPMC_CS_NUM ) + nandcs = cs; +break ; +case PDC_ONENAND : +if (onenandcs >GPMC_CS_NUM ) + onenandcs = cs; +break ; + }; + cs++; + } + +if (norcs >GPMC_CS_NUM ) +printk (KERN_INFO "OneNAND: Unable to find configuration " +" in GPMC\n " ); +else +board_nor_init (sdp_partition_info[0 ], norcs); + +if (onenandcs >GPMC_CS_NUM ) +printk (KERN_INFO "OneNAND: Unable to find configuration " +" in GPMC\n " ); +else +board_onenand_init (sdp_partition_info[1 ], onenandcs); + +if (nandcs >GPMC_CS_NUM ) +printk (KERN_INFO "NAND: Unable to find configuration " +" in GPMC\n " ); +else +board_nand_init (sdp_partition_info[2 ], nandcs); +}
arch/arm/mach-omap2/include/mach/board-sdp.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* board-sdp.h +* +* Information structures for SDP-specific board config data +* +* Copyright (C) 2009 Nokia Corporation +* Copyright (C) 2009 Texas Instruments +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> + +struct flash_partitions { +struct mtd_partition *parts; +int nr_parts; +}; + +extern void sdp_flash_init (struct flash_partitions []);
arch/arm/plat-omap/include/plat/gpmc.h +2 -0
@@ -27,6 +27,8 @@#define GPMC_CONFIG 0x50#define GPMC_STATUS 0x54 +#define GPMC_CS0_BASE 0x60 +#define GPMC_CS_SIZE 0x30#define GPMC_CONFIG1_WRAPBURST_SUPP (1 << 31)#define GPMC_CONFIG1_READMULTIPLE_SUPP (1 << 30)
Tony Lindgren
maintainerPATCH 17/17 omap3: Add support for flash on 3430SDP board
In reply to Tony LindgrenQuoted 1 line
From
ff8b5c4a3d1fa6bbb1dab3d7b443e611fc997a05Mon Sep 17 00:00:00 2001
From: Vimal Singh <[email protected]>
Date: Wed, 10 Feb 2010 18:22:55 -0800
Subject: [PATCH] omap3: Add support for flash on 3430SDP board
This patch adds support for flashes on 3430SDP boards. All three NAND, NOR and OneNAND are supported. I have tested it on 3430SDP (ES2 and ES3.1).
This patch can be treated as an example to "how to utilize":
'gpmc-nand.c' and 'board-sdp-flash.c'.
Similar patches can be created for 2430sdp and 3630sdp or any other similar board.
arch/arm/mach-omap2/Makefile +2 -1
@@ -100,7 +100,8 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ - mmc-twl4030.o + mmc-twl4030.o \ + board-sdp-flash.o obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-sdram.o \
arch/arm/mach-omap2/board-3430sdp.c +111 -0
129 lines not on this page · raw message