diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index b614fd1..76b8aa5 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -116,7 +116,7 @@ static struct irq_chip davinci_irq_chip_ /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ static const u8 default_priorities[DAVINCI_N_AINTC_IRQ] __initdata = { - [IRQ_VDINT0] = 0, /* always fiq */ + [IRQ_VDINT0] = 2, /* was 0, always fiq */ [IRQ_VDINT1] = 6, [IRQ_VDINT2] = 6, [IRQ_HISTINT] = 6, diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 4654405..7e138a8 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -316,6 +316,7 @@ __ioremap_pfn(unsigned long pfn, unsigne addr = (unsigned long)area->addr; #ifndef CONFIG_SMP +#ifndef CONFIG_ARCH_DAVINCI if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) || cpu_is_xsc3()) && !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) { @@ -326,6 +327,7 @@ #ifndef CONFIG_SMP err = remap_area_sections(addr, pfn, size, flags); } else #endif +#endif err = remap_area_pages(addr, pfn, size, flags); if (err) { diff --git a/config.davinci b/config.davinci index 077fdc7..9925207 100644 --- a/config.davinci +++ b/config.davinci @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19-rc3-omap1 -# Wed Dec 20 17:28:52 2006 +# Sun Jan 14 15:48:14 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -21,6 +21,7 @@ # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -44,7 +45,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y @@ -137,7 +138,7 @@ # # DaVinci Board Type # CONFIG_MACH_DAVINCI_EVM=y -CONFIG_MACH_DAVINCI_VNETENC=y +# CONFIG_MACH_DAVINCI_VNETENC is not set CONFIG_DAVINCI_I2C_EXPANDER=y CONFIG_DAVINCI_MCBSP=y @@ -180,7 +181,7 @@ # CONFIG_PCCARD is not set # # Kernel Features # -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 # CONFIG_AEABI is not set @@ -365,7 +366,7 @@ # Generic Driver Options # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=y # CONFIG_SYS_HYPERVISOR is not set # @@ -789,7 +790,7 @@ # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set # CONFIG_SENSORS_EEPROM is not set -CONFIG_SENSORS_PCF8574=y +# CONFIG_SENSORS_PCF8574 is not set CONFIG_SENSORS_PCA9539=y # CONFIG_SENSORS_PCF8591 is not set CONFIG_SENSORS_TLV320AIC23=y diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 9ea17ef..7798c24 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -26,6 +26,8 @@ - * */ + + #include #include #include diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index a24905f..81fc2dc 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -22,6 +22,7 @@ SMBus 2.0 support by Mark Studebaker and Jean Delvare */ + #include #include #include @@ -391,8 +392,11 @@ static int __i2c_check_addr(struct i2c_a list_for_each(item,&adapter->clients) { client = list_entry(item, struct i2c_client, list); - if (client->addr == addr) + if (client->addr == addr) { + pr_debug("i2c-core: address 0x%X registered for adapter [%s] and driver [%s] \n", addr, client->adapter->name, client->driver->driver.name); + return -EBUSY; + } } return 0; } @@ -1162,9 +1166,9 @@ s32 i2c_smbus_xfer(struct i2c_adapter * res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write, command,size,data); - printk(KERN_INFO "i2c i2c_smbus_xfer(): addr = %d RW = %d command = %d size = %d res = %d\n", - addr, (int) read_write, command, size, res); // A.R. TBD Debug - + pr_debug("i2c-core i2c_smbus_xfer(): addr = %d RW = %d command = %d size = %d res = %d\n", + addr, (int) read_write, command, size, res); + return res; } diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 3f86903..0de2b29 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -26,6 +26,7 @@ /* The I2C_RDWR ioctl code is written by Kolja Waschk */ + #include #include #include diff --git a/drivers/media/video/davinci_vpfe.c b/drivers/media/video/davinci_vpfe.c index 5d02d3a..0028f01 100644 --- a/drivers/media/video/davinci_vpfe.c +++ b/drivers/media/video/davinci_vpfe.c @@ -29,7 +29,6 @@ #include #include #include #include -// A.R. #include #include #include #include diff --git a/drivers/media/video/tvp5146.c b/drivers/media/video/tvp5146.c index 9e6ad35..c7c0e3f 100644 --- a/drivers/media/video/tvp5146.c +++ b/drivers/media/video/tvp5146.c @@ -32,7 +32,11 @@ #include #include #include -#define debug_print(x...) //printk(x) +#ifdef DEBUG +#define debug_print(x...) printk(x) +#else +#define debug_print(x...) // printk(x) +#endif static struct i2c_client tvp5146_i2c_client; static struct i2c_driver tvp5146_i2c_driver; @@ -399,7 +403,7 @@ static int settvp5146std(int arg) u8 output1; /* setup the sampling rate: 601 or square pixel */ - debug_print(KERN_INFO "reading i2c registers.\n"); + debug_print(KERN_INFO "tvp5146: reading i2c registers.\n"); ret = i2c_read_reg(&tvp5146_i2c_client, 0x33, &output1); output1 |= ((arg & 0x8) << 4); ret = i2c_write_reg(&tvp5146_i2c_client, 0x33, output1); @@ -553,7 +557,7 @@ static int i2c_write_reg(struct i2c_clie data[1] = val; err = i2c_transfer(client->adapter, msg, 1); } - debug_print(KERN_INFO " i2c data write \n"); + debug_print(KERN_INFO "tvp5146: i2c data write \n"); return err; } diff --git a/fs/read_write.c b/fs/read_write.c index f792000..0cf5912 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -149,6 +149,7 @@ asmlinkage off_t sys_lseek(unsigned int bad: return retval; } +EXPORT_SYMBOL(sys_lseek); #ifdef __ARCH_WANT_SYS_LLSEEK asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, diff --git a/include/asm-arm/arch-davinci/io.h b/include/asm-arm/arch-davinci/io.h index aea673b..7f71d73 100644 --- a/include/asm-arm/arch-davinci/io.h +++ b/include/asm-arm/arch-davinci/io.h @@ -28,6 +28,8 @@ #ifndef __ASM_ARCH_IO_H #define __ASM_ARCH_IO_H +#ifdef __KERNEL__ + #define IO_SPACE_LIMIT 0xffffffff /* @@ -96,4 +98,6 @@ #define __REG(x) (*((volatile unsigned l #endif +#endif // __KERNEL__ + #endif /* __ASM_ARCH_IO_H */ diff --git a/include/asm-arm/arch-davinci/memory.h b/include/asm-arm/arch-davinci/memory.h index 47ff24f..f84ad96 100644 --- a/include/asm-arm/arch-davinci/memory.h +++ b/include/asm-arm/arch-davinci/memory.h @@ -31,6 +31,8 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H +#ifdef __KERNEL__ + /************************************************************************** * Included Files **************************************************************************/ @@ -92,4 +94,6 @@ #endif #define __virt_to_bus(x) __virt_to_phys(x) #define __bus_to_virt(x) __phys_to_virt(x) +#endif // __KERNEL__ + #endif /* __ASM_ARCH_MEMORY_H */ diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 91d536c..430ed85 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -27,6 +27,8 @@ #include #include #include +#ifdef __KERNEL__ + #ifdef CONFIG_MMU #ifndef TASK_SIZE @@ -289,4 +291,6 @@ #endif #include +#endif // __KERNEL__ + #endif