Commit e020fb5ad29ec8f17ca966f8d56000d7abc934ec
Committed by
Stefano Babic
Stefano Babic
1 parent
28a36fd823
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
ARM: liteboard: move towards driver model and device-tree boot
This patch mostly enables DM drivers in board defconfig and all their dependencies. Additionally we remove USB code that is on longer executed after enabling CONFIG_DM_USB. Enable CONFIG_PINCTRL, so we can get rid of ethernet pin configuration. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Showing 2 changed files with 10 additions and 37 deletions Side-by-side Diff
board/grinn/liteboard/board.c
| ... | ... | @@ -24,8 +24,6 @@ |
| 24 | 24 | #include <mmc.h> |
| 25 | 25 | #include <netdev.h> |
| 26 | 26 | #include <spl.h> |
| 27 | -#include <usb.h> | |
| 28 | -#include <usb/ehci-ci.h> | |
| 29 | 27 | |
| 30 | 28 | DECLARE_GLOBAL_DATA_PTR; |
| 31 | 29 | |
| ... | ... | @@ -63,26 +61,6 @@ |
| 63 | 61 | MX6_PAD_UART1_RTS_B__GPIO1_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL), |
| 64 | 62 | }; |
| 65 | 63 | |
| 66 | -#ifdef CONFIG_FEC_MXC | |
| 67 | -static iomux_v3_cfg_t const fec1_pads[] = { | |
| 68 | - MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL), | |
| 69 | - MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 70 | - MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 71 | - MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 72 | - MX6_PAD_ENET1_TX_EN__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 73 | - MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL), | |
| 74 | - MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 75 | - MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 76 | - MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 77 | - MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), | |
| 78 | -}; | |
| 79 | - | |
| 80 | -static void setup_iomux_fec(void) | |
| 81 | -{ | |
| 82 | - imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads)); | |
| 83 | -} | |
| 84 | -#endif | |
| 85 | - | |
| 86 | 64 | static void setup_iomux_uart(void) |
| 87 | 65 | { |
| 88 | 66 | imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); |
| ... | ... | @@ -180,13 +158,6 @@ |
| 180 | 158 | #endif |
| 181 | 159 | |
| 182 | 160 | #ifdef CONFIG_FEC_MXC |
| 183 | -int board_eth_init(bd_t *bis) | |
| 184 | -{ | |
| 185 | - setup_iomux_fec(); | |
| 186 | - | |
| 187 | - return fecmxc_initialize(bis); | |
| 188 | -} | |
| 189 | - | |
| 190 | 161 | static int setup_fec(void) |
| 191 | 162 | { |
| 192 | 163 | struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; |
| ... | ... | @@ -204,13 +175,6 @@ |
| 204 | 175 | enable_enet_clk(1); |
| 205 | 176 | |
| 206 | 177 | return 0; |
| 207 | -} | |
| 208 | -#endif | |
| 209 | - | |
| 210 | -#ifdef CONFIG_USB_EHCI_MX6 | |
| 211 | -int board_usb_phy_mode(int port) | |
| 212 | -{ | |
| 213 | - return USB_INIT_HOST; | |
| 214 | 178 | } |
| 215 | 179 | #endif |
| 216 | 180 |
configs/liteboard_defconfig
| ... | ... | @@ -30,11 +30,20 @@ |
| 30 | 30 | CONFIG_CMD_EXT4_WRITE=y |
| 31 | 31 | CONFIG_CMD_FAT=y |
| 32 | 32 | CONFIG_CMD_FS_GENERIC=y |
| 33 | +CONFIG_OF_CONTROL=y | |
| 34 | +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-liteboard" | |
| 33 | 35 | CONFIG_ENV_IS_IN_MMC=y |
| 36 | +CONFIG_DM_GPIO=y | |
| 37 | +CONFIG_DM_I2C=y | |
| 38 | +CONFIG_DM_MMC=y | |
| 34 | 39 | CONFIG_FSL_ESDHC=y |
| 35 | 40 | CONFIG_PHYLIB=y |
| 41 | +CONFIG_DM_ETH=y | |
| 36 | 42 | CONFIG_MII=y |
| 43 | +CONFIG_PINCTRL=y | |
| 44 | +CONFIG_PINCTRL_IMX6=y | |
| 45 | +CONFIG_DM_REGULATOR=y | |
| 37 | 46 | CONFIG_USB=y |
| 47 | +CONFIG_DM_USB=y | |
| 38 | 48 | CONFIG_USB_STORAGE=y |
| 39 | -CONFIG_OF_LIBFDT=y |