Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit bdcac955657b46d78f375f74bf5e7e9b29f726c2

Authored by Peng Fan
Committed by Stefano Babic
1 parent ae0760584b
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

imx: mx6slevk: enable DM_SPI and DM_SPI_FLASH 

With DM_SPI and DM_SPI_FLASH enabled, we could get:

spi          0  [   ]   mxc_spi               |   |   |   `-- ecspi@02008000
spi_flash    0  [   ]   spi_flash_std         |   |   |       `-- m25p80@0

Signed-off-by: Peng Fan <peng.fan@nxp.com>

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

board/freescale/mx6slevk/mx6slevk.c
Diff comments   View file @ bdcac95
... ... @@ -15,7 +15,6 @@
15 15 #include <asm/gpio.h>
16 16 #include <asm/mach-imx/iomux-v3.h>
17 17 #include <asm/mach-imx/mxc_i2c.h>
18   -#include <asm/mach-imx/spi.h>
19 18 #include <asm/io.h>
20 19 #include <linux/sizes.h>
21 20 #include <common.h>
... ... @@ -41,9 +40,6 @@
41 40 PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
42 41 PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
43 42  
44   -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
45   - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
46   -
47 43 #define OTGID_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
48 44 PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW |\
49 45 PAD_CTL_DSE_80ohm | PAD_CTL_HYS | \
... ... @@ -120,25 +116,6 @@
120 116 MX6_PAD_FEC_TX_CLK__GPIO_4_21 | MUX_PAD_CTRL(NO_PAD_CTRL),
121 117 };
122 118  
123   -#ifdef CONFIG_MXC_SPI
124   -static iomux_v3_cfg_t ecspi1_pads[] = {
125   - MX6_PAD_ECSPI1_MISO__ECSPI_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL),
126   - MX6_PAD_ECSPI1_MOSI__ECSPI_MOSI | MUX_PAD_CTRL(SPI_PAD_CTRL),
127   - MX6_PAD_ECSPI1_SCLK__ECSPI_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL),
128   - MX6_PAD_ECSPI1_SS0__GPIO4_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
129   -};
130   -
131   -int board_spi_cs_gpio(unsigned bus, unsigned cs)
132   -{
133   - return (bus == 0 && cs == 0) ? (IMX_GPIO_NR(4, 11)) : -1;
134   -}
135   -
136   -static void setup_spi(void)
137   -{
138   - imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
139   -}
140   -#endif
141   -
142 119 static void setup_iomux_uart(void)
143 120 {
144 121 imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
... ... @@ -231,11 +208,6 @@
231 208 {
232 209 /* address of boot parameters */
233 210 gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
234   -
235   -#ifdef CONFIG_MXC_SPI
236   - gpio_request(IMX_GPIO_NR(4, 11), "spi_cs");
237   - setup_spi();
238   -#endif
239 211  
240 212 #ifdef CONFIG_FEC_MXC
241 213 setup_fec();
configs/mx6slevk_defconfig
Diff comments   View file @ bdcac95
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_DM_I2C=y
36 36 CONFIG_DM_MMC=y
37 37 CONFIG_FSL_USDHC=y
  38 +CONFIG_DM_SPI_FLASH=y
38 39 CONFIG_SPI_FLASH=y
39 40 CONFIG_SF_DEFAULT_MODE=0
40 41 CONFIG_SF_DEFAULT_SPEED=20000000
... ... @@ -50,6 +51,7 @@
50 51 CONFIG_DM_REGULATOR_FIXED=y
51 52 CONFIG_DM_REGULATOR_GPIO=y
52 53 CONFIG_SPI=y
  54 +CONFIG_DM_SPI=y
53 55 CONFIG_MXC_SPI=y
54 56 CONFIG_DM_THERMAL=y
55 57 CONFIG_USB=y
configs/mx6slevk_spinor_defconfig
Diff comments   View file @ bdcac95
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_DM_I2C=y
36 36 CONFIG_DM_MMC=y
37 37 CONFIG_FSL_USDHC=y
  38 +CONFIG_DM_SPI_FLASH=y
38 39 CONFIG_SPI_FLASH=y
39 40 CONFIG_SF_DEFAULT_MODE=0
40 41 CONFIG_SF_DEFAULT_SPEED=20000000
... ... @@ -50,6 +51,7 @@
50 51 CONFIG_DM_REGULATOR_FIXED=y
51 52 CONFIG_DM_REGULATOR_GPIO=y
52 53 CONFIG_SPI=y
  54 +CONFIG_DM_SPI=y
53 55 CONFIG_MXC_SPI=y
54 56 CONFIG_DM_THERMAL=y
55 57 CONFIG_USB=y
configs/mx6slevk_spl_defconfig
Diff comments   View file @ bdcac95
... ... @@ -44,6 +44,7 @@
44 44 CONFIG_DM_I2C=y
45 45 CONFIG_DM_MMC=y
46 46 CONFIG_FSL_USDHC=y
  47 +CONFIG_DM_SPI_FLASH=y
47 48 CONFIG_SPI_FLASH=y
48 49 CONFIG_SF_DEFAULT_MODE=0
49 50 CONFIG_SF_DEFAULT_SPEED=20000000
... ... @@ -59,6 +60,7 @@
59 60 CONFIG_DM_REGULATOR_FIXED=y
60 61 CONFIG_DM_REGULATOR_GPIO=y
61 62 CONFIG_SPI=y
  63 +CONFIG_DM_SPI=y
62 64 CONFIG_MXC_SPI=y
63 65 CONFIG_DM_THERMAL=y
64 66 CONFIG_USB=y