Hi,
On Mon, Mar 29, 2010 at 08:46:37AM +0200, ext Agarwal, Preshit wrote:
In this patch SGX powervr_device is registered with it's platform specific
data to provide information about setting constraint through
omap_pm_set_min_bus_tput.
This patch removes the requirement of EXPORT_SYMBOL for the same function.
Signed-off-by: Preshit Agarwal <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
you shouldn't add my signed-off-by unless I explicitly tell you it's ok
to do so :-)
Signed-off-by: Allen Pais <[email protected]>
---
arch/arm/mach-omap2/devices.c | 19 +++++++++++++++++++
arch/arm/mach-omap2/include/mach/omap_sgxdef.h | 23 +++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/include/mach/omap_sgxdef.h
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 23e4d77..a67ff0b 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -27,6 +27,7 @@
#include <mach/gpio.h>
#include <plat/mmc.h>
+#include <mach/omap_sgxdef.h>
#include "mux.h"
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
@@ -786,6 +787,23 @@ static inline void omap_hdq_init(void)
static inline void omap_hdq_init(void) {}
#endif
+struct sgx_platform_data omap_sgx_data = {
+ .set_min_bus_tput = omap_sgx_pm_constraints,
+};
won't this break when !CONFIG_PM ??
+static struct platform_device powervr_device = {
+ .name = "pvrsrvkm",
+ .id = -1,
+ .dev = {
+ .platform_data = &omap_sgx_data,
+ },
+};
+
+static void omap_init_sgx(void)
+{
+ (void) platform_device_register(&powervr_device);
+}
+
/*-------------------------------------------------------------------------*/
static int __init omap2_init_devices(void)
@@ -800,6 +818,7 @@ static int __init omap2_init_devices(void)
omap_hdq_init();
omap_init_sti();
omap_init_sha1_md5();
+ omap_init_sgx();
return 0;
}
diff --git a/arch/arm/mach-omap2/include/mach/omap_sgxdef.h
b/arch/arm/mach-omap2/include/mach/omap_sgxdef.h
new file mode 100644
index 0000000..a8e065b
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/omap_sgxdef.h
@@ -0,0 +1,23 @@
+#ifndef OMAP_SGXDEF_H
+#define OMAP_SGXDEF_H
+
+#include <plat/omap-pm.h>
+
+#ifdef CONFIG_PM
+struct sgx_platform_data {
+ void (*set_min_bus_tput)(struct device *dev, u8 agent_id,
+ unsigned long r);
+};
+
+static void omap_sgx_pm_constraints(struct device *dev, u8 agent_id,
+ unsigned long r)
+{
+ omap_pm_set_min_bus_tput(dev, agent_id, r);
+}
+#else
+static void omap_sgx_pm_contraints(struct device *dev, u8 agent_id,
+ unsigned long r)
+{
+}
+#endif
not here... the platform_data should always exist otherwise this won't
compile. See that struct sgx_platform_data doesn't even exist if
!CONFIG_PM and you still instantiate a variable of that type
unconditionaly. I suggest you use:
header:
struct sgx_platform_data {
void (*set_pm_constraints)(struct device *dev, u8 agent_id,
};
C-source:
#ifdef CONFIG_PM
static void omap_sgx_pm_constraints(struct device *dev, u8 agent_id,
unsigned long r)
{
omap_pm_set_min_bus_tput(dev, agent_id, r);
}
#else
static inline void omap_sgx_pm_constraints(struct device *dev,
u8 agent_id, unsigned long r)
{ }
#endif
struct sgx_platform_data omap_sgx_data = {
.set_pm_constraints = omap_sgx_pm_constraints,
};
static struct platform_device powervr_device = {
.name = "pvrsrvkm",
.id = -1,
.dev = {
.platform_data = &omap_sgx_data,
},
};
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
