aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorStepan Moskovchenko <stepanm@codeaurora.org>2010-11-12 22:29:49 -0500
committerDaniel Walker <dwalker@codeaurora.org>2010-11-30 16:54:43 -0500
commit12943325cda3be10819e047cd8b5032a4fef6080 (patch)
treed7dfb8b4f7787314013079734ff8da8dba2bf720 /arch/arm/mach-msm
parentc4bd2eebee37b885b47ec48961923b671148703f (diff)
msm: iommu: Use more consistent naming in platform data
Rename all the IOMMU platform devices so that the names are more consistent with the rest of the codebase. Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/devices-msm8x60-iommu.c136
1 files changed, 68 insertions, 68 deletions
diff --git a/arch/arm/mach-msm/devices-msm8x60-iommu.c b/arch/arm/mach-msm/devices-msm8x60-iommu.c
index 89b9d4437e92..9e657e0ee181 100644
--- a/arch/arm/mach-msm/devices-msm8x60-iommu.c
+++ b/arch/arm/mach-msm/devices-msm8x60-iommu.c
@@ -259,55 +259,55 @@ static struct platform_device msm_root_iommu_dev = {
259 .id = -1, 259 .id = -1,
260}; 260};
261 261
262static struct msm_iommu_dev jpegd_smmu = { 262static struct msm_iommu_dev jpegd_iommu = {
263 .name = "jpegd", 263 .name = "jpegd",
264 .clk_rate = -1 264 .clk_rate = -1
265}; 265};
266 266
267static struct msm_iommu_dev vpe_smmu = { 267static struct msm_iommu_dev vpe_iommu = {
268 .name = "vpe" 268 .name = "vpe"
269}; 269};
270 270
271static struct msm_iommu_dev mdp0_smmu = { 271static struct msm_iommu_dev mdp0_iommu = {
272 .name = "mdp0" 272 .name = "mdp0"
273}; 273};
274 274
275static struct msm_iommu_dev mdp1_smmu = { 275static struct msm_iommu_dev mdp1_iommu = {
276 .name = "mdp1" 276 .name = "mdp1"
277}; 277};
278 278
279static struct msm_iommu_dev rot_smmu = { 279static struct msm_iommu_dev rot_iommu = {
280 .name = "rot" 280 .name = "rot"
281}; 281};
282 282
283static struct msm_iommu_dev ijpeg_smmu = { 283static struct msm_iommu_dev ijpeg_iommu = {
284 .name = "ijpeg" 284 .name = "ijpeg"
285}; 285};
286 286
287static struct msm_iommu_dev vfe_smmu = { 287static struct msm_iommu_dev vfe_iommu = {
288 .name = "vfe", 288 .name = "vfe",
289 .clk_rate = -1 289 .clk_rate = -1
290}; 290};
291 291
292static struct msm_iommu_dev vcodec_a_smmu = { 292static struct msm_iommu_dev vcodec_a_iommu = {
293 .name = "vcodec_a" 293 .name = "vcodec_a"
294}; 294};
295 295
296static struct msm_iommu_dev vcodec_b_smmu = { 296static struct msm_iommu_dev vcodec_b_iommu = {
297 .name = "vcodec_b" 297 .name = "vcodec_b"
298}; 298};
299 299
300static struct msm_iommu_dev gfx3d_smmu = { 300static struct msm_iommu_dev gfx3d_iommu = {
301 .name = "gfx3d", 301 .name = "gfx3d",
302 .clk_rate = 27000000 302 .clk_rate = 27000000
303}; 303};
304 304
305static struct msm_iommu_dev gfx2d0_smmu = { 305static struct msm_iommu_dev gfx2d0_iommu = {
306 .name = "gfx2d0", 306 .name = "gfx2d0",
307 .clk_rate = 27000000 307 .clk_rate = 27000000
308}; 308};
309 309
310static struct platform_device msm_device_smmu_jpegd = { 310static struct platform_device msm_device_iommu_jpegd = {
311 .name = "msm_iommu", 311 .name = "msm_iommu",
312 .id = 0, 312 .id = 0,
313 .dev = { 313 .dev = {
@@ -317,7 +317,7 @@ static struct platform_device msm_device_smmu_jpegd = {
317 .resource = msm_iommu_jpegd_resources, 317 .resource = msm_iommu_jpegd_resources,
318}; 318};
319 319
320static struct platform_device msm_device_smmu_vpe = { 320static struct platform_device msm_device_iommu_vpe = {
321 .name = "msm_iommu", 321 .name = "msm_iommu",
322 .id = 1, 322 .id = 1,
323 .dev = { 323 .dev = {
@@ -327,7 +327,7 @@ static struct platform_device msm_device_smmu_vpe = {
327 .resource = msm_iommu_vpe_resources, 327 .resource = msm_iommu_vpe_resources,
328}; 328};
329 329
330static struct platform_device msm_device_smmu_mdp0 = { 330static struct platform_device msm_device_iommu_mdp0 = {
331 .name = "msm_iommu", 331 .name = "msm_iommu",
332 .id = 2, 332 .id = 2,
333 .dev = { 333 .dev = {
@@ -337,7 +337,7 @@ static struct platform_device msm_device_smmu_mdp0 = {
337 .resource = msm_iommu_mdp0_resources, 337 .resource = msm_iommu_mdp0_resources,
338}; 338};
339 339
340static struct platform_device msm_device_smmu_mdp1 = { 340static struct platform_device msm_device_iommu_mdp1 = {
341 .name = "msm_iommu", 341 .name = "msm_iommu",
342 .id = 3, 342 .id = 3,
343 .dev = { 343 .dev = {
@@ -347,7 +347,7 @@ static struct platform_device msm_device_smmu_mdp1 = {
347 .resource = msm_iommu_mdp1_resources, 347 .resource = msm_iommu_mdp1_resources,
348}; 348};
349 349
350static struct platform_device msm_device_smmu_rot = { 350static struct platform_device msm_device_iommu_rot = {
351 .name = "msm_iommu", 351 .name = "msm_iommu",
352 .id = 4, 352 .id = 4,
353 .dev = { 353 .dev = {
@@ -357,7 +357,7 @@ static struct platform_device msm_device_smmu_rot = {
357 .resource = msm_iommu_rot_resources, 357 .resource = msm_iommu_rot_resources,
358}; 358};
359 359
360static struct platform_device msm_device_smmu_ijpeg = { 360static struct platform_device msm_device_iommu_ijpeg = {
361 .name = "msm_iommu", 361 .name = "msm_iommu",
362 .id = 5, 362 .id = 5,
363 .dev = { 363 .dev = {
@@ -367,7 +367,7 @@ static struct platform_device msm_device_smmu_ijpeg = {
367 .resource = msm_iommu_ijpeg_resources, 367 .resource = msm_iommu_ijpeg_resources,
368}; 368};
369 369
370static struct platform_device msm_device_smmu_vfe = { 370static struct platform_device msm_device_iommu_vfe = {
371 .name = "msm_iommu", 371 .name = "msm_iommu",
372 .id = 6, 372 .id = 6,
373 .dev = { 373 .dev = {
@@ -377,7 +377,7 @@ static struct platform_device msm_device_smmu_vfe = {
377 .resource = msm_iommu_vfe_resources, 377 .resource = msm_iommu_vfe_resources,
378}; 378};
379 379
380static struct platform_device msm_device_smmu_vcodec_a = { 380static struct platform_device msm_device_iommu_vcodec_a = {
381 .name = "msm_iommu", 381 .name = "msm_iommu",
382 .id = 7, 382 .id = 7,
383 .dev = { 383 .dev = {
@@ -387,7 +387,7 @@ static struct platform_device msm_device_smmu_vcodec_a = {
387 .resource = msm_iommu_vcodec_a_resources, 387 .resource = msm_iommu_vcodec_a_resources,
388}; 388};
389 389
390static struct platform_device msm_device_smmu_vcodec_b = { 390static struct platform_device msm_device_iommu_vcodec_b = {
391 .name = "msm_iommu", 391 .name = "msm_iommu",
392 .id = 8, 392 .id = 8,
393 .dev = { 393 .dev = {
@@ -397,7 +397,7 @@ static struct platform_device msm_device_smmu_vcodec_b = {
397 .resource = msm_iommu_vcodec_b_resources, 397 .resource = msm_iommu_vcodec_b_resources,
398}; 398};
399 399
400static struct platform_device msm_device_smmu_gfx3d = { 400static struct platform_device msm_device_iommu_gfx3d = {
401 .name = "msm_iommu", 401 .name = "msm_iommu",
402 .id = 9, 402 .id = 9,
403 .dev = { 403 .dev = {
@@ -407,7 +407,7 @@ static struct platform_device msm_device_smmu_gfx3d = {
407 .resource = msm_iommu_gfx3d_resources, 407 .resource = msm_iommu_gfx3d_resources,
408}; 408};
409 409
410static struct platform_device msm_device_smmu_gfx2d0 = { 410static struct platform_device msm_device_iommu_gfx2d0 = {
411 .name = "msm_iommu", 411 .name = "msm_iommu",
412 .id = 10, 412 .id = 10,
413 .dev = { 413 .dev = {
@@ -553,7 +553,7 @@ static struct platform_device msm_device_jpegd_src_ctx = {
553 .name = "msm_iommu_ctx", 553 .name = "msm_iommu_ctx",
554 .id = 0, 554 .id = 0,
555 .dev = { 555 .dev = {
556 .parent = &msm_device_smmu_jpegd.dev, 556 .parent = &msm_device_iommu_jpegd.dev,
557 }, 557 },
558}; 558};
559 559
@@ -561,7 +561,7 @@ static struct platform_device msm_device_jpegd_dst_ctx = {
561 .name = "msm_iommu_ctx", 561 .name = "msm_iommu_ctx",
562 .id = 1, 562 .id = 1,
563 .dev = { 563 .dev = {
564 .parent = &msm_device_smmu_jpegd.dev, 564 .parent = &msm_device_iommu_jpegd.dev,
565 }, 565 },
566}; 566};
567 567
@@ -569,7 +569,7 @@ static struct platform_device msm_device_vpe_src_ctx = {
569 .name = "msm_iommu_ctx", 569 .name = "msm_iommu_ctx",
570 .id = 2, 570 .id = 2,
571 .dev = { 571 .dev = {
572 .parent = &msm_device_smmu_vpe.dev, 572 .parent = &msm_device_iommu_vpe.dev,
573 }, 573 },
574}; 574};
575 575
@@ -577,7 +577,7 @@ static struct platform_device msm_device_vpe_dst_ctx = {
577 .name = "msm_iommu_ctx", 577 .name = "msm_iommu_ctx",
578 .id = 3, 578 .id = 3,
579 .dev = { 579 .dev = {
580 .parent = &msm_device_smmu_vpe.dev, 580 .parent = &msm_device_iommu_vpe.dev,
581 }, 581 },
582}; 582};
583 583
@@ -585,7 +585,7 @@ static struct platform_device msm_device_mdp_vg1_ctx = {
585 .name = "msm_iommu_ctx", 585 .name = "msm_iommu_ctx",
586 .id = 4, 586 .id = 4,
587 .dev = { 587 .dev = {
588 .parent = &msm_device_smmu_mdp0.dev, 588 .parent = &msm_device_iommu_mdp0.dev,
589 }, 589 },
590}; 590};
591 591
@@ -593,7 +593,7 @@ static struct platform_device msm_device_mdp_rgb1_ctx = {
593 .name = "msm_iommu_ctx", 593 .name = "msm_iommu_ctx",
594 .id = 5, 594 .id = 5,
595 .dev = { 595 .dev = {
596 .parent = &msm_device_smmu_mdp0.dev, 596 .parent = &msm_device_iommu_mdp0.dev,
597 }, 597 },
598}; 598};
599 599
@@ -601,7 +601,7 @@ static struct platform_device msm_device_mdp_vg2_ctx = {
601 .name = "msm_iommu_ctx", 601 .name = "msm_iommu_ctx",
602 .id = 6, 602 .id = 6,
603 .dev = { 603 .dev = {
604 .parent = &msm_device_smmu_mdp1.dev, 604 .parent = &msm_device_iommu_mdp1.dev,
605 }, 605 },
606}; 606};
607 607
@@ -609,7 +609,7 @@ static struct platform_device msm_device_mdp_rgb2_ctx = {
609 .name = "msm_iommu_ctx", 609 .name = "msm_iommu_ctx",
610 .id = 7, 610 .id = 7,
611 .dev = { 611 .dev = {
612 .parent = &msm_device_smmu_mdp1.dev, 612 .parent = &msm_device_iommu_mdp1.dev,
613 }, 613 },
614}; 614};
615 615
@@ -617,7 +617,7 @@ static struct platform_device msm_device_rot_src_ctx = {
617 .name = "msm_iommu_ctx", 617 .name = "msm_iommu_ctx",
618 .id = 8, 618 .id = 8,
619 .dev = { 619 .dev = {
620 .parent = &msm_device_smmu_rot.dev, 620 .parent = &msm_device_iommu_rot.dev,
621 }, 621 },
622}; 622};
623 623
@@ -625,7 +625,7 @@ static struct platform_device msm_device_rot_dst_ctx = {
625 .name = "msm_iommu_ctx", 625 .name = "msm_iommu_ctx",
626 .id = 9, 626 .id = 9,
627 .dev = { 627 .dev = {
628 .parent = &msm_device_smmu_rot.dev, 628 .parent = &msm_device_iommu_rot.dev,
629 }, 629 },
630}; 630};
631 631
@@ -633,7 +633,7 @@ static struct platform_device msm_device_ijpeg_src_ctx = {
633 .name = "msm_iommu_ctx", 633 .name = "msm_iommu_ctx",
634 .id = 10, 634 .id = 10,
635 .dev = { 635 .dev = {
636 .parent = &msm_device_smmu_ijpeg.dev, 636 .parent = &msm_device_iommu_ijpeg.dev,
637 }, 637 },
638}; 638};
639 639
@@ -641,7 +641,7 @@ static struct platform_device msm_device_ijpeg_dst_ctx = {
641 .name = "msm_iommu_ctx", 641 .name = "msm_iommu_ctx",
642 .id = 11, 642 .id = 11,
643 .dev = { 643 .dev = {
644 .parent = &msm_device_smmu_ijpeg.dev, 644 .parent = &msm_device_iommu_ijpeg.dev,
645 }, 645 },
646}; 646};
647 647
@@ -649,7 +649,7 @@ static struct platform_device msm_device_vfe_imgwr_ctx = {
649 .name = "msm_iommu_ctx", 649 .name = "msm_iommu_ctx",
650 .id = 12, 650 .id = 12,
651 .dev = { 651 .dev = {
652 .parent = &msm_device_smmu_vfe.dev, 652 .parent = &msm_device_iommu_vfe.dev,
653 }, 653 },
654}; 654};
655 655
@@ -657,7 +657,7 @@ static struct platform_device msm_device_vfe_misc_ctx = {
657 .name = "msm_iommu_ctx", 657 .name = "msm_iommu_ctx",
658 .id = 13, 658 .id = 13,
659 .dev = { 659 .dev = {
660 .parent = &msm_device_smmu_vfe.dev, 660 .parent = &msm_device_iommu_vfe.dev,
661 }, 661 },
662}; 662};
663 663
@@ -665,7 +665,7 @@ static struct platform_device msm_device_vcodec_a_stream_ctx = {
665 .name = "msm_iommu_ctx", 665 .name = "msm_iommu_ctx",
666 .id = 14, 666 .id = 14,
667 .dev = { 667 .dev = {
668 .parent = &msm_device_smmu_vcodec_a.dev, 668 .parent = &msm_device_iommu_vcodec_a.dev,
669 }, 669 },
670}; 670};
671 671
@@ -673,7 +673,7 @@ static struct platform_device msm_device_vcodec_a_mm1_ctx = {
673 .name = "msm_iommu_ctx", 673 .name = "msm_iommu_ctx",
674 .id = 15, 674 .id = 15,
675 .dev = { 675 .dev = {
676 .parent = &msm_device_smmu_vcodec_a.dev, 676 .parent = &msm_device_iommu_vcodec_a.dev,
677 }, 677 },
678}; 678};
679 679
@@ -681,7 +681,7 @@ static struct platform_device msm_device_vcodec_b_mm2_ctx = {
681 .name = "msm_iommu_ctx", 681 .name = "msm_iommu_ctx",
682 .id = 16, 682 .id = 16,
683 .dev = { 683 .dev = {
684 .parent = &msm_device_smmu_vcodec_b.dev, 684 .parent = &msm_device_iommu_vcodec_b.dev,
685 }, 685 },
686}; 686};
687 687
@@ -689,7 +689,7 @@ static struct platform_device msm_device_gfx3d_rbpa_ctx = {
689 .name = "msm_iommu_ctx", 689 .name = "msm_iommu_ctx",
690 .id = 17, 690 .id = 17,
691 .dev = { 691 .dev = {
692 .parent = &msm_device_smmu_gfx3d.dev, 692 .parent = &msm_device_iommu_gfx3d.dev,
693 }, 693 },
694}; 694};
695 695
@@ -697,7 +697,7 @@ static struct platform_device msm_device_gfx3d_cpvgttc_ctx = {
697 .name = "msm_iommu_ctx", 697 .name = "msm_iommu_ctx",
698 .id = 18, 698 .id = 18,
699 .dev = { 699 .dev = {
700 .parent = &msm_device_smmu_gfx3d.dev, 700 .parent = &msm_device_iommu_gfx3d.dev,
701 }, 701 },
702}; 702};
703 703
@@ -705,7 +705,7 @@ static struct platform_device msm_device_gfx3d_smmu_ctx = {
705 .name = "msm_iommu_ctx", 705 .name = "msm_iommu_ctx",
706 .id = 19, 706 .id = 19,
707 .dev = { 707 .dev = {
708 .parent = &msm_device_smmu_gfx3d.dev, 708 .parent = &msm_device_iommu_gfx3d.dev,
709 }, 709 },
710}; 710};
711 711
@@ -713,7 +713,7 @@ static struct platform_device msm_device_gfx2d0_pixv1_ctx = {
713 .name = "msm_iommu_ctx", 713 .name = "msm_iommu_ctx",
714 .id = 20, 714 .id = 20,
715 .dev = { 715 .dev = {
716 .parent = &msm_device_smmu_gfx2d0.dev, 716 .parent = &msm_device_iommu_gfx2d0.dev,
717 }, 717 },
718}; 718};
719 719
@@ -721,36 +721,36 @@ static struct platform_device msm_device_gfx2d0_texv3_ctx = {
721 .name = "msm_iommu_ctx", 721 .name = "msm_iommu_ctx",
722 .id = 21, 722 .id = 21,
723 .dev = { 723 .dev = {
724 .parent = &msm_device_smmu_gfx2d0.dev, 724 .parent = &msm_device_iommu_gfx2d0.dev,
725 }, 725 },
726}; 726};
727 727
728static struct platform_device *msm_iommu_devs[] = { 728static struct platform_device *msm_iommu_devs[] = {
729 &msm_device_smmu_jpegd, 729 &msm_device_iommu_jpegd,
730 &msm_device_smmu_vpe, 730 &msm_device_iommu_vpe,
731 &msm_device_smmu_mdp0, 731 &msm_device_iommu_mdp0,
732 &msm_device_smmu_mdp1, 732 &msm_device_iommu_mdp1,
733 &msm_device_smmu_rot, 733 &msm_device_iommu_rot,
734 &msm_device_smmu_ijpeg, 734 &msm_device_iommu_ijpeg,
735 &msm_device_smmu_vfe, 735 &msm_device_iommu_vfe,
736 &msm_device_smmu_vcodec_a, 736 &msm_device_iommu_vcodec_a,
737 &msm_device_smmu_vcodec_b, 737 &msm_device_iommu_vcodec_b,
738 &msm_device_smmu_gfx3d, 738 &msm_device_iommu_gfx3d,
739 &msm_device_smmu_gfx2d0, 739 &msm_device_iommu_gfx2d0,
740}; 740};
741 741
742static struct msm_iommu_dev *msm_iommu_data[] = { 742static struct msm_iommu_dev *msm_iommu_data[] = {
743 &jpegd_smmu, 743 &jpegd_iommu,
744 &vpe_smmu, 744 &vpe_iommu,
745 &mdp0_smmu, 745 &mdp0_iommu,
746 &mdp1_smmu, 746 &mdp1_iommu,
747 &rot_smmu, 747 &rot_iommu,
748 &ijpeg_smmu, 748 &ijpeg_iommu,
749 &vfe_smmu, 749 &vfe_iommu,
750 &vcodec_a_smmu, 750 &vcodec_a_iommu,
751 &vcodec_b_smmu, 751 &vcodec_b_iommu,
752 &gfx3d_smmu, 752 &gfx3d_iommu,
753 &gfx2d0_smmu, 753 &gfx2d0_iommu,
754}; 754};
755 755
756static struct platform_device *msm_iommu_ctx_devs[] = { 756static struct platform_device *msm_iommu_ctx_devs[] = {
@@ -826,7 +826,7 @@ static int msm8x60_iommu_init(void)
826 ret = platform_device_register(msm_iommu_devs[i]); 826 ret = platform_device_register(msm_iommu_devs[i]);
827 827
828 if (ret != 0) { 828 if (ret != 0) {
829 pr_err("platform_device_register smmu failed, " 829 pr_err("platform_device_register iommu failed, "
830 "i = %d\n", i); 830 "i = %d\n", i);
831 goto failure_unwind; 831 goto failure_unwind;
832 } 832 }
@@ -837,7 +837,7 @@ static int msm8x60_iommu_init(void)
837 msm_iommu_ctx_data[i], 837 msm_iommu_ctx_data[i],
838 sizeof(*msm_iommu_ctx_devs[i])); 838 sizeof(*msm_iommu_ctx_devs[i]));
839 if (ret != 0) { 839 if (ret != 0) {
840 pr_err("platform_device_add_data smmu failed, " 840 pr_err("platform_device_add_data iommu failed, "
841 "i = %d\n", i); 841 "i = %d\n", i);
842 goto failure_unwind2; 842 goto failure_unwind2;
843 } 843 }