* [PATCH] OMAP4: pm.c extensions for OMAP4 support
@ 2010-08-16 9:26 Thara Gopinath
2010-08-16 13:53 ` Cousson, Benoit
0 siblings, 1 reply; 3+ messages in thread
From: Thara Gopinath @ 2010-08-16 9:26 UTC (permalink / raw)
To: linux-omap; +Cc: khilman, paul, vishwanath.bs, sawant, Thara Gopinath
OMAP4 has an iva device and a dsp devcice where as OMAP2/3
has only an iva device. In this file the iva device in the
system is registered under the name dsp_dev and the API
to retrieve the iva device is omap2_get_dsp_device.
This patch renames the dsp_dev to iva_dev, renames
omap2_get_dsp_device to omap2_get_iva_device,
registers dsp_dev for OMAP4 and adds a new API
omap4_get_dsp_device to retrieve the dep_dev.
This patch also registers the device "l3_main_1" as the l3
device in case of OMAP4 and retains traditional "l3_main"
in case of OMAP2/3
Signed-off-by: Thara Gopinath <thara@ti.com>
---
arch/arm/mach-omap2/pm.c | 24 ++++++++++++++++++------
arch/arm/plat-omap/include/plat/common.h | 3 ++-
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 68f9f2e..0331290 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -21,8 +21,9 @@
static struct omap_device_pm_latency *pm_lats;
static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
static struct device *l3_dev;
+static struct device *dsp_dev;
struct device *omap2_get_mpuss_device(void)
{
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
return mpu_dev;
}
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
{
- WARN_ON_ONCE(!dsp_dev);
- return dsp_dev;
+ WARN_ON_ONCE(!iva_dev);
+ return iva_dev;
}
struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
return l3_dev;
}
+struct device *omap4_get_dsp_device(void)
+{
+ WARN_ON_ONCE(!dsp_dev);
+ return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
/* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
static int _init_omap_device(char *name, struct device **new_dev)
{
@@ -69,8 +77,12 @@ static int _init_omap_device(char *name, struct device **new_dev)
static void omap2_init_processor_devices(void)
{
_init_omap_device("mpu", &mpu_dev);
- _init_omap_device("iva", &dsp_dev);
- _init_omap_device("l3_main", &l3_dev);
+ _init_omap_device("iva", &iva_dev);
+ _init_omap_device("dsp", &dsp_dev);
+ if (cpu_is_omap44xx())
+ _init_omap_device("l3_main_1", &l3_dev);
+ else
+ _init_omap_device("l3_main", &l3_dev);
}
static int __init omap2_common_pm_init(void)
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index 9776b41..c45dbb9 100644
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -91,7 +91,8 @@ void omap3_map_io(void);
})
extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] OMAP4: pm.c extensions for OMAP4 support
2010-08-16 9:26 [PATCH] OMAP4: pm.c extensions for OMAP4 support Thara Gopinath
@ 2010-08-16 13:53 ` Cousson, Benoit
2010-08-16 14:08 ` Gopinath, Thara
0 siblings, 1 reply; 3+ messages in thread
From: Cousson, Benoit @ 2010-08-16 13:53 UTC (permalink / raw)
To: Thara Gopinath
Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com,
paul@pwsan.com, Sripathy, Vishwanath, Sawant, Anand
Hi Thara,
On 8/16/2010 11:26 AM, Thara Gopinath wrote:
> OMAP4 has an iva device and a dsp devcice where as OMAP2/3
> has only an iva device. In this file the iva device in the
> system is registered under the name dsp_dev and the API
> to retrieve the iva device is omap2_get_dsp_device.
> This patch renames the dsp_dev to iva_dev, renames
> omap2_get_dsp_device to omap2_get_iva_device,
> registers dsp_dev for OMAP4 and adds a new API
> omap4_get_dsp_device to retrieve the dep_dev.
> This patch also registers the device "l3_main_1" as the l3
> device in case of OMAP4 and retains traditional "l3_main"
> in case of OMAP2/3
This bug is already fixed in the following patch:
http://git.kernel.org/?p=linux/kernel/git/khilman/linux-omap-pm.git;a=commit;h=71a4efad2196d0c52485aa397093c6791a6995f1
Regards,
Benoit
>
> Signed-off-by: Thara Gopinath<thara@ti.com>
> ---
> arch/arm/mach-omap2/pm.c | 24 ++++++++++++++++++------
> arch/arm/plat-omap/include/plat/common.h | 3 ++-
> 2 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index 68f9f2e..0331290 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -21,8 +21,9 @@
> static struct omap_device_pm_latency *pm_lats;
>
> static struct device *mpu_dev;
> -static struct device *dsp_dev;
> +static struct device *iva_dev;
> static struct device *l3_dev;
> +static struct device *dsp_dev;
>
> struct device *omap2_get_mpuss_device(void)
> {
> @@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
> return mpu_dev;
> }
>
> -struct device *omap2_get_dsp_device(void)
> +struct device *omap2_get_iva_device(void)
> {
> - WARN_ON_ONCE(!dsp_dev);
> - return dsp_dev;
> + WARN_ON_ONCE(!iva_dev);
> + return iva_dev;
> }
>
> struct device *omap2_get_l3_device(void)
> @@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
> return l3_dev;
> }
>
> +struct device *omap4_get_dsp_device(void)
> +{
> + WARN_ON_ONCE(!dsp_dev);
> + return dsp_dev;
> +}
> +EXPORT_SYMBOL(omap4_get_dsp_device);
> +
> /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
> static int _init_omap_device(char *name, struct device **new_dev)
> {
> @@ -69,8 +77,12 @@ static int _init_omap_device(char *name, struct device **new_dev)
> static void omap2_init_processor_devices(void)
> {
> _init_omap_device("mpu",&mpu_dev);
> - _init_omap_device("iva",&dsp_dev);
> - _init_omap_device("l3_main",&l3_dev);
> + _init_omap_device("iva",&iva_dev);
> + _init_omap_device("dsp",&dsp_dev);
> + if (cpu_is_omap44xx())
> + _init_omap_device("l3_main_1",&l3_dev);
> + else
> + _init_omap_device("l3_main",&l3_dev);
> }
>
> static int __init omap2_common_pm_init(void)
> diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
> index 9776b41..c45dbb9 100644
> --- a/arch/arm/plat-omap/include/plat/common.h
> +++ b/arch/arm/plat-omap/include/plat/common.h
> @@ -91,7 +91,8 @@ void omap3_map_io(void);
> })
>
> extern struct device *omap2_get_mpuss_device(void);
> -extern struct device *omap2_get_dsp_device(void);
> +extern struct device *omap2_get_iva_device(void);
> extern struct device *omap2_get_l3_device(void);
> +extern struct device *omap4_get_dsp_device(void);
>
> #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] OMAP4: pm.c extensions for OMAP4 support
2010-08-16 13:53 ` Cousson, Benoit
@ 2010-08-16 14:08 ` Gopinath, Thara
0 siblings, 0 replies; 3+ messages in thread
From: Gopinath, Thara @ 2010-08-16 14:08 UTC (permalink / raw)
To: Cousson, Benoit
Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com,
paul@pwsan.com, Sripathy, Vishwanath, Sawant, Anand
>>-----Original Message-----
>>From: Cousson, Benoit
>>Sent: Monday, August 16, 2010 7:23 PM
>>To: Gopinath, Thara
>>Cc: linux-omap@vger.kernel.org; khilman@deeprootsystems.com; paul@pwsan.com; Sripathy, Vishwanath;
>>Sawant, Anand
>>Subject: Re: [PATCH] OMAP4: pm.c extensions for OMAP4 support
>>
>>Hi Thara,
>>
>>On 8/16/2010 11:26 AM, Thara Gopinath wrote:
>>> OMAP4 has an iva device and a dsp devcice where as OMAP2/3
>>> has only an iva device. In this file the iva device in the
>>> system is registered under the name dsp_dev and the API
>>> to retrieve the iva device is omap2_get_dsp_device.
>>> This patch renames the dsp_dev to iva_dev, renames
>>> omap2_get_dsp_device to omap2_get_iva_device,
>>> registers dsp_dev for OMAP4 and adds a new API
>>> omap4_get_dsp_device to retrieve the dep_dev.
>>> This patch also registers the device "l3_main_1" as the l3
>>> device in case of OMAP4 and retains traditional "l3_main"
>>> in case of OMAP2/3
>>
>>This bug is already fixed in the following patch:
>>http://git.kernel.org/?p=linux/kernel/git/khilman/linux-omap-
>>pm.git;a=commit;h=71a4efad2196d0c52485aa397093c6791a6995f1
Ok. I did not see this. But rests of the changes are still valid.
I will send a V2 skipping this part.
Regards
Thara
>>
>>Regards,
>>Benoit
>>
>>>
>>> Signed-off-by: Thara Gopinath<thara@ti.com>
>>> ---
>>> arch/arm/mach-omap2/pm.c | 24 ++++++++++++++++++------
>>> arch/arm/plat-omap/include/plat/common.h | 3 ++-
>>> 2 files changed, 20 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
>>> index 68f9f2e..0331290 100644
>>> --- a/arch/arm/mach-omap2/pm.c
>>> +++ b/arch/arm/mach-omap2/pm.c
>>> @@ -21,8 +21,9 @@
>>> static struct omap_device_pm_latency *pm_lats;
>>>
>>> static struct device *mpu_dev;
>>> -static struct device *dsp_dev;
>>> +static struct device *iva_dev;
>>> static struct device *l3_dev;
>>> +static struct device *dsp_dev;
>>>
>>> struct device *omap2_get_mpuss_device(void)
>>> {
>>> @@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
>>> return mpu_dev;
>>> }
>>>
>>> -struct device *omap2_get_dsp_device(void)
>>> +struct device *omap2_get_iva_device(void)
>>> {
>>> - WARN_ON_ONCE(!dsp_dev);
>>> - return dsp_dev;
>>> + WARN_ON_ONCE(!iva_dev);
>>> + return iva_dev;
>>> }
>>>
>>> struct device *omap2_get_l3_device(void)
>>> @@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
>>> return l3_dev;
>>> }
>>>
>>> +struct device *omap4_get_dsp_device(void)
>>> +{
>>> + WARN_ON_ONCE(!dsp_dev);
>>> + return dsp_dev;
>>> +}
>>> +EXPORT_SYMBOL(omap4_get_dsp_device);
>>> +
>>> /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
>>> static int _init_omap_device(char *name, struct device **new_dev)
>>> {
>>> @@ -69,8 +77,12 @@ static int _init_omap_device(char *name, struct device **new_dev)
>>> static void omap2_init_processor_devices(void)
>>> {
>>> _init_omap_device("mpu",&mpu_dev);
>>> - _init_omap_device("iva",&dsp_dev);
>>> - _init_omap_device("l3_main",&l3_dev);
>>> + _init_omap_device("iva",&iva_dev);
>>> + _init_omap_device("dsp",&dsp_dev);
>>> + if (cpu_is_omap44xx())
>>> + _init_omap_device("l3_main_1",&l3_dev);
>>> + else
>>> + _init_omap_device("l3_main",&l3_dev);
>>> }
>>>
>>> static int __init omap2_common_pm_init(void)
>>> diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
>>> index 9776b41..c45dbb9 100644
>>> --- a/arch/arm/plat-omap/include/plat/common.h
>>> +++ b/arch/arm/plat-omap/include/plat/common.h
>>> @@ -91,7 +91,8 @@ void omap3_map_io(void);
>>> })
>>>
>>> extern struct device *omap2_get_mpuss_device(void);
>>> -extern struct device *omap2_get_dsp_device(void);
>>> +extern struct device *omap2_get_iva_device(void);
>>> extern struct device *omap2_get_l3_device(void);
>>> +extern struct device *omap4_get_dsp_device(void);
>>>
>>> #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-16 14:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-16 9:26 [PATCH] OMAP4: pm.c extensions for OMAP4 support Thara Gopinath
2010-08-16 13:53 ` Cousson, Benoit
2010-08-16 14:08 ` Gopinath, Thara
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.