diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-07-19 22:27:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-19 22:27:07 +0200 |
| commit | 74fac70084bb040342fafc3b0d2ef50fbe35646f (patch) | |
| tree | 1407b62f99fa0b016d544b112a79cf6b3c5bc574 /arch | |
| parent | 1bb5e9071f7598eb83e2015a2e9dfbdc18a4314d (diff) | |
| parent | 8fd01b8f6b5b0d8bceec443f0a62b52afa7452a1 (diff) | |
| download | blackbird-obmc-uboot-74fac70084bb040342fafc3b0d2ef50fbe35646f.tar.gz blackbird-obmc-uboot-74fac70084bb040342fafc3b0d2ef50fbe35646f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
mmc: rescan fails on empty slot
AT91:mmc:fix multiple read/write error
mmc: Access mode validation for eMMC cards > 2 GiB
mmc: sh_mmcif: add support for Renesas MMCIF
mmc: fix the condition for MMC version 4
MMC: add marvell sdhci driver
MMC: add sdhci generic framework
MMC: add erase function to both mmc and sd
MMC: unify mmc read and write operation
mmc: Tegra2: Enable SD/MMC driver for Seaboard and Harmony
mmc: Tegra2: SD/MMC driver for Seaboard - eMMC on SDMMC4, SDIO on SDMMC3
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/clk_rst.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/pinmux.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/clk_rst.h b/arch/arm/include/asm/arch-tegra2/clk_rst.h index bd8ad2ca04..36e27b5f3f 100644 --- a/arch/arm/include/asm/arch-tegra2/clk_rst.h +++ b/arch/arm/include/asm/arch-tegra2/clk_rst.h @@ -191,4 +191,9 @@ struct clk_rst_ctlr { #define CPCON (1 << 8) +#define SWR_SDMMC4_RST (1 << 15) +#define CLK_ENB_SDMMC4 (1 << 15) +#define SWR_SDMMC3_RST (1 << 5) +#define CLK_ENB_SDMMC3 (1 << 5) + #endif /* CLK_RST_H */ diff --git a/arch/arm/include/asm/arch-tegra2/pinmux.h b/arch/arm/include/asm/arch-tegra2/pinmux.h index 8b4bd8d883..cce936ddc8 100644 --- a/arch/arm/include/asm/arch-tegra2/pinmux.h +++ b/arch/arm/include/asm/arch-tegra2/pinmux.h @@ -51,5 +51,11 @@ struct pmux_tri_ctlr { #define Z_GMC (1 << 29) #define Z_IRRX (1 << 20) #define Z_IRTX (1 << 19) +#define Z_GMA (1 << 28) +#define Z_GME (1 << 0) +#define Z_ATB (1 << 1) +#define Z_SDB (1 << 15) +#define Z_SDC (1 << 1) +#define Z_SDD (1 << 2) #endif /* PINMUX_H */ |
