diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2014-10-02 12:16:23 -0700 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-10-06 17:57:20 +0200 |
| commit | 213e9e334822ba6a08d8d222d392dc30db8aa381 (patch) | |
| tree | b466d2ebd28311322d44a92acbeaf18afc5e415b | |
| parent | c9c86bde3d8d24a9eee06f64eaa2e14206c76d77 (diff) | |
| download | u-boot-imx-213e9e334822ba6a08d8d222d392dc30db8aa381.zip u-boot-imx-213e9e334822ba6a08d8d222d392dc30db8aa381.tar.gz u-boot-imx-213e9e334822ba6a08d8d222d392dc30db8aa381.tar.bz2 | |
nitrogen6x: simplify board_mmc_getcd
The same logic applies to both SD card slots, only with different
GPIOs and the code should make that easier to see.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 1a6edac..e8cc243 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -279,17 +279,11 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = { int board_mmc_getcd(struct mmc *mmc) { struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret; - - if (cfg->esdhc_base == USDHC3_BASE_ADDR) { - gpio_direction_input(IMX_GPIO_NR(7, 0)); - ret = !gpio_get_value(IMX_GPIO_NR(7, 0)); - } else { - gpio_direction_input(IMX_GPIO_NR(2, 6)); - ret = !gpio_get_value(IMX_GPIO_NR(2, 6)); - } + int gp_cd = (cfg->esdhc_base == USDHC3_BASE_ADDR) ? IMX_GPIO_NR(7, 0) : + IMX_GPIO_NR(2, 6); - return ret; + gpio_direction_input(gp_cd); + return !gpio_get_value(gp_cd); } int board_mmc_init(bd_t *bis) |