Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e09d02e123fb6944af23a0697369ebcfc15acf73

Authored by Eric Miao
Committed by Russell King
1 parent 9a79b22741
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[ARM] 4480/1: pxa: change the pxa device naming scheme 

1. for common devices across all the pxa variants, the names
   are changed to be:
     "pxa_device_xxx"

2. for pxa25x or pxa27x specific devices, the names are
   changed to be:
     "pxa25x_device_xxx", or
     "pxa27x_device_xxx"

Signed-off-by: eric miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 4 changed files with 53 additions and 53 deletions Side-by-side Diff

arch/arm/mach-pxa/devices.h
Diff comments   View file @ e09d02e
1   -extern struct platform_device pxamci_device;
2   -extern struct platform_device pxaudc_device;
3   -extern struct platform_device pxafb_device;
4   -extern struct platform_device ffuart_device;
5   -extern struct platform_device btuart_device;
6   -extern struct platform_device stuart_device;
7   -extern struct platform_device hwuart_device;
8   -extern struct platform_device pxai2c_device;
9   -extern struct platform_device pxai2s_device;
10   -extern struct platform_device pxaficp_device;
11   -extern struct platform_device pxartc_device;
  1 +extern struct platform_device pxa_device_mci;
  2 +extern struct platform_device pxa_device_udc;
  3 +extern struct platform_device pxa_device_fb;
  4 +extern struct platform_device pxa_device_ffuart;
  5 +extern struct platform_device pxa_device_btuart;
  6 +extern struct platform_device pxa_device_stuart;
  7 +extern struct platform_device pxa_device_hwuart;
  8 +extern struct platform_device pxa_device_i2c;
  9 +extern struct platform_device pxa_device_i2s;
  10 +extern struct platform_device pxa_device_ficp;
  11 +extern struct platform_device pxa_device_rtc;
arch/arm/mach-pxa/generic.c
Diff comments   View file @ e09d02e
... ... @@ -243,7 +243,7 @@
243 243  
244 244 static u64 pxamci_dmamask = 0xffffffffUL;
245 245  
246   -struct platform_device pxamci_device = {
  246 +struct platform_device pxa_device_mci = {
247 247 .name = "pxa2xx-mci",
248 248 .id = -1,
249 249 .dev = {
... ... @@ -256,7 +256,7 @@
256 256  
257 257 void __init pxa_set_mci_info(struct pxamci_platform_data *info)
258 258 {
259   - pxamci_device.dev.platform_data = info;
  259 + pxa_device_mci.dev.platform_data = info;
260 260 }
261 261  
262 262  
... ... @@ -282,7 +282,7 @@
282 282  
283 283 static u64 udc_dma_mask = ~(u32)0;
284 284  
285   -struct platform_device pxaudc_device = {
  285 +struct platform_device pxa_device_udc = {
286 286 .name = "pxa2xx-udc",
287 287 .id = -1,
288 288 .resource = pxa2xx_udc_resources,
... ... @@ -308,7 +308,7 @@
308 308  
309 309 static u64 fb_dma_mask = ~(u64)0;
310 310  
311   -struct platform_device pxafb_device = {
  311 +struct platform_device pxa_device_fb = {
312 312 .name = "pxa2xx-fb",
313 313 .id = -1,
314 314 .dev = {
315 315  
316 316  
317 317  
318 318  
319 319  
... ... @@ -321,27 +321,27 @@
321 321  
322 322 void __init set_pxa_fb_info(struct pxafb_mach_info *info)
323 323 {
324   - pxafb_device.dev.platform_data = info;
  324 + pxa_device_fb.dev.platform_data = info;
325 325 }
326 326  
327 327 void __init set_pxa_fb_parent(struct device *parent_dev)
328 328 {
329   - pxafb_device.dev.parent = parent_dev;
  329 + pxa_device_fb.dev.parent = parent_dev;
330 330 }
331 331  
332   -struct platform_device ffuart_device = {
  332 +struct platform_device pxa_device_ffuart= {
333 333 .name = "pxa2xx-uart",
334 334 .id = 0,
335 335 };
336   -struct platform_device btuart_device = {
  336 +struct platform_device pxa_device_btuart = {
337 337 .name = "pxa2xx-uart",
338 338 .id = 1,
339 339 };
340   -struct platform_device stuart_device = {
  340 +struct platform_device pxa_device_stuart = {
341 341 .name = "pxa2xx-uart",
342 342 .id = 2,
343 343 };
344   -struct platform_device hwuart_device = {
  344 +struct platform_device pxa_device_hwuart = {
345 345 .name = "pxa2xx-uart",
346 346 .id = 3,
347 347 };
... ... @@ -358,7 +358,7 @@
358 358 },
359 359 };
360 360  
361   -struct platform_device pxai2c_device = {
  361 +struct platform_device pxa_device_i2c = {
362 362 .name = "pxa2xx-i2c",
363 363 .id = 0,
364 364 .resource = pxai2c_resources,
... ... @@ -367,7 +367,7 @@
367 367  
368 368 void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
369 369 {
370   - pxai2c_device.dev.platform_data = info;
  370 + pxa_device_i2c.dev.platform_data = info;
371 371 }
372 372  
373 373 static struct resource pxai2s_resources[] = {
... ... @@ -382,7 +382,7 @@
382 382 },
383 383 };
384 384  
385   -struct platform_device pxai2s_device = {
  385 +struct platform_device pxa_device_i2s = {
386 386 .name = "pxa2xx-i2s",
387 387 .id = -1,
388 388 .resource = pxai2s_resources,
... ... @@ -391,7 +391,7 @@
391 391  
392 392 static u64 pxaficp_dmamask = ~(u32)0;
393 393  
394   -struct platform_device pxaficp_device = {
  394 +struct platform_device pxa_device_ficp = {
395 395 .name = "pxa2xx-ir",
396 396 .id = -1,
397 397 .dev = {
398 398  
... ... @@ -402,10 +402,10 @@
402 402  
403 403 void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
404 404 {
405   - pxaficp_device.dev.platform_data = info;
  405 + pxa_device_ficp.dev.platform_data = info;
406 406 }
407 407  
408   -struct platform_device pxartc_device = {
  408 +struct platform_device pxa_device_rtc = {
409 409 .name = "sa1100-rtc",
410 410 .id = -1,
411 411 };
arch/arm/mach-pxa/pxa25x.c
Diff comments   View file @ e09d02e
... ... @@ -139,16 +139,16 @@
139 139 }
140 140  
141 141 static struct platform_device *pxa25x_devices[] __initdata = {
142   - &pxamci_device,
143   - &pxaudc_device,
144   - &pxafb_device,
145   - &ffuart_device,
146   - &btuart_device,
147   - &stuart_device,
148   - &pxai2c_device,
149   - &pxai2s_device,
150   - &pxaficp_device,
151   - &pxartc_device,
  142 + &pxa_device_mci,
  143 + &pxa_device_udc,
  144 + &pxa_device_fb,
  145 + &pxa_device_ffuart,
  146 + &pxa_device_btuart,
  147 + &pxa_device_stuart,
  148 + &pxa_device_i2c,
  149 + &pxa_device_i2s,
  150 + &pxa_device_ficp,
  151 + &pxa_device_rtc,
152 152 };
153 153  
154 154 static int __init pxa25x_init(void)
... ... @@ -166,7 +166,7 @@
166 166 }
167 167 /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
168 168 if (cpu_is_pxa25x())
169   - ret = platform_device_register(&hwuart_device);
  169 + ret = platform_device_register(&pxa_device_hwuart);
170 170  
171 171 return ret;
172 172 }
arch/arm/mach-pxa/pxa27x.c
Diff comments   View file @ e09d02e
... ... @@ -185,7 +185,7 @@
185 185 },
186 186 };
187 187  
188   -static struct platform_device pxaohci_device = {
  188 +static struct platform_device pxa27x_device_ohci = {
189 189 .name = "pxa27x-ohci",
190 190 .id = -1,
191 191 .dev = {
... ... @@ -198,7 +198,7 @@
198 198  
199 199 void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
200 200 {
201   - pxaohci_device.dev.platform_data = info;
  201 + pxa27x_device_ohci.dev.platform_data = info;
202 202 }
203 203  
204 204 static struct resource i2c_power_resources[] = {
... ... @@ -213,7 +213,7 @@
213 213 },
214 214 };
215 215  
216   -static struct platform_device pxai2c_power_device = {
  216 +static struct platform_device pxa27x_device_i2c_power = {
217 217 .name = "pxa2xx-i2c",
218 218 .id = 1,
219 219 .resource = i2c_power_resources,
... ... @@ -221,18 +221,18 @@
221 221 };
222 222  
223 223 static struct platform_device *devices[] __initdata = {
224   - &pxamci_device,
225   - &pxaudc_device,
226   - &pxafb_device,
227   - &ffuart_device,
228   - &btuart_device,
229   - &stuart_device,
230   - &pxai2c_device,
231   - &pxai2c_power_device,
232   - &pxai2s_device,
233   - &pxaficp_device,
234   - &pxartc_device,
235   - &pxaohci_device,
  224 + &pxa_device_mci,
  225 + &pxa_device_udc,
  226 + &pxa_device_fb,
  227 + &pxa_device_ffuart,
  228 + &pxa_device_btuart,
  229 + &pxa_device_stuart,
  230 + &pxa_device_i2c,
  231 + &pxa_device_i2s,
  232 + &pxa_device_ficp,
  233 + &pxa_device_rtc,
  234 + &pxa27x_device_i2c_power,
  235 + &pxa27x_device_ohci,
236 236 };
237 237  
238 238 void __init pxa27x_init_irq(void)