2 files changed, 59 insertions, 1 deletions

diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h
index 1be356330b96..80ce28d40832 100644
--- a/include/linux/platform_data/ti-sysc.h
+++ b/include/linux/platform_data/ti-sysc.h
@@ -16,6 +16,10 @@ enum ti_sysc_module_type {
         TI_SYSC_OMAP4_USB_HOST_FS,
 };
 
+struct ti_sysc_cookie {
+        void *data;
+};
+
 /**
  * struct sysc_regbits - TI OCP_SYSCONFIG register field offsets
  * @midle_shift: Offset of the midle bit
@@ -41,6 +45,7 @@ struct sysc_regbits {
         s8 emufree_shift;
 };
 
+#define SYSC_QUIRK_LEGACY_IDLE          BIT(8)
 #define SYSC_QUIRK_RESET_STATUS         BIT(7)
 #define SYSC_QUIRK_NO_IDLE_ON_INIT      BIT(6)
 #define SYSC_QUIRK_NO_RESET_ON_INIT     BIT(5)
@@ -83,4 +88,49 @@ struct sysc_config {
         u32 quirks;
 };
 
+enum sysc_registers {
+        SYSC_REVISION,
+        SYSC_SYSCONFIG,
+        SYSC_SYSSTATUS,
+        SYSC_MAX_REGS,
+};
+
+/**
+ * struct ti_sysc_module_data - ti-sysc to hwmod translation data for a module
+ * @name: legacy "ti,hwmods" module name
+ * @module_pa: physical address of the interconnect target module
+ * @module_size: size of the interconnect target module
+ * @offsets: array of register offsets as listed in enum sysc_registers
+ * @nr_offsets: number of registers
+ * @cap: interconnect target module capabilities
+ * @cfg: interconnect target module configuration
+ *
+ * This data is enough to allocate a new struct omap_hwmod_class_sysconfig
+ * based on device tree data parsed by ti-sysc driver.
+ */
+struct ti_sysc_module_data {
+        const char *name;
+        u64 module_pa;
+        u32 module_size;
+        int *offsets;
+        int nr_offsets;
+        const struct sysc_capabilities *cap;
+        struct sysc_config *cfg;
+};
+
+struct device;
+
+struct ti_sysc_platform_data {
+        struct of_dev_auxdata *auxdata;
+        int (*init_module)(struct device *dev,
+                           const struct ti_sysc_module_data *data,
+                           struct ti_sysc_cookie *cookie);
+        int (*enable_module)(struct device *dev,
+                             const struct ti_sysc_cookie *cookie);
+        int (*idle_module)(struct device *dev,
+                           const struct ti_sysc_cookie *cookie);
+        int (*shutdown_module)(struct device *dev,
+                               const struct ti_sysc_cookie *cookie);
+};
+
 #endif  /* __TI_SYSC_DATA_H__ */
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
index d8b187c3925d..7b81dad712de 100644
--- a/include/linux/power/smartreflex.h
+++ b/include/linux/power/smartreflex.h
@@ -143,6 +143,13 @@
 #define OMAP3430_SR_ERRWEIGHT           0x04
 #define OMAP3430_SR_ERRMAXLIMIT         0x02
 
+enum sr_instance {
+        OMAP_SR_MPU,                    /* shared with iva on omap3 */
+        OMAP_SR_CORE,
+        OMAP_SR_IVA,
+        OMAP_SR_NR,
+};
+
 struct omap_sr {
         char                            *name;
         struct list_head                node;
@@ -207,7 +214,6 @@ struct omap_smartreflex_dev_attr {
         const char      *sensor_voltdm_name;
 };
 
-#ifdef CONFIG_POWER_AVS_OMAP
 /*
  * The smart reflex driver supports CLASS1 CLASS2 and CLASS3 SR.
  * The smartreflex class driver should pass the class type.
@@ -290,6 +296,8 @@ struct omap_sr_data {
         struct voltagedomain            *voltdm;
 };
 
+#ifdef CONFIG_POWER_AVS_OMAP
+
 /* Smartreflex module enable/disable interface */
 void omap_sr_enable(struct voltagedomain *voltdm);
 void omap_sr_disable(struct voltagedomain *voltdm);