Merge branch 'android-omap-3.0' into p-android-omap-3.0

* android-omap-3.0: (44 commits)
  OMAP4: PM: Tesla (DSP) power domain doesn't transition to OFF
  OMAP4: PM: dont program to greater LP state on suspend
  OMAP4: PM: dont restore to greater LP state on resume
  OMAP4: PM: Dont write to readonly/reserved powerdomain register on resume
  OMAP4: PM: Skip resume powerdomain programing if state already achieved
  OMAP4: PM: Honor powerdomain wakeup ON state in resume reprogramming
  OMAP4: PM: Skip programming CPU states again on resume
  OMAP4: PM: Print achieved state on failed transition
  OMAP4: PM: Refactor resume pd programing
  OMAP4: PM: Fold saving power state with programming suspend state
  OMAP4: PM: Restore trim configuration before DPLL restore
  GPIO: OMAP: set edge trigger for wakeup gpio
  GPIO: OMAP: Fix GPIO_IRQWAKEN_0 access
  netfilter: xt_qtaguid: Fix the stats info display order
  omap: remoteproc: update suspend flag address
  omap: rpmsg: remove call to rproc_last_busy from mbox callback
  remoteproc: move remoteproc register dump before error notification
  remoteproc: make rproc_set_secure a blocking call
  omap4: add a new misc driver for setting secure mode
  omap: remoteproc: enable setting iommu ttb
  ...

Change-Id: I05e426b5d2da76f5ba88b6196f268f9744c5f559
Signed-off-by: Dan Murphy <dmurphy@ti.com>

2 files changed, 18 insertions, 1 deletions

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 90348b3..8afa29d 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -82,6 +82,8 @@ enum fw_section_type {
 	FW_RESOURCE	= 0,
 	FW_TEXT		= 1,
 	FW_DATA		= 2,
+	FW_MMU		= 3,
+	FW_SIGNATURE	= 4,
 };
 
 struct fw_resource {
@@ -210,7 +212,7 @@ enum rproc_event {
  * struct rproc - a physical remote processor device
  *
  * @next: next rproc entry in the list
- * @name: human readable name of the rproc, cannot exceed RPROC_MAN_NAME bytes
+ * @name: human readable name of the rproc, cannot exceed RPROC_MAX_NAME bytes
  * @memory_maps: table of da-to-pa memory maps (relevant if device is behind
  *               an iommu)
  * @memory_pool: platform-specific contiguous memory pool data (relevant for
@@ -236,6 +238,10 @@ enum rproc_event {
  * @mmufault_work: work in charge of notifing mmufault
  * @nb_error: notify block for fatal errors
  * @error_comp: completion used when an error happens
+ * @secure_ttb: private data for configuring iommu in secure mode
+ * @secure_restart: completion event notifier for the secure restart process
+ * @secure_mode: flag to dictate whether to enable secure loading
+ * @secure_ok: restart status flag to be looked up upon the event's completion
  */
 struct rproc {
 	struct list_head next;
@@ -271,9 +277,14 @@ struct rproc {
 	struct mutex pm_lock;
 #endif
 	struct pm_qos_request_list *qos_request;
+	void *secure_ttb;
+	struct completion secure_restart;
+	bool secure_mode;
+	bool secure_ok;
 	bool halt_on_crash;
 };
 
+int rproc_set_secure(const char *, bool);
 struct rproc *rproc_get(const char *);
 void rproc_put(struct rproc *);
 int rproc_event_register(struct rproc *, struct notifier_block *, int);
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 27a1643..70e4872 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -563,6 +563,9 @@ struct omap_dss_device {
 
 		enum omap_panel_config config;
 		struct fb_monspecs monspecs;
+
+		u32 width_in_um;
+		u32 height_in_um;
 	} panel;
 
 	struct {
@@ -700,6 +703,9 @@ void omap_dispc_set_irq_type(int channel, enum omap_dispc_irq_type type);
 #define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)
 #define to_dss_device(x) container_of((x), struct omap_dss_device, dev)
 
+void omapdss_display_get_dimensions(struct omap_dss_device *dssdev,
+				u32 *width_in_um, u32 *height_in_um);
+
 void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,
 		bool enable);
 int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);