From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Oct 2012 16:11:57 +0000 (-0700)
Subject: Merge tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad... 
X-Git-Tag: MMI-PSA29.97-13-9~15841
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d6d367232813af09d9a1d90e3259e3ac42ee8a8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'remoteproc-for-3.7' of git://git./linux/kernel/git/ohad/remoteproc

Pull remoteproc update from Ohad Ben-Cohen:

 - Remoteproc Recovery - by Fernando Guzman Lugo

   When a remote processor crash is detected, this mechanism will remove
   all virtio children devices, wait until their drivers let go, hard
   reset the remote processor and reload the firmware (resulting in the
   relevant virtio children devices re-added).  Essentially the entire
   software stack is reset, together with the relevant hardware, so
   users don't have to reset the entire phone.

 - STE Modem driver is added - by Sjur Brændeland

 - OMAP DSP boot address support is added - by Juan Gutierrez

 - A handful of fixes/cleanups - Sjur Brændeland, Dan Carpenter, Emil
   Goode

* tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: Fix use of format specifyer
  remoteproc: fix a potential NULL-dereference on cleanup
  remoteproc: select VIRTIO to avoid build breakage
  remoteproc: return -EFAULT on copy_from_user failure
  remoteproc: snprintf() can return more than was printed
  remoteproc: Add STE modem driver
  remtoteproc: maintain max notifyid
  remoteproc: create a 'recovery' debugfs entry
  remoteproc: add actual recovery implementation
  remoteproc: add rproc_report_crash function to notify rproc crashes
  remoteproc: Add dependency to HAS_DMA
  remoteproc/omap: set bootaddr support
---

4d6d367232813af09d9a1d90e3259e3ac42ee8a8
diff --cc include/linux/platform_data/remoteproc-omap.h
index b10eac89e2e9,000000000000..3c1c6444ec4b
mode 100644,000000..100644
--- a/include/linux/platform_data/remoteproc-omap.h
+++ b/include/linux/platform_data/remoteproc-omap.h
@@@ -1,57 -1,0 +1,59 @@@
 +/*
 + * Remote Processor - omap-specific bits
 + *
 + * Copyright (C) 2011 Texas Instruments, Inc.
 + * Copyright (C) 2011 Google, Inc.
 + *
 + * 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.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + */
 +
 +#ifndef _PLAT_REMOTEPROC_H
 +#define _PLAT_REMOTEPROC_H
 +
 +struct rproc_ops;
 +struct platform_device;
 +
 +/*
 + * struct omap_rproc_pdata - omap remoteproc's platform data
 + * @name: the remoteproc's name
 + * @oh_name: omap hwmod device
 + * @oh_name_opt: optional, secondary omap hwmod device
 + * @firmware: name of firmware file to load
 + * @mbox_name: name of omap mailbox device to use with this rproc
 + * @ops: start/stop rproc handlers
 + * @device_enable: omap-specific handler for enabling a device
 + * @device_shutdown: omap-specific handler for shutting down a device
++ * @set_bootaddr: omap-specific handler for setting the rproc boot address
 + */
 +struct omap_rproc_pdata {
 +	const char *name;
 +	const char *oh_name;
 +	const char *oh_name_opt;
 +	const char *firmware;
 +	const char *mbox_name;
 +	const struct rproc_ops *ops;
 +	int (*device_enable) (struct platform_device *pdev);
 +	int (*device_shutdown) (struct platform_device *pdev);
++	void(*set_bootaddr)(u32);
 +};
 +
 +#if defined(CONFIG_OMAP_REMOTEPROC) || defined(CONFIG_OMAP_REMOTEPROC_MODULE)
 +
 +void __init omap_rproc_reserve_cma(void);
 +
 +#else
 +
 +void __init omap_rproc_reserve_cma(void)
 +{
 +}
 +
 +#endif
 +
 +#endif /* _PLAT_REMOTEPROC_H */