OMAP4: pm.c extensions for OMAP4 support
PATCH v3 1/1 OMAP4: pm.c extensions for OMAP4 support
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.
---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.
v3: Put OMAP4 check across dsp_dev init so that on other
OMAP's this init does not throw a warn.
arch/arm/mach-omap2/pm.c | 20 +++++++++++++++----- arch/arm/plat-omap/include/plat/common.h | 3 ++- 2 files changed, 17 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +15 -5
@@ -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,7 +77,9 @@ 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 ("iva" , &iva_dev); +if (cpu_is_omap44xx ()) +_init_omap_device ("dsp" , &dsp_dev);_init_omap_device ("l3_main" , &l3_dev); }
arch/arm/plat-omap/include/plat/common.h +2 -1
@@ -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 */
Signature · 1 line
1.7.0.4
Quoted 9 lines · 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_devand the API to retrieve the iva device isomap2_get_dsp_device. This patch renames thedsp_devtoiva_dev, renamesomap2_get_dsp_devicetoomap2_get_iva_device, registersdsp_devfor OMAP4 and adds a new APIomap4_get_dsp_deviceto retrieve thedep_dev.
Quoted 6 lines
Signed-off-by Thara Gopinath <[email protected]>---
v2: Removed fixing ofl3_mainhwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.
v3: Put OMAP4 check acrossdsp_devinit so that on other
OMAP's this init does not throw a warn.
Thanks, queuing for 2.6.37 in my pm-next branch.
I changed the subject slightly, and I had to fix up a conflict that wasn't there when you submitted, so I fixed it myself: basically, there was already a cpu_is_omap4* check in the function due to the l3_main name differences, so I just added the dsp check to the existing cpu_is check.
Updated patch below for reference.
Kevin
commit fe3d5eec187ad5e1171599f75241ac6649294e4d
Author: Thara Gopinath <[email protected]> Date: Wed Sep 1 13:44:53 2010 +0530
OMAP2+: PM: OMAP4 has separate IVA and DSP devices
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.
arch/arm/mach-omap2/pm.c +16 -6
@@ -23,8 +23,9 @@ extern int __init omap3_pm_init_opp_table(void);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 ) {
@@ -32,10 +33,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 )
@@ -44,6 +45,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) {
@@ -72,10 +80,12 @@ static void omap2_init_processor_devices(void) {_init_omap_device ("mpu" , &mpu_dev);_init_omap_device ("iva" , &dsp_dev); -if (cpu_is_omap44xx ()) +if (cpu_is_omap44xx ()) {_init_omap_device ("l3_main_1" , &l3_dev); -else +_init_omap_device ("dsp" , &dsp_dev); + }else {_init_omap_device ("l3_main" , &l3_dev); + } }static int __init omap2_common_pm_init (void )
(quoted diff) +0 -0
b/arch/arm/plat-omap/include/plat/common.h
index 1a36172..159e45c 100644
arch/arm/plat-omap/include/plat/common.h +2 -1
@@ -90,7 +90,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 */
Quoted 17 lines · Kevin Hilman
Quoted 9 lines · 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_devand the API to retrieve the iva device isomap2_get_dsp_device. This patch renames thedsp_devtoiva_dev, renamesomap2_get_dsp_devicetoomap2_get_iva_device, registersdsp_devfor OMAP4 and adds a new APIomap4_get_dsp_deviceto retrieve thedep_dev.Quoted 6 lines
Signed-off-by Thara Gopinath <[email protected]>---
v2: Removed fixing ofl3_mainhwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.
v3: Put OMAP4 check acrossdsp_devinit so that on other
OMAP's this init does not throw a warn.
Quoted 7 lines
Thanks, queuing for 2.6.37 in my pm-next branch.
I changed the subject slightly, and I had to fix up a conflict that wasn't there when you submitted, so I fixed it myself: basically, there was already a cpu_is_omap4* check in the function due to the
l3_mainname differences, so I just added the dsp check to the existingcpu_ischeck.
Ignore the bit about the conflict. It applies cleanly to my pm-next.
The conflict is when merging with the l3_main name change later in the pm-core branch.
Kevin