Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d80162eccd56c40228e1232de8a203e8553b20a4

Authored by Tomasz Figa
Committed by Kukjin Kim
1 parent 91d88f038e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: dts: Use drive strength 3 for SD pins for exynos4 

This patch modifies pin control groups of SD pins on EXYNOS4210
and EXYNOS4X12 to use drive strength 3 as a default value which
corresponds to S5P_GPIO_DRVSTR_LV4 in legacy non-DT code.

This is needed at least on Origen board for sdhci2 to work and
if any other drive strength is required on each board, we can
overide it.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: edited commit message]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Showing 2 changed files with 56 additions and 56 deletions Side-by-side Diff

arch/arm/boot/dts/exynos4210-pinctrl.dtsi
Diff comments   View file @ d80162e
... ... @@ -482,196 +482,196 @@
482 482 samsung,pins = "gpk0-0";
483 483 samsung,pin-function = <2>;
484 484 samsung,pin-pud = <0>;
485   - samsung,pin-drv = <0>;
  485 + samsung,pin-drv = <3>;
486 486 };
487 487  
488 488 sd0_cmd: sd0-cmd {
489 489 samsung,pins = "gpk0-1";
490 490 samsung,pin-function = <2>;
491 491 samsung,pin-pud = <0>;
492   - samsung,pin-drv = <0>;
  492 + samsung,pin-drv = <3>;
493 493 };
494 494  
495 495 sd0_cd: sd0-cd {
496 496 samsung,pins = "gpk0-2";
497 497 samsung,pin-function = <2>;
498 498 samsung,pin-pud = <3>;
499   - samsung,pin-drv = <0>;
  499 + samsung,pin-drv = <3>;
500 500 };
501 501  
502 502 sd0_bus1: sd0-bus-width1 {
503 503 samsung,pins = "gpk0-3";
504 504 samsung,pin-function = <2>;
505 505 samsung,pin-pud = <3>;
506   - samsung,pin-drv = <0>;
  506 + samsung,pin-drv = <3>;
507 507 };
508 508  
509 509 sd0_bus4: sd0-bus-width4 {
510 510 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
511 511 samsung,pin-function = <2>;
512 512 samsung,pin-pud = <3>;
513   - samsung,pin-drv = <0>;
  513 + samsung,pin-drv = <3>;
514 514 };
515 515  
516 516 sd0_bus8: sd0-bus-width8 {
517 517 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
518 518 samsung,pin-function = <3>;
519 519 samsung,pin-pud = <3>;
520   - samsung,pin-drv = <0>;
  520 + samsung,pin-drv = <3>;
521 521 };
522 522  
523 523 sd4_clk: sd4-clk {
524 524 samsung,pins = "gpk0-0";
525 525 samsung,pin-function = <3>;
526 526 samsung,pin-pud = <0>;
527   - samsung,pin-drv = <0>;
  527 + samsung,pin-drv = <3>;
528 528 };
529 529  
530 530 sd4_cmd: sd4-cmd {
531 531 samsung,pins = "gpk0-1";
532 532 samsung,pin-function = <3>;
533 533 samsung,pin-pud = <0>;
534   - samsung,pin-drv = <0>;
  534 + samsung,pin-drv = <3>;
535 535 };
536 536  
537 537 sd4_cd: sd4-cd {
538 538 samsung,pins = "gpk0-2";
539 539 samsung,pin-function = <3>;
540 540 samsung,pin-pud = <3>;
541   - samsung,pin-drv = <0>;
  541 + samsung,pin-drv = <3>;
542 542 };
543 543  
544 544 sd4_bus1: sd4-bus-width1 {
545 545 samsung,pins = "gpk0-3";
546 546 samsung,pin-function = <3>;
547 547 samsung,pin-pud = <3>;
548   - samsung,pin-drv = <0>;
  548 + samsung,pin-drv = <3>;
549 549 };
550 550  
551 551 sd4_bus4: sd4-bus-width4 {
552 552 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
553 553 samsung,pin-function = <3>;
554 554 samsung,pin-pud = <3>;
555   - samsung,pin-drv = <0>;
  555 + samsung,pin-drv = <3>;
556 556 };
557 557  
558 558 sd4_bus8: sd4-bus-width8 {
559 559 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
560 560 samsung,pin-function = <3>;
561 561 samsung,pin-pud = <4>;
562   - samsung,pin-drv = <0>;
  562 + samsung,pin-drv = <3>;
563 563 };
564 564  
565 565 sd1_clk: sd1-clk {
566 566 samsung,pins = "gpk1-0";
567 567 samsung,pin-function = <2>;
568 568 samsung,pin-pud = <0>;
569   - samsung,pin-drv = <0>;
  569 + samsung,pin-drv = <3>;
570 570 };
571 571  
572 572 sd1_cmd: sd1-cmd {
573 573 samsung,pins = "gpk1-1";
574 574 samsung,pin-function = <2>;
575 575 samsung,pin-pud = <0>;
576   - samsung,pin-drv = <0>;
  576 + samsung,pin-drv = <3>;
577 577 };
578 578  
579 579 sd1_cd: sd1-cd {
580 580 samsung,pins = "gpk1-2";
581 581 samsung,pin-function = <2>;
582 582 samsung,pin-pud = <3>;
583   - samsung,pin-drv = <0>;
  583 + samsung,pin-drv = <3>;
584 584 };
585 585  
586 586 sd1_bus1: sd1-bus-width1 {
587 587 samsung,pins = "gpk1-3";
588 588 samsung,pin-function = <2>;
589 589 samsung,pin-pud = <3>;
590   - samsung,pin-drv = <0>;
  590 + samsung,pin-drv = <3>;
591 591 };
592 592  
593 593 sd1_bus4: sd1-bus-width4 {
594 594 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
595 595 samsung,pin-function = <2>;
596 596 samsung,pin-pud = <3>;
597   - samsung,pin-drv = <0>;
  597 + samsung,pin-drv = <3>;
598 598 };
599 599  
600 600 sd2_clk: sd2-clk {
601 601 samsung,pins = "gpk2-0";
602 602 samsung,pin-function = <2>;
603 603 samsung,pin-pud = <0>;
604   - samsung,pin-drv = <0>;
  604 + samsung,pin-drv = <3>;
605 605 };
606 606  
607 607 sd2_cmd: sd2-cmd {
608 608 samsung,pins = "gpk2-1";
609 609 samsung,pin-function = <2>;
610 610 samsung,pin-pud = <0>;
611   - samsung,pin-drv = <0>;
  611 + samsung,pin-drv = <3>;
612 612 };
613 613  
614 614 sd2_cd: sd2-cd {
615 615 samsung,pins = "gpk2-2";
616 616 samsung,pin-function = <2>;
617 617 samsung,pin-pud = <3>;
618   - samsung,pin-drv = <0>;
  618 + samsung,pin-drv = <3>;
619 619 };
620 620  
621 621 sd2_bus1: sd2-bus-width1 {
622 622 samsung,pins = "gpk2-3";
623 623 samsung,pin-function = <2>;
624 624 samsung,pin-pud = <3>;
625   - samsung,pin-drv = <0>;
  625 + samsung,pin-drv = <3>;
626 626 };
627 627  
628 628 sd2_bus4: sd2-bus-width4 {
629 629 samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
630 630 samsung,pin-function = <2>;
631 631 samsung,pin-pud = <3>;
632   - samsung,pin-drv = <0>;
  632 + samsung,pin-drv = <3>;
633 633 };
634 634  
635 635 sd2_bus8: sd2-bus-width8 {
636 636 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
637 637 samsung,pin-function = <3>;
638 638 samsung,pin-pud = <3>;
639   - samsung,pin-drv = <0>;
  639 + samsung,pin-drv = <3>;
640 640 };
641 641  
642 642 sd3_clk: sd3-clk {
643 643 samsung,pins = "gpk3-0";
644 644 samsung,pin-function = <2>;
645 645 samsung,pin-pud = <0>;
646   - samsung,pin-drv = <0>;
  646 + samsung,pin-drv = <3>;
647 647 };
648 648  
649 649 sd3_cmd: sd3-cmd {
650 650 samsung,pins = "gpk3-1";
651 651 samsung,pin-function = <2>;
652 652 samsung,pin-pud = <0>;
653   - samsung,pin-drv = <0>;
  653 + samsung,pin-drv = <3>;
654 654 };
655 655  
656 656 sd3_cd: sd3-cd {
657 657 samsung,pins = "gpk3-2";
658 658 samsung,pin-function = <2>;
659 659 samsung,pin-pud = <3>;
660   - samsung,pin-drv = <0>;
  660 + samsung,pin-drv = <3>;
661 661 };
662 662  
663 663 sd3_bus1: sd3-bus-width1 {
664 664 samsung,pins = "gpk3-3";
665 665 samsung,pin-function = <2>;
666 666 samsung,pin-pud = <3>;
667   - samsung,pin-drv = <0>;
  667 + samsung,pin-drv = <3>;
668 668 };
669 669  
670 670 sd3_bus4: sd3-bus-width4 {
671 671 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
672 672 samsung,pin-function = <2>;
673 673 samsung,pin-pud = <3>;
674   - samsung,pin-drv = <0>;
  674 + samsung,pin-drv = <3>;
675 675 };
676 676  
677 677 eint0: ext-int0 {
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
Diff comments   View file @ d80162e
... ... @@ -586,196 +586,196 @@
586 586 samsung,pins = "gpk0-0";
587 587 samsung,pin-function = <2>;
588 588 samsung,pin-pud = <0>;
589   - samsung,pin-drv = <0>;
  589 + samsung,pin-drv = <3>;
590 590 };
591 591  
592 592 sd0_cmd: sd0-cmd {
593 593 samsung,pins = "gpk0-1";
594 594 samsung,pin-function = <2>;
595 595 samsung,pin-pud = <0>;
596   - samsung,pin-drv = <0>;
  596 + samsung,pin-drv = <3>;
597 597 };
598 598  
599 599 sd0_cd: sd0-cd {
600 600 samsung,pins = "gpk0-2";
601 601 samsung,pin-function = <2>;
602 602 samsung,pin-pud = <3>;
603   - samsung,pin-drv = <0>;
  603 + samsung,pin-drv = <3>;
604 604 };
605 605  
606 606 sd0_bus1: sd0-bus-width1 {
607 607 samsung,pins = "gpk0-3";
608 608 samsung,pin-function = <2>;
609 609 samsung,pin-pud = <3>;
610   - samsung,pin-drv = <0>;
  610 + samsung,pin-drv = <3>;
611 611 };
612 612  
613 613 sd0_bus4: sd0-bus-width4 {
614 614 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
615 615 samsung,pin-function = <2>;
616 616 samsung,pin-pud = <3>;
617   - samsung,pin-drv = <0>;
  617 + samsung,pin-drv = <3>;
618 618 };
619 619  
620 620 sd0_bus8: sd0-bus-width8 {
621 621 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
622 622 samsung,pin-function = <3>;
623 623 samsung,pin-pud = <3>;
624   - samsung,pin-drv = <0>;
  624 + samsung,pin-drv = <3>;
625 625 };
626 626  
627 627 sd4_clk: sd4-clk {
628 628 samsung,pins = "gpk0-0";
629 629 samsung,pin-function = <3>;
630 630 samsung,pin-pud = <0>;
631   - samsung,pin-drv = <0>;
  631 + samsung,pin-drv = <3>;
632 632 };
633 633  
634 634 sd4_cmd: sd4-cmd {
635 635 samsung,pins = "gpk0-1";
636 636 samsung,pin-function = <3>;
637 637 samsung,pin-pud = <0>;
638   - samsung,pin-drv = <0>;
  638 + samsung,pin-drv = <3>;
639 639 };
640 640  
641 641 sd4_cd: sd4-cd {
642 642 samsung,pins = "gpk0-2";
643 643 samsung,pin-function = <3>;
644 644 samsung,pin-pud = <3>;
645   - samsung,pin-drv = <0>;
  645 + samsung,pin-drv = <3>;
646 646 };
647 647  
648 648 sd4_bus1: sd4-bus-width1 {
649 649 samsung,pins = "gpk0-3";
650 650 samsung,pin-function = <3>;
651 651 samsung,pin-pud = <3>;
652   - samsung,pin-drv = <0>;
  652 + samsung,pin-drv = <3>;
653 653 };
654 654  
655 655 sd4_bus4: sd4-bus-width4 {
656 656 samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
657 657 samsung,pin-function = <3>;
658 658 samsung,pin-pud = <3>;
659   - samsung,pin-drv = <0>;
  659 + samsung,pin-drv = <3>;
660 660 };
661 661  
662 662 sd4_bus8: sd4-bus-width8 {
663 663 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
664 664 samsung,pin-function = <3>;
665 665 samsung,pin-pud = <4>;
666   - samsung,pin-drv = <0>;
  666 + samsung,pin-drv = <3>;
667 667 };
668 668  
669 669 sd1_clk: sd1-clk {
670 670 samsung,pins = "gpk1-0";
671 671 samsung,pin-function = <2>;
672 672 samsung,pin-pud = <0>;
673   - samsung,pin-drv = <0>;
  673 + samsung,pin-drv = <3>;
674 674 };
675 675  
676 676 sd1_cmd: sd1-cmd {
677 677 samsung,pins = "gpk1-1";
678 678 samsung,pin-function = <2>;
679 679 samsung,pin-pud = <0>;
680   - samsung,pin-drv = <0>;
  680 + samsung,pin-drv = <3>;
681 681 };
682 682  
683 683 sd1_cd: sd1-cd {
684 684 samsung,pins = "gpk1-2";
685 685 samsung,pin-function = <2>;
686 686 samsung,pin-pud = <3>;
687   - samsung,pin-drv = <0>;
  687 + samsung,pin-drv = <3>;
688 688 };
689 689  
690 690 sd1_bus1: sd1-bus-width1 {
691 691 samsung,pins = "gpk1-3";
692 692 samsung,pin-function = <2>;
693 693 samsung,pin-pud = <3>;
694   - samsung,pin-drv = <0>;
  694 + samsung,pin-drv = <3>;
695 695 };
696 696  
697 697 sd1_bus4: sd1-bus-width4 {
698 698 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
699 699 samsung,pin-function = <2>;
700 700 samsung,pin-pud = <3>;
701   - samsung,pin-drv = <0>;
  701 + samsung,pin-drv = <3>;
702 702 };
703 703  
704 704 sd2_clk: sd2-clk {
705 705 samsung,pins = "gpk2-0";
706 706 samsung,pin-function = <2>;
707 707 samsung,pin-pud = <0>;
708   - samsung,pin-drv = <0>;
  708 + samsung,pin-drv = <3>;
709 709 };
710 710  
711 711 sd2_cmd: sd2-cmd {
712 712 samsung,pins = "gpk2-1";
713 713 samsung,pin-function = <2>;
714 714 samsung,pin-pud = <0>;
715   - samsung,pin-drv = <0>;
  715 + samsung,pin-drv = <3>;
716 716 };
717 717  
718 718 sd2_cd: sd2-cd {
719 719 samsung,pins = "gpk2-2";
720 720 samsung,pin-function = <2>;
721 721 samsung,pin-pud = <3>;
722   - samsung,pin-drv = <0>;
  722 + samsung,pin-drv = <3>;
723 723 };
724 724  
725 725 sd2_bus1: sd2-bus-width1 {
726 726 samsung,pins = "gpk2-3";
727 727 samsung,pin-function = <2>;
728 728 samsung,pin-pud = <3>;
729   - samsung,pin-drv = <0>;
  729 + samsung,pin-drv = <3>;
730 730 };
731 731  
732 732 sd2_bus4: sd2-bus-width4 {
733 733 samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
734 734 samsung,pin-function = <2>;
735 735 samsung,pin-pud = <3>;
736   - samsung,pin-drv = <0>;
  736 + samsung,pin-drv = <3>;
737 737 };
738 738  
739 739 sd2_bus8: sd2-bus-width8 {
740 740 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
741 741 samsung,pin-function = <3>;
742 742 samsung,pin-pud = <3>;
743   - samsung,pin-drv = <0>;
  743 + samsung,pin-drv = <3>;
744 744 };
745 745  
746 746 sd3_clk: sd3-clk {
747 747 samsung,pins = "gpk3-0";
748 748 samsung,pin-function = <2>;
749 749 samsung,pin-pud = <0>;
750   - samsung,pin-drv = <0>;
  750 + samsung,pin-drv = <3>;
751 751 };
752 752  
753 753 sd3_cmd: sd3-cmd {
754 754 samsung,pins = "gpk3-1";
755 755 samsung,pin-function = <2>;
756 756 samsung,pin-pud = <0>;
757   - samsung,pin-drv = <0>;
  757 + samsung,pin-drv = <3>;
758 758 };
759 759  
760 760 sd3_cd: sd3-cd {
761 761 samsung,pins = "gpk3-2";
762 762 samsung,pin-function = <2>;
763 763 samsung,pin-pud = <3>;
764   - samsung,pin-drv = <0>;
  764 + samsung,pin-drv = <3>;
765 765 };
766 766  
767 767 sd3_bus1: sd3-bus-width1 {
768 768 samsung,pins = "gpk3-3";
769 769 samsung,pin-function = <2>;
770 770 samsung,pin-pud = <3>;
771   - samsung,pin-drv = <0>;
  771 + samsung,pin-drv = <3>;
772 772 };
773 773  
774 774 sd3_bus4: sd3-bus-width4 {
775 775 samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
776 776 samsung,pin-function = <2>;
777 777 samsung,pin-pud = <3>;
778   - samsung,pin-drv = <0>;
  778 + samsung,pin-drv = <3>;
779 779 };
780 780  
781 781 keypad_col0: keypad-col0 {