Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 32d4060f845d189308d3431a7df4931ab4bd8f01

Authored by Ye Li
1 parent 6b0d709df6
Exists in smarc-n7.1.2_2.0.0-ga and in 4 other branches smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m

MLK-14845 mx6/mx7: Not call usb setup functions used by non-DM driver 

Use CONFIG_DM_USB to comment out USB setup functions used by non-DM driver. So
they won't be executed when using DM driver.

These USB setup functions may setup power control pins to USB_PWR function not GPIO,
which is different as the GPIO function used by USB vbus-supply. And cause the power control
not work.

Signed-off-by: Ye Li <ye.li@nxp.com>

Showing 17 changed files with 101 additions and 1 deletions Side-by-side Diff

board/freescale/mx6dqscm/mx6dqscm.c
Diff comments   View file @ 32d4060
... ... @@ -627,6 +627,7 @@
627 627 }
628 628  
629 629 #ifdef CONFIG_USB_EHCI_MX6
  630 +#ifndef CONFIG_DM_USB
630 631 #define USB_OTHERREGS_OFFSET 0x800
631 632 #define UCTRL_PWR_POL (1 << 9)
632 633  
... ... @@ -708,6 +709,7 @@
708 709 return 0;
709 710 }
710 711 #endif
  712 +#endif
711 713  
712 714 int board_early_init_f(void)
713 715 {
714 716  
... ... @@ -733,7 +735,19 @@
733 735 #endif
734 736  
735 737 #ifdef CONFIG_USB_EHCI_MX6
  738 +#ifndef CONFIG_DM_USB
736 739 setup_usb();
  740 +#else
  741 + /*
  742 + * set daisy chain for otg_pin_id on 6q.
  743 + * for 6dl, this bit is reserved
  744 + */
  745 + #ifdef CONFIG_SCMEVB
  746 + imx_iomux_set_gpr_register(1, 13, 1, 0);
  747 + #else
  748 + imx_iomux_set_gpr_register(1, 13, 1, 1);
  749 + #endif
  750 +#endif
737 751 #endif
738 752  
739 753 #ifdef CONFIG_PCIE_IMX
board/freescale/mx6qarm2/mx6qarm2.c
Diff comments   View file @ 32d4060
... ... @@ -239,6 +239,7 @@
239 239 }
240 240  
241 241 #ifdef CONFIG_USB_EHCI_MX6
  242 +#ifndef CONFIG_DM_USB
242 243 #define USB_OTHERREGS_OFFSET 0x800
243 244 #define UCTRL_PWR_POL (1 << 9)
244 245  
... ... @@ -274,6 +275,7 @@
274 275 return 0;
275 276 }
276 277 #endif
  278 +#endif
277 279  
278 280 int board_early_init_f(void)
279 281 {
280 282  
... ... @@ -288,7 +290,15 @@
288 290 gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
289 291  
290 292 #ifdef CONFIG_USB_EHCI_MX6
  293 +#ifndef CONFIG_DM_USB
291 294 setup_usb();
  295 +#else
  296 + /*
  297 + * set daisy chain for otg_pin_id on 6q.
  298 + * for 6dl, this bit is reserved
  299 + */
  300 + imx_iomux_set_gpr_register(1, 13, 1, 1);
  301 +#endif
292 302 #endif
293 303  
294 304 return 0;
board/freescale/mx6qsabreauto/mx6qsabreauto.c
Diff comments   View file @ 32d4060
... ... @@ -718,7 +718,7 @@
718 718 #endif
719 719  
720 720 #ifdef CONFIG_USB_EHCI_MX6
721   -
  721 +#ifndef CONFIG_DM_USB
722 722 iomux_v3_cfg_t const usb_otg_pads[] = {
723 723 MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL),
724 724 };
... ... @@ -798,6 +798,7 @@
798 798 return 0;
799 799 }
800 800 #endif
  801 +#endif
801 802  
802 803 int board_early_init_f(void)
803 804 {
804 805  
... ... @@ -858,7 +859,15 @@
858 859 #endif
859 860  
860 861 #ifdef CONFIG_USB_EHCI_MX6
  862 +#ifndef CONFIG_DM_USB
861 863 setup_usb();
  864 +#else
  865 + /*
  866 + * Set daisy chain for otg_pin_id on 6q.
  867 + * For 6dl, this bit is reserved.
  868 + */
  869 + imx_iomux_set_gpr_register(1, 13, 1, 0);
  870 +#endif
862 871 #endif
863 872  
864 873 return 0;
board/freescale/mx6sabresd/mx6sabresd.c
Diff comments   View file @ 32d4060
... ... @@ -827,6 +827,8 @@
827 827 }
828 828  
829 829 #ifdef CONFIG_USB_EHCI_MX6
  830 +#ifndef CONFIG_DM_USB
  831 +
830 832 #define USB_OTHERREGS_OFFSET 0x800
831 833 #define UCTRL_PWR_POL (1 << 9)
832 834  
... ... @@ -889,6 +891,7 @@
889 891 return 0;
890 892 }
891 893 #endif
  894 +#endif
892 895  
893 896 int board_early_init_f(void)
894 897 {
895 898  
... ... @@ -914,7 +917,15 @@
914 917 #endif
915 918  
916 919 #ifdef CONFIG_USB_EHCI_MX6
  920 +#ifndef CONFIG_DM_USB
917 921 setup_usb();
  922 +#else
  923 + /*
  924 + * set daisy chain for otg_pin_id on 6q.
  925 + * for 6dl, this bit is reserved
  926 + */
  927 + imx_iomux_set_gpr_register(1, 13, 1, 0);
  928 +#endif
918 929 #endif
919 930  
920 931 #ifdef CONFIG_PCIE_IMX
board/freescale/mx6slevk/mx6slevk.c
Diff comments   View file @ 32d4060
... ... @@ -573,6 +573,8 @@
573 573 #endif
574 574  
575 575 #ifdef CONFIG_USB_EHCI_MX6
  576 +#ifndef CONFIG_DM_USB
  577 +
576 578 #define USB_OTHERREGS_OFFSET 0x800
577 579 #define UCTRL_PWR_POL (1 << 9)
578 580  
... ... @@ -614,6 +616,7 @@
614 616 return 0;
615 617 }
616 618 #endif
  619 +#endif
617 620  
618 621 int board_early_init_f(void)
619 622 {
620 623  
... ... @@ -825,7 +828,9 @@
825 828 #endif
826 829  
827 830 #ifdef CONFIG_USB_EHCI_MX6
  831 +#ifndef CONFIG_DM_USB
828 832 setup_usb();
  833 +#endif
829 834 #endif
830 835  
831 836 return 0;
board/freescale/mx6sll_arm2/mx6sll_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -669,6 +669,8 @@
669 669  
670 670  
671 671 #ifdef CONFIG_USB_EHCI_MX6
  672 +#ifndef CONFIG_DM_USB
  673 +
672 674 #define USB_OTHERREGS_OFFSET 0x800
673 675 #define UCTRL_PWR_POL (1 << 9)
674 676 iomux_v3_cfg_t const usb_otg1_pads[] = {
... ... @@ -717,6 +719,7 @@
717 719  
718 720 return 0;
719 721 }
  722 +#endif
720 723 #endif
721 724  
722 725 int board_early_init_f(void)
board/freescale/mx6sx_17x17_arm2/mx6sx_17x17_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -732,6 +732,8 @@
732 732 }
733 733  
734 734 #ifdef CONFIG_USB_EHCI_MX6
  735 +#ifndef CONFIG_DM_USB
  736 +
735 737 #define USB_OTHERREGS_OFFSET 0x800
736 738 #define UCTRL_PWR_POL (1 << 9)
737 739  
... ... @@ -768,6 +770,7 @@
768 770 return 0;
769 771 }
770 772 #endif
  773 +#endif
771 774  
772 775 int board_init(void)
773 776 {
774 777  
... ... @@ -800,7 +803,9 @@
800 803 #endif
801 804  
802 805 #ifdef CONFIG_USB_EHCI_MX6
  806 +#ifndef CONFIG_DM_USB
803 807 setup_usb();
  808 +#endif
804 809 #endif
805 810 return 0;
806 811 }
board/freescale/mx6sx_19x19_arm2/mx6sx_19x19_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -739,6 +739,8 @@
739 739 }
740 740  
741 741 #ifdef CONFIG_USB_EHCI_MX6
  742 +#ifndef CONFIG_DM_USB
  743 +
742 744 #define USB_OTHERREGS_OFFSET 0x800
743 745 #define UCTRL_PWR_POL (1 << 9)
744 746  
... ... @@ -778,6 +780,7 @@
778 780 return 0;
779 781 }
780 782 #endif
  783 +#endif
781 784  
782 785 int board_init(void)
783 786 {
784 787  
... ... @@ -806,7 +809,9 @@
806 809 #endif
807 810  
808 811 #ifdef CONFIG_USB_EHCI_MX6
  812 +#ifndef CONFIG_DM_USB
809 813 setup_usb();
  814 +#endif
810 815 #endif
811 816  
812 817 #ifdef CONFIG_FSL_QSPI
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
Diff comments   View file @ 32d4060
... ... @@ -217,6 +217,8 @@
217 217 #endif
218 218  
219 219 #ifdef CONFIG_USB_EHCI_MX6
  220 +#ifndef CONFIG_DM_USB
  221 +
220 222 #define USB_OTHERREGS_OFFSET 0x800
221 223 #define UCTRL_PWR_POL (1 << 9)
222 224  
... ... @@ -258,6 +260,7 @@
258 260 return 0;
259 261 }
260 262 #endif
  263 +#endif
261 264  
262 265 int board_early_init_f(void)
263 266 {
264 267  
... ... @@ -499,7 +502,9 @@
499 502 dm_gpio_set_value(&desc, 0);
500 503  
501 504 #ifdef CONFIG_USB_EHCI_MX6
  505 +#ifndef CONFIG_DM_USB
502 506 setup_usb();
  507 +#endif
503 508 #endif
504 509  
505 510 #ifdef CONFIG_FSL_QSPI
board/freescale/mx6sxsabresd/mx6sxsabresd.c
Diff comments   View file @ 32d4060
... ... @@ -486,6 +486,8 @@
486 486 #endif
487 487  
488 488 #ifdef CONFIG_USB_EHCI_MX6
  489 +#ifndef CONFIG_DM_USB
  490 +
489 491 #define USB_OTHERREGS_OFFSET 0x800
490 492 #define UCTRL_PWR_POL (1 << 9)
491 493  
... ... @@ -527,6 +529,7 @@
527 529 return 0;
528 530 }
529 531 #endif
  532 +#endif
530 533  
531 534 int board_phy_config(struct phy_device *phydev)
532 535 {
533 536  
... ... @@ -930,7 +933,9 @@
930 933 #endif
931 934  
932 935 #ifdef CONFIG_USB_EHCI_MX6
  936 +#ifndef CONFIG_DM_USB
933 937 setup_usb();
  938 +#endif
934 939 #endif
935 940  
936 941 #ifdef CONFIG_FSL_QSPI
board/freescale/mx6sxscm/mx6sxscm.c
Diff comments   View file @ 32d4060
... ... @@ -527,6 +527,8 @@
527 527 #endif
528 528  
529 529 #ifdef CONFIG_USB_EHCI_MX6
  530 +#ifndef CONFIG_DM_USB
  531 +
530 532 #define USB_OTHERREGS_OFFSET 0x800
531 533 #define UCTRL_PWR_POL (1 << 9)
532 534  
... ... @@ -568,6 +570,7 @@
568 570 return 0;
569 571 }
570 572 #endif
  573 +#endif
571 574  
572 575 int board_phy_config(struct phy_device *phydev)
573 576 {
574 577  
... ... @@ -911,7 +914,9 @@
911 914 #endif
912 915  
913 916 #ifdef CONFIG_USB_EHCI_MX6
  917 +#ifndef CONFIG_DM_USB
914 918 setup_usb();
  919 +#endif
915 920 #endif
916 921  
917 922 #ifdef CONFIG_FSL_QSPI
board/freescale/mx6ul_14x14_ddr3_arm2/mx6ul_14x14_ddr3_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -1010,6 +1010,8 @@
1010 1010 }
1011 1011  
1012 1012 #ifdef CONFIG_USB_EHCI_MX6
  1013 +#ifndef CONFIG_DM_USB
  1014 +
1013 1015 #define USB_OTHERREGS_OFFSET 0x800
1014 1016 #define UCTRL_PWR_POL (1 << 9)
1015 1017 iomux_v3_cfg_t const usb_otg1_pads[] = {
... ... @@ -1062,5 +1064,6 @@
1062 1064  
1063 1065 return 0;
1064 1066 }
  1067 +#endif
1065 1068 #endif
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
Diff comments   View file @ 32d4060
... ... @@ -586,6 +586,8 @@
586 586 #endif
587 587  
588 588 #ifdef CONFIG_USB_EHCI_MX6
  589 +#ifndef CONFIG_DM_USB
  590 +
589 591 #define USB_OTHERREGS_OFFSET 0x800
590 592 #define UCTRL_PWR_POL (1 << 9)
591 593  
... ... @@ -624,6 +626,7 @@
624 626 return 0;
625 627 }
626 628 #endif
  629 +#endif
627 630  
628 631 #ifdef CONFIG_NAND_MXS
629 632 static iomux_v3_cfg_t const nand_pads[] = {
630 633  
... ... @@ -864,7 +867,9 @@
864 867 #endif
865 868  
866 869 #ifdef CONFIG_USB_EHCI_MX6
  870 +#ifndef CONFIG_DM_USB
867 871 setup_usb();
  872 +#endif
868 873 #endif
869 874  
870 875 #ifdef CONFIG_FSL_QSPI
board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -947,6 +947,8 @@
947 947 }
948 948  
949 949 #ifdef CONFIG_USB_EHCI_MX6
  950 +#ifndef CONFIG_DM_USB
  951 +
950 952 #define USB_OTHERREGS_OFFSET 0x800
951 953 #define UCTRL_PWR_POL (1 << 9)
952 954 iomux_v3_cfg_t const usb_otg1_pads[] = {
... ... @@ -999,5 +1001,6 @@
999 1001  
1000 1002 return 0;
1001 1003 }
  1004 +#endif
1002 1005 #endif
board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -1137,6 +1137,8 @@
1137 1137 }
1138 1138  
1139 1139 #ifdef CONFIG_USB_EHCI_MX6
  1140 +#ifndef CONFIG_DM_USB
  1141 +
1140 1142 #define USB_OTHERREGS_OFFSET 0x800
1141 1143 #define UCTRL_PWR_POL (1 << 9)
1142 1144 iomux_v3_cfg_t const usb_otg1_pads[] = {
... ... @@ -1189,5 +1191,6 @@
1189 1191  
1190 1192 return 0;
1191 1193 }
  1194 +#endif
1192 1195 #endif
board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -456,6 +456,7 @@
456 456 #endif
457 457  
458 458 #ifdef CONFIG_USB_EHCI_MX7
  459 +#ifndef CONFIG_DM_USB
459 460 iomux_v3_cfg_t const usb_otg1_pads[] = {
460 461 MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
461 462 };
... ... @@ -470,6 +471,7 @@
470 471 imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, ARRAY_SIZE(usb_otg2_pads));
471 472 }
472 473 #endif
  474 +#endif
473 475  
474 476 int board_early_init_f(void)
475 477 {
476 478  
... ... @@ -481,7 +483,9 @@
481 483 #endif
482 484  
483 485 #ifdef CONFIG_USB_EHCI_MX7
  486 +#ifndef CONFIG_DM_USB
484 487 setup_usb();
  488 +#endif
485 489 #endif
486 490  
487 491 return 0;
board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c
Diff comments   View file @ 32d4060
... ... @@ -442,6 +442,8 @@
442 442 #endif
443 443  
444 444 #ifdef CONFIG_USB_EHCI_MX7
  445 +#ifndef CONFIG_DM_USB
  446 +
445 447 iomux_v3_cfg_t const usb_otg1_pads[] = {
446 448 MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
447 449 };
... ... @@ -456,6 +458,7 @@
456 458 imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, ARRAY_SIZE(usb_otg2_pads));
457 459 }
458 460 #endif
  461 +#endif
459 462  
460 463 int board_early_init_f(void)
461 464 {
462 465  
... ... @@ -467,7 +470,9 @@
467 470 #endif
468 471  
469 472 #ifdef CONFIG_USB_EHCI_MX7
  473 +#ifndef CONFIG_DM_USB
470 474 setup_usb();
  475 +#endif
471 476 #endif
472 477 return 0;
473 478 }