← Back to branch summary

~beagleboard-kernel/+junk/2.6-stable

« back to all changes in this revision

Viewing changes to patches/for_next/0158-omap4-powerdomain-Use-intended-PWRSTS_-flags-instead.patch

  • Committer: Robert Nelson
  • Date: 2011-05-30 18:22:18 UTC
  • Revision ID: robertcnelson@gmail.com-20110530182218-kl9c2elev8wckknd
Tags: 2.6.39-x0
2.6.39-x0 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/for_next/0158-omap4-powerdomain-Use-intended-PWRSTS_-flags-instead.patch
1
 
From 73428f2fc8fda8cc5729eef38b43d49ebdbb61c8 Mon Sep 17 00:00:00 2001
2
 
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3
 
Date: Fri, 25 Feb 2011 15:21:17 -0700
4
 
Subject: [PATCH 158/258] omap4: powerdomain: Use intended PWRSTS_* flags instead of values
5
 
 
6
 
IVAHD and ABE power domain logic state is populated using directly
7
 
value instead of the capability flags.
8
 
 
9
 
Fix the same.
10
 
 
11
 
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
12
 
[paul@pwsan.com: updated to apply at a different point on the tree]
13
 
Signed-off-by: Paul Walmsley <paul@pwsan.com>
14
 
---
15
 
 arch/arm/mach-omap2/powerdomains44xx_data.c |    4 ++--
16
 
 1 files changed, 2 insertions(+), 2 deletions(-)
17
 
 
18
 
diff --git a/arch/arm/mach-omap2/powerdomains44xx_data.c b/arch/arm/mach-omap2/powerdomains44xx_data.c
19
 
index 26d7641..226e01a 100644
20
 
--- a/arch/arm/mach-omap2/powerdomains44xx_data.c
21
 
+++ b/arch/arm/mach-omap2/powerdomains44xx_data.c
22
 
@@ -80,7 +80,7 @@ static struct powerdomain abe_44xx_pwrdm = {
23
 
        .prcm_partition   = OMAP4430_PRM_PARTITION,
24
 
        .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
25
 
        .pwrsts           = PWRSTS_OFF_RET_ON,
26
 
-       .pwrsts_logic_ret = PWRDM_POWER_OFF,
27
 
+       .pwrsts_logic_ret = PWRSTS_OFF,
28
 
        .banks            = 2,
29
 
        .pwrsts_mem_ret = {
30
 
                [0] = PWRDM_POWER_RET,  /* aessmem */
31
 
@@ -227,7 +227,7 @@ static struct powerdomain ivahd_44xx_pwrdm = {
32
 
        .prcm_partition   = OMAP4430_PRM_PARTITION,
33
 
        .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
34
 
        .pwrsts           = PWRSTS_OFF_RET_ON,
35
 
-       .pwrsts_logic_ret = PWRDM_POWER_OFF,
36
 
+       .pwrsts_logic_ret = PWRSTS_OFF,
37
 
        .banks            = 4,
38
 
        .pwrsts_mem_ret = {
39
 
                [0] = PWRDM_POWER_OFF,  /* hwa_mem */
40
 
1.7.1
41