On Mon, Apr 15, 2013 at 1:40 PM, Fabio Estevam <feste...@gmail.com> wrote:
> On Mon, Apr 15, 2013 at 1:18 PM, Otavio Salvador
> <ota...@ossystems.com.br> wrote:
>
>> --- a/board/wandboard/wandboard.c
>> +++ b/board/wandboard/wandboard.c
>> @@ -162,13 +162,15 @@ int board_mmc_init(bd_t *bis)
>> gpio_direction_input(USDHC1_CD_GPIO);
>> break;
>> default:
>> - printf("Warning: you configured more USDHC
>> controllers"
>> + printf("ERROR: you configured more USDHC controllers"
>> "(%d) than supported by the board\n", i +
>> 1);
>> return -EINVAL;
>> }
>>
>> - if (fsl_esdhc_initialize(bis, &usdhc_cfg[i]))
>> - printf("Warning: failed to initialize mmc dev %d\n",
>> i);
>> + if (fsl_esdhc_initialize(bis, &usdhc_cfg[i])) {
>> + printf("ERROR: failed to initialize mmc dev %d\n",
>> i);
>> + return 1;
>
> 1 is not an appropriate return value for an error.
>
> What about doing like sabrelite?
> status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
>
> and then you return status?
int board_mmc_init(bd_t *bis)
{
- imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+ int i;
+ int ret;
- usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
- usdhc_cfg[0].max_bus_width = 4;
- gpio_direction_input(USDHC3_CD_GPIO);
+ /*
+ * According to the board_mmc_init() the following map is done:
+ * (U-boot device node) (Physical Port)
+ * mmc0 SOM MicroSD
+ * mmc1 Carrier board MicroSD
+ */
+ for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) {
+ switch (i) {
+ case 0:
+ imx_iomux_v3_setup_multiple_pads(
+ usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+ usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+ usdhc_cfg[0].max_bus_width = 4;
+ gpio_direction_input(USDHC3_CD_GPIO);
+ break;
+ case 1:
+ imx_iomux_v3_setup_multiple_pads(
+ usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
+ usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+ usdhc_cfg[1].max_bus_width = 4;
+ gpio_direction_input(USDHC1_CD_GPIO);
+ break;
+ default:
+ printf("ERROR: you configured more USDHC controllers"
+ "(%d) than supported by the board\n", i + 1);
+ return -EINVAL;
+ }
+
+ ret |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+ }
+
+ if (ret)
+ printf("ERROR: failed to initialize mmc dev %d\n", i);
- return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
+ return ret;
}
This would be the final patch than...
--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
