[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / pm-wip / voltdm / 0105-OMAP3-powerdomain-data-add-voltage-domains.patch
1 From 595cfecd088ff8aaf211b8f20a946a7688bb4edb Mon Sep 17 00:00:00 2001
2 From: Kevin Hilman <khilman@ti.com>
3 Date: Fri, 18 Mar 2011 14:12:18 -0700
4 Subject: [PATCH 105/149] OMAP3: powerdomain data: add voltage domains
6 Add voltage domain name to indicate which voltagedomain each
7 powerdomain is in.
9 Signed-off-by: Kevin Hilman <khilman@ti.com>
10 ---
11 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 2 ++
12 arch/arm/mach-omap2/powerdomains3xxx_data.c | 16 ++++++++++++++++
13 2 files changed, 18 insertions(+), 0 deletions(-)
15 diff --git a/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c b/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
16 index 4210c33..2242c8e 100644
17 --- a/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
18 +++ b/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
19 @@ -70,6 +70,7 @@ struct powerdomain gfx_omap2_pwrdm = {
20 .pwrsts_mem_on = {
21 [0] = PWRSTS_ON, /* MEMONSTATE */
22 },
23 + .voltdm = { .name = "core" },
24 };
26 struct powerdomain wkup_omap2_pwrdm = {
27 @@ -77,4 +78,5 @@ struct powerdomain wkup_omap2_pwrdm = {
28 .prcm_offs = WKUP_MOD,
29 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
30 .pwrsts = PWRSTS_ON,
31 + .voltdm = { .name = "wakeup" },
32 };
33 diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c
34 index 469a920..1f37c0c 100644
35 --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
36 +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
37 @@ -52,6 +52,7 @@ static struct powerdomain iva2_pwrdm = {
38 [2] = PWRSTS_OFF_ON,
39 [3] = PWRSTS_ON,
40 },
41 + .voltdm = { .name = "mpu_iva" },
42 };
44 static struct powerdomain mpu_3xxx_pwrdm = {
45 @@ -68,6 +69,7 @@ static struct powerdomain mpu_3xxx_pwrdm = {
46 .pwrsts_mem_on = {
47 [0] = PWRSTS_OFF_ON,
48 },
49 + .voltdm = { .name = "mpu_iva" },
50 };
52 /*
53 @@ -98,6 +100,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = {
54 [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
55 [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
56 },
57 + .voltdm = { .name = "core" },
58 };
60 static struct powerdomain core_3xxx_es3_1_pwrdm = {
61 @@ -121,6 +124,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
62 [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
63 [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
64 },
65 + .voltdm = { .name = "core" },
66 };
68 static struct powerdomain dss_pwrdm = {
69 @@ -136,6 +140,7 @@ static struct powerdomain dss_pwrdm = {
70 .pwrsts_mem_on = {
71 [0] = PWRSTS_ON, /* MEMONSTATE */
72 },
73 + .voltdm = { .name = "core" },
74 };
76 /*
77 @@ -157,6 +162,7 @@ static struct powerdomain sgx_pwrdm = {
78 .pwrsts_mem_on = {
79 [0] = PWRSTS_ON, /* MEMONSTATE */
80 },
81 + .voltdm = { .name = "core" },
82 };
84 static struct powerdomain cam_pwrdm = {
85 @@ -172,6 +178,7 @@ static struct powerdomain cam_pwrdm = {
86 .pwrsts_mem_on = {
87 [0] = PWRSTS_ON, /* MEMONSTATE */
88 },
89 + .voltdm = { .name = "core" },
90 };
92 static struct powerdomain per_pwrdm = {
93 @@ -187,12 +194,14 @@ static struct powerdomain per_pwrdm = {
94 .pwrsts_mem_on = {
95 [0] = PWRSTS_ON, /* MEMONSTATE */
96 },
97 + .voltdm = { .name = "core" },
98 };
100 static struct powerdomain emu_pwrdm = {
101 .name = "emu_pwrdm",
102 .prcm_offs = OMAP3430_EMU_MOD,
103 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
104 + .voltdm = { .name = "core" },
105 };
107 static struct powerdomain neon_pwrdm = {
108 @@ -201,6 +210,7 @@ static struct powerdomain neon_pwrdm = {
109 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
110 .pwrsts = PWRSTS_OFF_RET_ON,
111 .pwrsts_logic_ret = PWRSTS_RET,
112 + .voltdm = { .name = "mpu_iva" },
113 };
115 static struct powerdomain usbhost_pwrdm = {
116 @@ -223,36 +233,42 @@ static struct powerdomain usbhost_pwrdm = {
117 .pwrsts_mem_on = {
118 [0] = PWRSTS_ON, /* MEMONSTATE */
119 },
120 + .voltdm = { .name = "core" },
121 };
123 static struct powerdomain dpll1_pwrdm = {
124 .name = "dpll1_pwrdm",
125 .prcm_offs = MPU_MOD,
126 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
127 + .voltdm = { .name = "mpu_iva" },
128 };
130 static struct powerdomain dpll2_pwrdm = {
131 .name = "dpll2_pwrdm",
132 .prcm_offs = OMAP3430_IVA2_MOD,
133 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
134 + .voltdm = { .name = "mpu_iva" },
135 };
137 static struct powerdomain dpll3_pwrdm = {
138 .name = "dpll3_pwrdm",
139 .prcm_offs = PLL_MOD,
140 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
141 + .voltdm = { .name = "core" },
142 };
144 static struct powerdomain dpll4_pwrdm = {
145 .name = "dpll4_pwrdm",
146 .prcm_offs = PLL_MOD,
147 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
148 + .voltdm = { .name = "core" },
149 };
151 static struct powerdomain dpll5_pwrdm = {
152 .name = "dpll5_pwrdm",
153 .prcm_offs = PLL_MOD,
154 .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
155 + .voltdm = { .name = "core" },
156 };
158 /* As powerdomains are added or removed above, this list must also be changed */
159 --
160 1.6.6.1