Commit cdf3eec481bc889feed3356a7d3a2f0be62c18a7
1 parent
c3c6fd4176
Exists in
v2017.01-smarct4x
Fixed SPI Boot will stop problem.
Showing 8 changed files with 17 additions and 24 deletions Side-by-side Diff
- arch/arm/dts/am437x-smarct437x.dts
- arch/arm/mach-omap2/am33xx/board.c
- board/embedian/smarct437x/board.c
- configs/smarct437x_evm_spi_uart0_defconfig
- configs/smarct437x_evm_spi_uart1_defconfig
- configs/smarct437x_evm_spi_uart2_defconfig
- configs/smarct437x_evm_spi_uart3_defconfig
- include/configs/smarct437x_evm.h
arch/arm/dts/am437x-smarct437x.dts
... | ... | @@ -646,7 +646,7 @@ |
646 | 646 | }; |
647 | 647 | |
648 | 648 | &i2c2 { |
649 | - status = "okay"; | |
649 | + status = "disabled"; | |
650 | 650 | pinctrl-names = "default"; |
651 | 651 | pinctrl-0 = <&i2c2_pins>; |
652 | 652 | clock-frequency = <100000>; |
... | ... | @@ -662,8 +662,8 @@ |
662 | 662 | &epwmss0 { |
663 | 663 | status = "okay"; |
664 | 664 | |
665 | - ehrpwm0: ehrpwm@48300200 { | |
666 | - status = "okay"; | |
665 | + ehrpwm@48300200 { | |
666 | + status = "disabled"; | |
667 | 667 | pinctrl-names = "default"; |
668 | 668 | pinctrl-0 = <&ehrpwm0b_pins>; |
669 | 669 | }; |
... | ... | @@ -715,7 +715,7 @@ |
715 | 715 | /*If carrier board eMMC (or 2nd SD slot) is present and used, un-comment out the following nodes. SD card will be emulated /dev/mmcblk2 instead of /dev/mmcblk1*/ |
716 | 716 | |
717 | 717 | &mmc3 { |
718 | - status = "okay"; | |
718 | + status = "disabled"; | |
719 | 719 | dmas = <&edma 30 |
720 | 720 | &edma 31>; |
721 | 721 | dma-names = "tx", "rx"; |
... | ... | @@ -810,7 +810,7 @@ |
810 | 810 | |
811 | 811 | &spi2 { |
812 | 812 | ti,spi-num-cs = <2>; |
813 | - status = "okay"; | |
813 | + status = "disabled"; | |
814 | 814 | pinctrl-names = "default"; |
815 | 815 | pinctrl-0 = <&spi2_pins>; |
816 | 816 | dmas = <&edma 18 |
... | ... | @@ -838,7 +838,7 @@ |
838 | 838 | |
839 | 839 | &spi4 { |
840 | 840 | ti,spi-num-cs = <2>; |
841 | - status = "okay"; | |
841 | + status = "disabled"; | |
842 | 842 | pinctrl-names = "default"; |
843 | 843 | pinctrl-0 = <&spi4_pins>; |
844 | 844 | dmas = <&edma 26 |
845 | 845 | |
... | ... | @@ -899,13 +899,13 @@ |
899 | 899 | &dcan0 { |
900 | 900 | pinctrl-names = "default"; |
901 | 901 | pinctrl-0 = <&dcan0_default>; |
902 | - status = "okay"; | |
902 | + status = "disabled"; | |
903 | 903 | }; |
904 | 904 | |
905 | 905 | &dcan1 { |
906 | 906 | pinctrl-names = "default"; |
907 | 907 | pinctrl-0 = <&dcan1_default>; |
908 | - status = "okay"; | |
908 | + status = "disabled"; | |
909 | 909 | }; |
910 | 910 | |
911 | 911 | &mac { |
... | ... | @@ -945,7 +945,7 @@ |
945 | 945 | pinctrl-0 = <&mcasp1_pins>; |
946 | 946 | pinctrl-1 = <&mcasp1_sleep_pins>; |
947 | 947 | |
948 | - status = "okay"; | |
948 | + status = "disabled"; | |
949 | 949 | |
950 | 950 | op-mode = <0>; /* MCASP_IIS_MODE */ |
951 | 951 | tdm-slots = <2>; |
... | ... | @@ -959,7 +959,7 @@ |
959 | 959 | }; |
960 | 960 | |
961 | 961 | &dss { |
962 | - status = "okay"; | |
962 | + status = "disabled"; | |
963 | 963 | |
964 | 964 | pinctrl-names = "default"; |
965 | 965 | pinctrl-0 = <&dss_pins>; |
arch/arm/mach-omap2/am33xx/board.c
... | ... | @@ -114,13 +114,10 @@ |
114 | 114 | #if defined(CONFIG_OMAP_HSMMC) |
115 | 115 | int cpu_mmc_init(bd_t *bis) |
116 | 116 | { |
117 | - int ret; | |
118 | - | |
119 | - ret = omap_mmc_init(0, 0, 0, -1, -1); | |
120 | - if (ret) | |
121 | - return ret; | |
122 | - | |
123 | - return omap_mmc_init(2, 0, 0, -1, -1); | |
117 | + omap_mmc_init(0, 0, 0, -1, -1); | |
118 | + omap_mmc_init(1, 0, 0, -1, -1); | |
119 | + omap_mmc_init(2, 0, 0, -1, -1); | |
120 | + return 0; | |
124 | 121 | } |
125 | 122 | #endif |
126 | 123 |
board/embedian/smarct437x/board.c
... | ... | @@ -1133,9 +1133,9 @@ |
1133 | 1133 | return 0; |
1134 | 1134 | else if (board_is_idk() && !strcmp(name, "am437x-idk-evm")) |
1135 | 1135 | return 0; |
1136 | - else if (board_is_smarc_t437x_800() && !strcmp(name, "am437x-smarct437x")) | |
1136 | + else if (board_is_smarc_t437x_800() && !strcmp(name, "SMCT4X80")) | |
1137 | 1137 | return 0; |
1138 | - else if (board_is_smarc_t437x_01g() && !strcmp(name, "am437x-smarct437xSMCT4X1G")) | |
1138 | + else if (board_is_smarc_t437x_01g() && !strcmp(name, "SMCT4X1G")) | |
1139 | 1139 | return 0; |
1140 | 1140 | else |
1141 | 1141 | return -1; |
configs/smarct437x_evm_spi_uart0_defconfig
configs/smarct437x_evm_spi_uart1_defconfig
configs/smarct437x_evm_spi_uart2_defconfig
configs/smarct437x_evm_spi_uart3_defconfig
include/configs/smarct437x_evm.h
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 | * Since SPL did pll and ddr initialization for us, |
51 | 51 | * we don't need to do it twice. |
52 | 52 | */ |
53 | -#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPI_BOOT) | |
53 | +#if !defined(CONFIG_SPL_BUILD) /*&& !defined(CONFIG_SPI_BOOT)*/ | |
54 | 54 | #define CONFIG_SKIP_LOWLEVEL_INIT |
55 | 55 | #endif |
56 | 56 |