diff options
| author | Tom Rini <trini@ti.com> | 2015-01-30 09:24:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-30 09:24:42 -0500 |
| commit | 8e3da9dd113699eed2fa05fcde3c55a2ff410913 (patch) | |
| tree | 4eb27bc3dc9f86e05dcd9f77eca18d0f061ee0a9 /arch/arm/include/asm/arch-tegra/tegra_mmc.h | |
| parent | 0f274f5376f02ccf30327bf3e5c88d26d3ea8827 (diff) | |
| parent | 85df958ce267c602a4ec5f1e41f336c5a8d3b441 (diff) | |
| download | u-boot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.zip u-boot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.tar.gz u-boot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/include/asm/arch-tegra/tegra_mmc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra_mmc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index 84e7b55..a20bdaa 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -10,6 +10,7 @@ #define __TEGRA_MMC_H_ #include <fdtdec.h> +#include <asm/gpio.h> /* for mmc_config definition */ #include <mmc.h> @@ -134,9 +135,9 @@ struct mmc_host { int enabled; /* 1 to enable, 0 to disable */ int width; /* Bus Width, 1, 4 or 8 */ enum periph_id mmc_id; /* Peripheral ID: PERIPH_ID_... */ - struct fdt_gpio_state cd_gpio; /* Change Detect GPIO */ - struct fdt_gpio_state pwr_gpio; /* Power GPIO */ - struct fdt_gpio_state wp_gpio; /* Write Protect GPIO */ + struct gpio_desc cd_gpio; /* Change Detect GPIO */ + struct gpio_desc pwr_gpio; /* Power GPIO */ + struct gpio_desc wp_gpio; /* Write Protect GPIO */ unsigned int version; /* SDHCI spec. version */ unsigned int clock; /* Current clock (MHz) */ struct mmc_config cfg; /* mmc configuration */ |