Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Corrected the checkpatch warnings in ipc modules. Warnings related to
the volatile keyword still persist in gate_remote.c, messageq_transportshm.c
and listmp.h
Signed-off-by: Suman Anna <s-anna@ti.com>

Updated messageq and multiproc modules to be in sync with ipc-b33 tree.
No changes are required for messageq_transportshm, listmp, listmp_sharedmemory
modules also.

multiproc - changed the return type for multiproc_set_local_id
messageq - enhanced the functionality of messageq_put to deal with urgent messages
Signed-off-by: Suman Anna <s-anna@ti.com>

this patch implements the proc4430 translate address
function.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

procmgr: updated with a fix for a minor issue Updated with a fix for a minor issue with the procmgr_create the procmgr state table was not getting updated with the procmgr handle
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

IPC Added IOCTL I/F for NameServer Remote Notify modules This is to sync with the latest syslink drop(version 2.0)
Signed-off-by: Arun M G <arunmg@ti.com>

IPC_Fix_Nameserver_And_Multiproc This includes the fixes in nameserver and multiproc modules during testing.

The additional changes in ioctl file to make sysc with
the changes propossed by Suman (command changes, copy
commands at a common place etc)
Signed-off-by: Arun M G <arunmg@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

fixed checkpatch warnngs in proc4430
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

ProcMgr: Resolved few bugs within the ioctl function. resolved few bugs observed within the ioctl function
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

This patch updates the DMM start address and size
information for DUCATI. The start address is provided
as 0x80000000 and the size as 0x6000000
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

this patch plugs the dmm module with Proc4430 driver
and procmgr module. This provides both Map and Unmap
functionality.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

removed bug that is not needed.
Signed-off-by: Hari Kanigeri <h-kangieri2@ti.com>

updated the callback functions signature in messageq_transportshm and
nameserver_remotenotify modules to align with the latest notify code.
Signed-off-by: Suman Anna <s-anna@ti.com>

This patch provides the preliminary framework for
IPC support to OMAP4 processor.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Arun M G <arunmg@ti.com>
Signed-off-by: Ramesh Gupta G <grgupta@ti.com>
Signed-off-by: Jayan John <x00jayan@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

This patch enables L2 Cache support for OMAP4.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Second reason of OMAP4 boot failure on 2.6.31.rc6, the UART
platform data is not getting registered to kernel.
Registration was failing because of clock check failure in
omap_serial_init().
Below patch fix the same.

OMAP4 clock framework patches are still getting discussed on mailing
list so till then we need this.
Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

After the patch series "[PATCH 00/14] OMAP PM fixes for .31-rc"
merge in 2.6.31-rc5, the kernel crashed during boot on OMAP4430.
This patch fixes it by adding UART4 support and related code.
Without this patch omap_serial_init() would produce " NULL pointer
dereference" and kernel crashes in the bootup on OMAP4430 platform.

Some more info on the merge issue can be found here.
More info- http://lkml.org/lkml/2009/8/20/192

Note: While merging this patch,"IO_ADDRESS" needs to be changed
to "OMAP2_IO_ADDRESS" if the Tony's below series is already merged in.
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15072.html

id = 3 instead of "PLAT8250_DEV_FOURPORT" as suggested by Kevin.
Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

This patch adds static mapping for Audio Back End
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

OMAP4: Adjust the vmalloc end
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Conflicts:

	arch/arm/configs/omap_4430sdp_defconfig

Resolved
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

This patch updates the platform dma.h with new dma request lines
for OMAP4 peripherals. Also additional hardware register of OMAP4
sDMA module are included.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: sbp2: fix freeing of unallocated memory
  firewire: ohci: fix Ricoh R5C832, video reception
  firewire: ohci: fix Agere FW643 and multiple cameras
  firewire: core: fix crash in iso resource management

This patch fixes a null pointer exception caused by removal of
'ack()' for level interrupts in the Xilinx interrupt driver.  A recent
change to the xilinx interrupt controller removed the ack hook for
level irqs.
Signed-off-by: Roderick Colenbrander <thunderbird2k@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

* git://git.infradead.org/~dwmw2/mtd-2.6.31:
  JFFS2: add missing verify buffer allocation/deallocation
  mtd: nftl: fix offset alignments
  mtd: nftl: write support is broken
  mtd: m25p80: fix null pointer dereference bug

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: Allow changing max_sectors_kb above the default 512

* 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: oxygen: handle cards with missing EEPROM
  sound: oxygen: fix MCLK rate for 192 kHz playback

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  tc: Fix unitialized kernel memory leak
  pkt_sched: Revert tasklet_hrtimer changes.
  net: sk_free() should be allowed right after sk_alloc()
  gianfar: gfar_remove needs to call unregister_netdev()
  ipw2200: firmware DMA loading rework

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Re-enable cpufreq suspend and resume code

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix csum_ipv6_magic()
  [IA64] Fix warning in dma-mapping.c

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: actually enable the swapext compat handler

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: don't assume existence of cpu0

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU