diff options
Diffstat (limited to 'recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0046-OMAP4-hwmod-data-Fix-bad-alignement.patch')
-rw-r--r-- | recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0046-OMAP4-hwmod-data-Fix-bad-alignement.patch | 218 |
1 files changed, 0 insertions, 218 deletions
diff --git a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0046-OMAP4-hwmod-data-Fix-bad-alignement.patch b/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0046-OMAP4-hwmod-data-Fix-bad-alignement.patch deleted file mode 100644 index b60f299c..00000000 --- a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0046-OMAP4-hwmod-data-Fix-bad-alignement.patch +++ /dev/null | |||
@@ -1,218 +0,0 @@ | |||
1 | From b3ef885514cc4b31d763b09dd78f26e2134c47c5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Benoit Cousson <b-cousson@ti.com> | ||
3 | Date: Sat, 9 Jul 2011 19:14:28 -0600 | ||
4 | Subject: [PATCH 046/149] OMAP4: hwmod data: Fix bad alignement | ||
5 | |||
6 | Fix .prcm alignement and usb_otg_hs class and hwmod structures. | ||
7 | |||
8 | Add a couple of more potential hwmods in the comment. | ||
9 | Remove hsi, since it is already included in the data. | ||
10 | |||
11 | Remove one blank line. | ||
12 | |||
13 | Signed-off-by: Benoit Cousson <b-cousson@ti.com> | ||
14 | Cc: Paul Walmsley <paul@pwsan.com> | ||
15 | Signed-off-by: Paul Walmsley <paul@pwsan.com> | ||
16 | --- | ||
17 | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 45 ++++++++++++++------------- | ||
18 | 1 files changed, 23 insertions(+), 22 deletions(-) | ||
19 | |||
20 | diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | ||
21 | index 7eed6a2..1975b05 100644 | ||
22 | --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | ||
23 | +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | ||
24 | @@ -632,7 +632,9 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = { | ||
25 | * gpmc | ||
26 | * gpu | ||
27 | * hdq1w | ||
28 | - * hsi | ||
29 | + * mcasp | ||
30 | + * mpu_c0 | ||
31 | + * mpu_c1 | ||
32 | * ocmc_ram | ||
33 | * ocp2scp_usb_phy | ||
34 | * ocp_wp_noc | ||
35 | @@ -740,7 +742,7 @@ static struct omap_hwmod omap44xx_aess_hwmod = { | ||
36 | .mpu_irqs = omap44xx_aess_irqs, | ||
37 | .sdma_reqs = omap44xx_aess_sdma_reqs, | ||
38 | .main_clk = "aess_fck", | ||
39 | - .prcm = { | ||
40 | + .prcm = { | ||
41 | .omap4 = { | ||
42 | .clkctrl_reg = OMAP4430_CM1_ABE_AESS_CLKCTRL, | ||
43 | }, | ||
44 | @@ -769,7 +771,7 @@ static struct omap_hwmod_opt_clk bandgap_opt_clks[] = { | ||
45 | static struct omap_hwmod omap44xx_bandgap_hwmod = { | ||
46 | .name = "bandgap", | ||
47 | .class = &omap44xx_bandgap_hwmod_class, | ||
48 | - .prcm = { | ||
49 | + .prcm = { | ||
50 | .omap4 = { | ||
51 | .clkctrl_reg = OMAP4430_CM_WKUP_BANDGAP_CLKCTRL, | ||
52 | }, | ||
53 | @@ -828,7 +830,7 @@ static struct omap_hwmod omap44xx_counter_32k_hwmod = { | ||
54 | .class = &omap44xx_counter_hwmod_class, | ||
55 | .flags = HWMOD_SWSUP_SIDLE, | ||
56 | .main_clk = "sys_32k_ck", | ||
57 | - .prcm = { | ||
58 | + .prcm = { | ||
59 | .omap4 = { | ||
60 | .clkctrl_reg = OMAP4430_CM_WKUP_SYNCTIMER_CLKCTRL, | ||
61 | }, | ||
62 | @@ -1004,7 +1006,7 @@ static struct omap_hwmod omap44xx_dmic_hwmod = { | ||
63 | .mpu_irqs = omap44xx_dmic_irqs, | ||
64 | .sdma_reqs = omap44xx_dmic_sdma_reqs, | ||
65 | .main_clk = "dmic_fck", | ||
66 | - .prcm = { | ||
67 | + .prcm = { | ||
68 | .omap4 = { | ||
69 | .clkctrl_reg = OMAP4430_CM1_ABE_DMIC_CLKCTRL, | ||
70 | }, | ||
71 | @@ -2094,7 +2096,7 @@ static struct omap_hwmod omap44xx_hsi_hwmod = { | ||
72 | .class = &omap44xx_hsi_hwmod_class, | ||
73 | .mpu_irqs = omap44xx_hsi_irqs, | ||
74 | .main_clk = "hsi_fck", | ||
75 | - .prcm = { | ||
76 | + .prcm = { | ||
77 | .omap4 = { | ||
78 | .clkctrl_reg = OMAP4430_CM_L3INIT_HSI_CLKCTRL, | ||
79 | }, | ||
80 | @@ -2391,7 +2393,7 @@ static struct omap_hwmod omap44xx_ipu_c0_hwmod = { | ||
81 | .flags = HWMOD_INIT_NO_RESET, | ||
82 | .rst_lines = omap44xx_ipu_c0_resets, | ||
83 | .rst_lines_cnt = ARRAY_SIZE(omap44xx_ipu_c0_resets), | ||
84 | - .prcm = { | ||
85 | + .prcm = { | ||
86 | .omap4 = { | ||
87 | .rstctrl_reg = OMAP4430_RM_DUCATI_RSTCTRL, | ||
88 | }, | ||
89 | @@ -2406,7 +2408,7 @@ static struct omap_hwmod omap44xx_ipu_c1_hwmod = { | ||
90 | .flags = HWMOD_INIT_NO_RESET, | ||
91 | .rst_lines = omap44xx_ipu_c1_resets, | ||
92 | .rst_lines_cnt = ARRAY_SIZE(omap44xx_ipu_c1_resets), | ||
93 | - .prcm = { | ||
94 | + .prcm = { | ||
95 | .omap4 = { | ||
96 | .rstctrl_reg = OMAP4430_RM_DUCATI_RSTCTRL, | ||
97 | }, | ||
98 | @@ -2421,7 +2423,7 @@ static struct omap_hwmod omap44xx_ipu_hwmod = { | ||
99 | .rst_lines = omap44xx_ipu_resets, | ||
100 | .rst_lines_cnt = ARRAY_SIZE(omap44xx_ipu_resets), | ||
101 | .main_clk = "ipu_fck", | ||
102 | - .prcm = { | ||
103 | + .prcm = { | ||
104 | .omap4 = { | ||
105 | .clkctrl_reg = OMAP4430_CM_DUCATI_DUCATI_CLKCTRL, | ||
106 | .rstctrl_reg = OMAP4430_RM_DUCATI_RSTCTRL, | ||
107 | @@ -2507,7 +2509,7 @@ static struct omap_hwmod omap44xx_iss_hwmod = { | ||
108 | .mpu_irqs = omap44xx_iss_irqs, | ||
109 | .sdma_reqs = omap44xx_iss_sdma_reqs, | ||
110 | .main_clk = "iss_fck", | ||
111 | - .prcm = { | ||
112 | + .prcm = { | ||
113 | .omap4 = { | ||
114 | .clkctrl_reg = OMAP4430_CM_CAM_ISS_CLKCTRL, | ||
115 | }, | ||
116 | @@ -2687,7 +2689,7 @@ static struct omap_hwmod omap44xx_kbd_hwmod = { | ||
117 | .class = &omap44xx_kbd_hwmod_class, | ||
118 | .mpu_irqs = omap44xx_kbd_irqs, | ||
119 | .main_clk = "kbd_fck", | ||
120 | - .prcm = { | ||
121 | + .prcm = { | ||
122 | .omap4 = { | ||
123 | .clkctrl_reg = OMAP4430_CM_WKUP_KEYBOARD_CLKCTRL, | ||
124 | }, | ||
125 | @@ -2751,7 +2753,7 @@ static struct omap_hwmod omap44xx_mailbox_hwmod = { | ||
126 | .name = "mailbox", | ||
127 | .class = &omap44xx_mailbox_hwmod_class, | ||
128 | .mpu_irqs = omap44xx_mailbox_irqs, | ||
129 | - .prcm = { | ||
130 | + .prcm = { | ||
131 | .omap4 = { | ||
132 | .clkctrl_reg = OMAP4430_CM_L4CFG_MAILBOX_CLKCTRL, | ||
133 | }, | ||
134 | @@ -3133,7 +3135,7 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = { | ||
135 | .mpu_irqs = omap44xx_mcpdm_irqs, | ||
136 | .sdma_reqs = omap44xx_mcpdm_sdma_reqs, | ||
137 | .main_clk = "mcpdm_fck", | ||
138 | - .prcm = { | ||
139 | + .prcm = { | ||
140 | .omap4 = { | ||
141 | .clkctrl_reg = OMAP4430_CM1_ABE_PDM_CLKCTRL, | ||
142 | }, | ||
143 | @@ -3430,7 +3432,6 @@ static struct omap_hwmod_class omap44xx_mmc_hwmod_class = { | ||
144 | }; | ||
145 | |||
146 | /* mmc1 */ | ||
147 | - | ||
148 | static struct omap_hwmod_irq_info omap44xx_mmc1_irqs[] = { | ||
149 | { .irq = 83 + OMAP44XX_IRQ_GIC_START }, | ||
150 | { .irq = -1 } | ||
151 | @@ -3481,7 +3482,7 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = { | ||
152 | .mpu_irqs = omap44xx_mmc1_irqs, | ||
153 | .sdma_reqs = omap44xx_mmc1_sdma_reqs, | ||
154 | .main_clk = "mmc1_fck", | ||
155 | - .prcm = { | ||
156 | + .prcm = { | ||
157 | .omap4 = { | ||
158 | .clkctrl_reg = OMAP4430_CM_L3INIT_MMC1_CLKCTRL, | ||
159 | }, | ||
160 | @@ -3540,7 +3541,7 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = { | ||
161 | .mpu_irqs = omap44xx_mmc2_irqs, | ||
162 | .sdma_reqs = omap44xx_mmc2_sdma_reqs, | ||
163 | .main_clk = "mmc2_fck", | ||
164 | - .prcm = { | ||
165 | + .prcm = { | ||
166 | .omap4 = { | ||
167 | .clkctrl_reg = OMAP4430_CM_L3INIT_MMC2_CLKCTRL, | ||
168 | }, | ||
169 | @@ -3594,7 +3595,7 @@ static struct omap_hwmod omap44xx_mmc3_hwmod = { | ||
170 | .mpu_irqs = omap44xx_mmc3_irqs, | ||
171 | .sdma_reqs = omap44xx_mmc3_sdma_reqs, | ||
172 | .main_clk = "mmc3_fck", | ||
173 | - .prcm = { | ||
174 | + .prcm = { | ||
175 | .omap4 = { | ||
176 | .clkctrl_reg = OMAP4430_CM_L4PER_MMCSD3_CLKCTRL, | ||
177 | }, | ||
178 | @@ -3647,7 +3648,7 @@ static struct omap_hwmod omap44xx_mmc4_hwmod = { | ||
179 | |||
180 | .sdma_reqs = omap44xx_mmc4_sdma_reqs, | ||
181 | .main_clk = "mmc4_fck", | ||
182 | - .prcm = { | ||
183 | + .prcm = { | ||
184 | .omap4 = { | ||
185 | .clkctrl_reg = OMAP4430_CM_L4PER_MMCSD4_CLKCTRL, | ||
186 | }, | ||
187 | @@ -3699,7 +3700,7 @@ static struct omap_hwmod omap44xx_mmc5_hwmod = { | ||
188 | .mpu_irqs = omap44xx_mmc5_irqs, | ||
189 | .sdma_reqs = omap44xx_mmc5_sdma_reqs, | ||
190 | .main_clk = "mmc5_fck", | ||
191 | - .prcm = { | ||
192 | + .prcm = { | ||
193 | .omap4 = { | ||
194 | .clkctrl_reg = OMAP4430_CM_L4PER_MMCSD5_CLKCTRL, | ||
195 | }, | ||
196 | @@ -4835,8 +4836,8 @@ static struct omap_hwmod_class_sysconfig omap44xx_usb_otg_hs_sysc = { | ||
197 | }; | ||
198 | |||
199 | static struct omap_hwmod_class omap44xx_usb_otg_hs_hwmod_class = { | ||
200 | - .name = "usb_otg_hs", | ||
201 | - .sysc = &omap44xx_usb_otg_hs_sysc, | ||
202 | + .name = "usb_otg_hs", | ||
203 | + .sysc = &omap44xx_usb_otg_hs_sysc, | ||
204 | }; | ||
205 | |||
206 | /* usb_otg_hs */ | ||
207 | @@ -4890,7 +4891,7 @@ static struct omap_hwmod omap44xx_usb_otg_hs_hwmod = { | ||
208 | }, | ||
209 | }, | ||
210 | .opt_clks = usb_otg_hs_opt_clks, | ||
211 | - .opt_clks_cnt = ARRAY_SIZE(usb_otg_hs_opt_clks), | ||
212 | + .opt_clks_cnt = ARRAY_SIZE(usb_otg_hs_opt_clks), | ||
213 | .slaves = omap44xx_usb_otg_hs_slaves, | ||
214 | .slaves_cnt = ARRAY_SIZE(omap44xx_usb_otg_hs_slaves), | ||
215 | .masters = omap44xx_usb_otg_hs_masters, | ||
216 | -- | ||
217 | 1.7.2.5 | ||
218 | |||