← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/clk/mxs/clk-imx28.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/clk/mxs/clk-imx28.c
120
120
        writel_relaxed(val, FRAC0);
121
121
}
122
122
 
123
 
static struct clk_lookup uart_lookups[] __initdata = {
 
123
static struct clk_lookup uart_lookups[] = {
124
124
        { .dev_id = "duart", },
125
125
        { .dev_id = "mxs-auart.0", },
126
126
        { .dev_id = "mxs-auart.1", },
135
135
        { .dev_id = "80074000.serial", },
136
136
};
137
137
 
138
 
static struct clk_lookup hbus_lookups[] __initdata = {
 
138
static struct clk_lookup hbus_lookups[] = {
139
139
        { .dev_id = "imx28-dma-apbh", },
140
140
        { .dev_id = "80004000.dma-apbh", },
141
141
};
142
142
 
143
 
static struct clk_lookup xbus_lookups[] __initdata = {
 
143
static struct clk_lookup xbus_lookups[] = {
144
144
        { .dev_id = "duart", .con_id = "apb_pclk"},
145
145
        { .dev_id = "80074000.serial", .con_id = "apb_pclk"},
146
146
        { .dev_id = "imx28-dma-apbx", },
147
147
        { .dev_id = "80024000.dma-apbx", },
148
148
};
149
149
 
150
 
static struct clk_lookup ssp0_lookups[] __initdata = {
 
150
static struct clk_lookup ssp0_lookups[] = {
151
151
        { .dev_id = "imx28-mmc.0", },
152
152
        { .dev_id = "80010000.ssp", },
153
153
};
154
154
 
155
 
static struct clk_lookup ssp1_lookups[] __initdata = {
 
155
static struct clk_lookup ssp1_lookups[] = {
156
156
        { .dev_id = "imx28-mmc.1", },
157
157
        { .dev_id = "80012000.ssp", },
158
158
};
159
159
 
160
 
static struct clk_lookup ssp2_lookups[] __initdata = {
 
160
static struct clk_lookup ssp2_lookups[] = {
161
161
        { .dev_id = "imx28-mmc.2", },
162
162
        { .dev_id = "80014000.ssp", },
163
163
};
164
164
 
165
 
static struct clk_lookup ssp3_lookups[] __initdata = {
 
165
static struct clk_lookup ssp3_lookups[] = {
166
166
        { .dev_id = "imx28-mmc.3", },
167
167
        { .dev_id = "80016000.ssp", },
168
168
};
169
169
 
170
 
static struct clk_lookup lcdif_lookups[] __initdata = {
 
170
static struct clk_lookup lcdif_lookups[] = {
171
171
        { .dev_id = "imx28-fb", },
172
172
        { .dev_id = "80030000.lcdif", },
173
173
};
174
174
 
175
 
static struct clk_lookup gpmi_lookups[] __initdata = {
 
175
static struct clk_lookup gpmi_lookups[] = {
176
176
        { .dev_id = "imx28-gpmi-nand", },
177
177
        { .dev_id = "8000c000.gpmi", },
178
178
};
179
179
 
180
 
static struct clk_lookup fec_lookups[] __initdata = {
 
180
static struct clk_lookup fec_lookups[] = {
181
181
        { .dev_id = "imx28-fec.0", },
182
182
        { .dev_id = "imx28-fec.1", },
183
183
        { .dev_id = "800f0000.ethernet", },
184
184
        { .dev_id = "800f4000.ethernet", },
185
185
};
186
186
 
187
 
static struct clk_lookup can0_lookups[] __initdata = {
 
187
static struct clk_lookup can0_lookups[] = {
188
188
        { .dev_id = "flexcan.0", },
189
189
        { .dev_id = "80032000.can", },
190
190
};
191
191
 
192
 
static struct clk_lookup can1_lookups[] __initdata = {
 
192
static struct clk_lookup can1_lookups[] = {
193
193
        { .dev_id = "flexcan.1", },
194
194
        { .dev_id = "80034000.can", },
195
195
};
196
196
 
197
 
static struct clk_lookup saif0_lookups[] __initdata = {
 
197
static struct clk_lookup saif0_lookups[] = {
198
198
        { .dev_id = "mxs-saif.0", },
199
199
        { .dev_id = "80042000.saif", },
200
200
};
201
201
 
202
 
static struct clk_lookup saif1_lookups[] __initdata = {
 
202
static struct clk_lookup saif1_lookups[] = {
203
203
        { .dev_id = "mxs-saif.1", },
204
204
        { .dev_id = "80046000.saif", },
205
205
};
245
245
        clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);
246
246
        clks[ref_cpu] = mxs_clk_ref("ref_cpu", "pll0", FRAC0, 0);
247
247
        clks[ref_emi] = mxs_clk_ref("ref_emi", "pll0", FRAC0, 1);
248
 
        clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 2);
249
 
        clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 3);
 
248
        clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 2);
 
249
        clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 3);
250
250
        clks[ref_pix] = mxs_clk_ref("ref_pix", "pll0", FRAC1, 0);
251
251
        clks[ref_hsadc] = mxs_clk_ref("ref_hsadc", "pll0", FRAC1, 1);
252
252
        clks[ref_gpmi] = mxs_clk_ref("ref_gpmi", "pll0", FRAC1, 2);