| Message ID | 1508146155-10676-1-git-send-email-peng.fan@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] imx: mx6slevk: fix mmc breakage | expand |
On Mon, Oct 16, 2017 at 7:29 AM, Peng Fan <peng.fan@nxp.com> wrote: > Log: > " > MMC Device 1 not found > *** Warning - No MMC card found, using default environment > " > Add alias node for usdhc. > CONFIG_BLK and CONFIG_DM_USB are enabled. > > Test: > => usb tree > USB device tree: > 1 Hub (480 Mb/s, 0mA) > | u-boot EHCI Host Controller > | > +-2 Mass Storage (480 Mb/s, 500mA) > Generic USB Storage 000000000207 > > 1 Hub (480 Mb/s, 0mA) > | u-boot EHCI Host Controller > | > +-2 Mass Storage (480 Mb/s, 500mA) > Generic USB2.0-CRW 20090815198100000 > > => mmc list > FSL_SDHC: 0 > FSL_SDHC: 1 (SD) > FSL_SDHC: 2 > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> Peng, Fabio's patches[1][2] fix those issues but your cleanup of board code should be sent on top of it. 1. https://patchwork.ozlabs.org/patch/825464/ 2. https://patchwork.ozlabs.org/patch/825039/ Please take a look at the above patches and consider sending it as a cleanup.
> -----Original Message----- > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Otavio > Salvador > Sent: Monday, October 16, 2017 8:08 PM > To: Peng Fan <peng.fan@nxp.com> > Cc: Fabio Estevam <fabio.estevam@nxp.com>; U-Boot Mailing List <u- > boot@lists.denx.de> > Subject: Re: [U-Boot] [PATCH] imx: mx6slevk: fix mmc breakage > > On Mon, Oct 16, 2017 at 7:29 AM, Peng Fan <peng.fan@nxp.com> wrote: > > Log: > > " > > MMC Device 1 not found > > *** Warning - No MMC card found, using default environment > > " > > Add alias node for usdhc. > > CONFIG_BLK and CONFIG_DM_USB are enabled. > > > > Test: > > => usb tree > > USB device tree: > > 1 Hub (480 Mb/s, 0mA) > > | u-boot EHCI Host Controller > > | > > +-2 Mass Storage (480 Mb/s, 500mA) > > Generic USB Storage 000000000207 > > > > 1 Hub (480 Mb/s, 0mA) > > | u-boot EHCI Host Controller > > | > > +-2 Mass Storage (480 Mb/s, 500mA) > > Generic USB2.0-CRW 20090815198100000 > > > > => mmc list > > FSL_SDHC: 0 > > FSL_SDHC: 1 (SD) > > FSL_SDHC: 2 > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > Cc: Stefano Babic <sbabic@denx.de> > > Cc: Fabio Estevam <fabio.estevam@nxp.com> > > Peng, > > Fabio's patches[1][2] fix those issues but your cleanup of board code should be > sent on top of it. > > 1. https://patchwork.ozlabs.org/patch/825464/ > 2. https://patchwork.ozlabs.org/patch/825039/ > > Please take a look at the above patches and consider sending it as a cleanup. Thanks for info. I'll rework patch based on Fabio's patches. Thanks, Peng. > > -- > Otavio Salvador O.S. Systems > http://www.ossystems.com.br http://code.ossystems.com.br > Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi index cc9572e..ac2f676 100644 --- a/arch/arm/dts/imx6sl.dtsi +++ b/arch/arm/dts/imx6sl.dtsi @@ -30,6 +30,10 @@ gpio2 = &gpio3; gpio3 = &gpio4; gpio4 = &gpio5; + mmc0 = &usdhc1; + mmc1 = &usdhc2; + mmc2 = &usdhc3; + mmc3 = &usdhc4; serial0 = &uart1; serial1 = &uart2; serial2 = &uart3; diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 8afd5da..0597dbe 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -27,8 +27,6 @@ #include <power/pmic.h> #include <power/pfuze100_pmic.h> #include "../common/pfuze.h" -#include <usb.h> -#include <usb/ehci-ci.h> DECLARE_GLOBAL_DATA_PTR; @@ -223,49 +221,6 @@ static int setup_fec(void) } #endif -#ifdef CONFIG_USB_EHCI_MX6 -#define USB_OTHERREGS_OFFSET 0x800 -#define UCTRL_PWR_POL (1 << 9) - -static iomux_v3_cfg_t const usb_otg_pads[] = { - /* OTG1 */ - MX6_PAD_KEY_COL4__USB_USBOTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), - MX6_PAD_EPDC_PWRCOM__ANATOP_USBOTG1_ID | MUX_PAD_CTRL(OTGID_PAD_CTRL), - /* OTG2 */ - MX6_PAD_KEY_COL5__USB_USBOTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL) -}; - -static void setup_usb(void) -{ - imx_iomux_v3_setup_multiple_pads(usb_otg_pads, - ARRAY_SIZE(usb_otg_pads)); -} - -int board_usb_phy_mode(int port) -{ - if (port == 1) - return USB_INIT_HOST; - else - return usb_phy_mode(port); -} - -int board_ehci_hcd_init(int port) -{ - u32 *usbnc_usb_ctrl; - - if (port > 1) - return -EINVAL; - - usbnc_usb_ctrl = (u32 *)(USB_BASE_ADDR + USB_OTHERREGS_OFFSET + - port * 4); - - /* Set Power polarity */ - setbits_le32(usbnc_usb_ctrl, UCTRL_PWR_POL); - - return 0; -} -#endif - int board_early_init_f(void) { setup_iomux_uart(); @@ -287,10 +242,6 @@ int board_init(void) setup_fec(); #endif -#ifdef CONFIG_USB_EHCI_MX6 - setup_usb(); -#endif - return 0; } diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 16e2cca..7b1ddac 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y @@ -45,6 +44,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
Log: " MMC Device 1 not found *** Warning - No MMC card found, using default environment " Add alias node for usdhc. CONFIG_BLK and CONFIG_DM_USB are enabled. Test: => usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Mass Storage (480 Mb/s, 500mA) Generic USB Storage 000000000207 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Mass Storage (480 Mb/s, 500mA) Generic USB2.0-CRW 20090815198100000 => mmc list FSL_SDHC: 0 FSL_SDHC: 1 (SD) FSL_SDHC: 2 Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/dts/imx6sl.dtsi | 4 +++ board/freescale/mx6slevk/mx6slevk.c | 49 ------------------------------------- configs/mx6slevk_defconfig | 2 +- 3 files changed, 5 insertions(+), 50 deletions(-)