mx51evk: Convert to driver model

Make the conversion to driver model as it is mandatory.

Tested booting the Linux kernel from the SD card.

Signed-off-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index b28d1794671fdba165705a85bfa1ae2e7cb2bd78..2321c944b09b897be2edc8a181c9815a2b1effae 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -651,6 +651,9 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \
 dtb-$(CONFIG_MX28) += \
        imx28-xea.dtb
 
+dtb-$(CONFIG_MX51) += \
+       imx51-babbage.dtb
+
 dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
        imx53-qsb.dtb \
        imx53-kp.dtb \

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index ac48e7668c0e1d307b95c2e3f17cc42e95d7192c..c8439a6347aef08fd09e5c548c1f32e3bfd4c313 100644 (file)
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -27,13 +27,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_FSL_ESDHC_IMX
-struct fsl_esdhc_cfg esdhc_cfg[2] = {
-       {MMC_SDHC1_BASE_ADDR},
-       {MMC_SDHC2_BASE_ADDR},
-};
-#endif
-
 int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
@@ -64,34 +57,6 @@ static void setup_iomux_uart(void)
        imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
 }
 
-static void setup_iomux_fec(void)
-{
-       static const iomux_v3_cfg_t fec_pads[] = {
-               NEW_PAD_CTRL(MX51_PAD_EIM_EB2__FEC_MDIO, PAD_CTL_HYS |
-                               PAD_CTL_PUS_22K_UP | PAD_CTL_ODE |
-                               PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
-               MX51_PAD_NANDF_CS3__FEC_MDC,
-               NEW_PAD_CTRL(MX51_PAD_EIM_CS3__FEC_RDATA3, MX51_PAD_CTRL_2),
-               NEW_PAD_CTRL(MX51_PAD_EIM_CS2__FEC_RDATA2, MX51_PAD_CTRL_2),
-               NEW_PAD_CTRL(MX51_PAD_EIM_EB3__FEC_RDATA1, MX51_PAD_CTRL_2),
-               MX51_PAD_NANDF_D9__FEC_RDATA0,
-               MX51_PAD_NANDF_CS6__FEC_TDATA3,
-               MX51_PAD_NANDF_CS5__FEC_TDATA2,
-               MX51_PAD_NANDF_CS4__FEC_TDATA1,
-               MX51_PAD_NANDF_D8__FEC_TDATA0,
-               MX51_PAD_NANDF_CS7__FEC_TX_EN,
-               MX51_PAD_NANDF_CS2__FEC_TX_ER,
-               MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK,
-               NEW_PAD_CTRL(MX51_PAD_NANDF_RB2__FEC_COL, MX51_PAD_CTRL_4),
-               NEW_PAD_CTRL(MX51_PAD_NANDF_RB3__FEC_RX_CLK, MX51_PAD_CTRL_4),
-               MX51_PAD_EIM_CS5__FEC_CRS,
-               MX51_PAD_EIM_CS4__FEC_RX_ER,
-               NEW_PAD_CTRL(MX51_PAD_NANDF_D11__FEC_RX_DV, MX51_PAD_CTRL_4),
-       };
-
-       imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
-}
-
 #ifdef CONFIG_MXC_SPI
 static void setup_iomux_spi(void)
 {
@@ -112,64 +77,6 @@ static void setup_iomux_spi(void)
 }
 #endif
 
-#ifdef CONFIG_USB_EHCI_MX5
-#define MX51EVK_USBH1_HUB_RST  IMX_GPIO_NR(1, 7)
-#define MX51EVK_USBH1_STP      IMX_GPIO_NR(1, 27)
-#define MX51EVK_USB_CLK_EN_B   IMX_GPIO_NR(2, 1)
-#define MX51EVK_USB_PHY_RESET  IMX_GPIO_NR(2, 5)
-
-static void setup_usb_h1(void)
-{
-       static const iomux_v3_cfg_t usb_h1_pads[] = {
-               MX51_PAD_USBH1_CLK__USBH1_CLK,
-               MX51_PAD_USBH1_DIR__USBH1_DIR,
-               MX51_PAD_USBH1_STP__USBH1_STP,
-               MX51_PAD_USBH1_NXT__USBH1_NXT,
-               MX51_PAD_USBH1_DATA0__USBH1_DATA0,
-               MX51_PAD_USBH1_DATA1__USBH1_DATA1,
-               MX51_PAD_USBH1_DATA2__USBH1_DATA2,
-               MX51_PAD_USBH1_DATA3__USBH1_DATA3,
-               MX51_PAD_USBH1_DATA4__USBH1_DATA4,
-               MX51_PAD_USBH1_DATA5__USBH1_DATA5,
-               MX51_PAD_USBH1_DATA6__USBH1_DATA6,
-               MX51_PAD_USBH1_DATA7__USBH1_DATA7,
-
-               NEW_PAD_CTRL(MX51_PAD_GPIO1_7__GPIO1_7, 0), /* H1 hub reset */
-               MX51_PAD_EIM_D17__GPIO2_1,
-               MX51_PAD_EIM_D21__GPIO2_5, /* PHY reset */
-       };
-
-       imx_iomux_v3_setup_multiple_pads(usb_h1_pads, ARRAY_SIZE(usb_h1_pads));
-}
-
-int board_ehci_hcd_init(int port)
-{
-       /* Set USBH1_STP to GPIO and toggle it */
-       imx_iomux_v3_setup_pad(NEW_PAD_CTRL(MX51_PAD_USBH1_STP__GPIO1_27,
-                                               MX51_USBH_PAD_CTRL));
-
-       gpio_direction_output(MX51EVK_USBH1_STP, 0);
-       gpio_direction_output(MX51EVK_USB_PHY_RESET, 0);
-       mdelay(10);
-       gpio_set_value(MX51EVK_USBH1_STP, 1);
-
-       /* Set back USBH1_STP to be function */
-       imx_iomux_v3_setup_pad(MX51_PAD_USBH1_STP__USBH1_STP);
-
-       /* De-assert USB PHY RESETB */
-       gpio_set_value(MX51EVK_USB_PHY_RESET, 1);
-
-       /* Drive USB_CLK_EN_B line low */
-       gpio_direction_output(MX51EVK_USB_CLK_EN_B, 0);
-
-       /* Reset USB hub */
-       gpio_direction_output(MX51EVK_USBH1_HUB_RST, 0);
-       mdelay(2);
-       gpio_set_value(MX51EVK_USBH1_HUB_RST, 1);
-       return 0;
-}
-#endif
-
 static void power_init(void)
 {
        unsigned int val;
@@ -258,6 +165,7 @@ static void power_init(void)
 
        imx_iomux_v3_setup_pad(NEW_PAD_CTRL(MX51_PAD_EIM_A20__GPIO2_14,
                                                NO_PAD_CTRL));
+       gpio_request(IMX_GPIO_NR(2, 14), "gpio2_14");
        gpio_direction_output(IMX_GPIO_NR(2, 14), 0);
 
        udelay(500);
@@ -265,101 +173,9 @@ static void power_init(void)
        gpio_set_value(IMX_GPIO_NR(2, 14), 1);
 }
 
-#ifdef CONFIG_FSL_ESDHC_IMX
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-       int ret;
-
-       imx_iomux_v3_setup_pad(NEW_PAD_CTRL(MX51_PAD_GPIO1_0__GPIO1_0,
-                                               NO_PAD_CTRL));
-       gpio_direction_input(IMX_GPIO_NR(1, 0));
-       imx_iomux_v3_setup_pad(NEW_PAD_CTRL(MX51_PAD_GPIO1_6__GPIO1_6,
-                                               NO_PAD_CTRL));
-       gpio_direction_input(IMX_GPIO_NR(1, 6));
-
-       if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
-               ret = !gpio_get_value(IMX_GPIO_NR(1, 0));
-       else
-               ret = !gpio_get_value(IMX_GPIO_NR(1, 6));
-
-       return ret;
-}
-
-int board_mmc_init(struct bd_info *bis)
-{
-       static const iomux_v3_cfg_t sd1_pads[] = {
-               NEW_PAD_CTRL(MX51_PAD_SD1_CMD__SD1_CMD, PAD_CTL_DSE_MAX |
-                       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD1_CLK__SD1_CLK, PAD_CTL_DSE_MAX |
-                       PAD_CTL_PUS_47K_UP | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD1_DATA0__SD1_DATA0, PAD_CTL_DSE_MAX |
-                       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD1_DATA1__SD1_DATA1, PAD_CTL_DSE_MAX |
-                       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD1_DATA2__SD1_DATA2, PAD_CTL_DSE_MAX |
-                       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD1_DATA3__SD1_DATA3, PAD_CTL_DSE_MAX |
-                       PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_GPIO1_0__SD1_CD, PAD_CTL_HYS),
-               NEW_PAD_CTRL(MX51_PAD_GPIO1_1__SD1_WP, PAD_CTL_HYS),
-       };
-
-       static const iomux_v3_cfg_t sd2_pads[] = {
-               NEW_PAD_CTRL(MX51_PAD_SD2_CMD__SD2_CMD,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD2_CLK__SD2_CLK,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD2_DATA0__SD2_DATA0,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD2_DATA1__SD2_DATA1,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD2_DATA2__SD2_DATA2,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_SD2_DATA3__SD2_DATA3,
-                               PAD_CTL_DSE_MAX | PAD_CTL_SRE_FAST),
-               NEW_PAD_CTRL(MX51_PAD_GPIO1_6__GPIO1_6, PAD_CTL_HYS),
-               NEW_PAD_CTRL(MX51_PAD_GPIO1_5__GPIO1_5, PAD_CTL_HYS),
-       };
-
-       u32 index;
-       int ret;
-
-       esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-       esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-
-       for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM;
-                       index++) {
-               switch (index) {
-               case 0:
-                       imx_iomux_v3_setup_multiple_pads(sd1_pads,
-                                                        ARRAY_SIZE(sd1_pads));
-                       break;
-               case 1:
-                       imx_iomux_v3_setup_multiple_pads(sd2_pads,
-                                                        ARRAY_SIZE(sd2_pads));
-                       break;
-               default:
-                       printf("Warning: you configured more ESDHC controller"
-                               "(%d) as supported by the board(2)\n",
-                               CONFIG_SYS_FSL_ESDHC_NUM);
-                       return -EINVAL;
-               }
-               ret = fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
-               if (ret)
-                       return ret;
-       }
-       return 0;
-}
-#endif
-
 int board_early_init_f(void)
 {
        setup_iomux_uart();
-       setup_iomux_fec();
-#ifdef CONFIG_USB_EHCI_MX5
-       setup_usb_h1();
-#endif
        setup_iomux_lcd();
 
        return 0;

diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 343816f89f310af72c73139f63ce1b302fda267e..557a1b57bb2e77ad1344434a320e5c3e04c6265d 100644 (file)
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -5,15 +5,19 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_TARGET_MX51EVK=y
+CONFIG_DM_GPIO=y
 # CONFIG_CMD_BMODE is not set
+CONFIG_DEFAULT_DEVICE_TREE="imx51-babbage"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_DM=y
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_MMC=y
+# CONFIG_CMD_PINMUX is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
@@ -22,16 +26,30 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DM=y
+CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
+CONFIG_PHY_FIXED=y
+CONFIG_DM_ETH=y
+CONFIG_FEC_MXC=y
 CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX5=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_MX5=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
@@ -39,4 +57,3 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_SPLASH_SCREEN=y
-CONFIG_OF_LIBFDT=y

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 49f88c27dcd22594debbd4fb44d930a11a222331..3574d6545164a37bd3626e9a23e39c24d2ea67ae 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -51,14 +51,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      MMC_SDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-/*
- * Eth Configs
- */
-
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE   FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  PORT_PTS_ULPI