summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-04-30 19:43:11 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-04-30 19:43:11 +0000
commit8c6151f2badb91eb735943474e47cf0db221acb6 (patch)
treec09dbf788b171d1a034f490c8233112f74e11b4f
parent0a0951ea841a10c5c328b5525827a1490f575cb8 (diff)
downloadedk2-platforms-8c6151f2badb91eb735943474e47cf0db221acb6.tar.xz
Updated MMC/SD Card driver to support hot add and remove of the media (SD Cards) and enable write protect of SD Cards. Had to update pads for WP bit as it was not being programmed as a GPIO. I also changed some of the PAD #defins as there were only really 3 states, so OR things in the table in the .c file did not make a lot of sense.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10450 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat
-rw-r--r--BeagleBoardPkg/Sec/PadConfiguration.c476
-rw-r--r--Omap35xxPkg/Include/Omap3530/Omap3530PadConfiguration.h7
-rw-r--r--Omap35xxPkg/Include/TPS65950.h7
-rw-r--r--Omap35xxPkg/MMCHSDxe/MMCHS.c602
-rw-r--r--Omap35xxPkg/MMCHSDxe/MMCHS.h24
5 files changed, 660 insertions, 456 deletions
diff --git a/BeagleBoardPkg/Sec/PadConfiguration.c b/BeagleBoardPkg/Sec/PadConfiguration.c
index 7693b3f61b..ddd9296120 100644
--- a/BeagleBoardPkg/Sec/PadConfiguration.c
+++ b/BeagleBoardPkg/Sec/PadConfiguration.c
@@ -21,244 +21,244 @@
PAD_CONFIGURATION PadConfigurationTable[NUM_PINS] = {
//Pin, MuxMode, PullConfig, InputEnable
- { SDRC_D0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D2, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D3, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D4, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D5, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D6, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D7, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D8, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D9, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D10, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D11, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D12, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D13, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D14, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D15, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D16, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D17, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D18, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D19, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D20, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D21, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D22, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D23, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D24, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D25, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D26, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D27, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D28, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D29, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D30, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_D31, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_CLK, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_DQS0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_CKE0, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { SDRC_CKE1, MUXMODE7, PULLTYPENOSELECT, INPUT },
- { SDRC_DQS1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_DQS2, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { SDRC_DQS3, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_A1, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A2, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A3, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A4, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A5, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A6, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A7, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A8, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A9, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_A10, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_D0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D2, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D3, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D4, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D5, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D6, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D7, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D8, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D9, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D10, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D11, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D12, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D13, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D14, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_D15, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NCS0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NCS1, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { GPMC_NCS2, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { GPMC_NCS3, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { GPMC_NCS4, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { GPMC_NCS5, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_NCS6, MUXMODE1, PULLTYPENOSELECT, INPUT },
- { GPMC_NCS7, MUXMODE1, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { GPMC_CLK, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_NADV_ALE, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NOE, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NWE, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NBE0_CLE, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { GPMC_NBE1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_NWP, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { GPMC_WAIT0, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { GPMC_WAIT1, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { GPMC_WAIT2, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { GPMC_WAIT3, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { DSS_PCLK, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_HSYNC, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_PSYNC, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_ACBIAS, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA0, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA1, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA2, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA3, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA4, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA5, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA6, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA7, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA8, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA9, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA10, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA11, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA12, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA13, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA14, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA15, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA16, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA17, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA18, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA19, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA20, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA21, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA22, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { DSS_DATA23, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { CAM_HS, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { CAM_VS, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { CAM_XCLKA, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { CAM_PCLK, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { CAM_FLD, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { CAM_D0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D2, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D3, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D4, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D5, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D6, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D7, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D8, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D9, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D10, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_D11, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CAM_XCLKB, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { CAM_WEN, MUXMODE4, PULLTYPENOSELECT, INPUT },
- { CAM_STROBE, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { CSI2_DX0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CSI2_DY0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CSI2_DX1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { CSI2_DY1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCBSP2_FSX, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCBSP2_CLKX, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCBSP2_DR, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCBSP2_DX, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { MMC1_CLK, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { MMC1_CMD, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT0, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT1, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT2, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT3, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT4, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT5, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT6, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC1_DAT7, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_CLK, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_CMD, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT0, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT1, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT2, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT3, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT4, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT5, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT6, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MMC2_DAT7, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MCBSP3_DX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP3_DR, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP3_CLKX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP3_FSX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { UART2_CTS, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { UART2_RTS, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { UART2_TX, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { UART2_RX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { UART1_TX, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { UART1_RTS, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { UART1_CTS, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { UART1_RX, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCBSP4_CLKX, MUXMODE1, PULLTYPENOSELECT, INPUT },
- { MCBSP4_DR, MUXMODE1, PULLTYPENOSELECT, INPUT },
- { MCBSP4_DX, MUXMODE1, PULLTYPENOSELECT, INPUT },
- { MCBSP4_FSX, MUXMODE1, PULLTYPENOSELECT, INPUT },
- { MCBSP1_CLKR, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP1_FSR, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { MCBSP1_DX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP1_DR, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP1_CLKS, MUXMODE0, PULLTYPESELECT, INPUT },
- { MCBSP1_FSX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCBSP1_CLKX, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { UART3_CTS_RCTX,MUXMODE0, PULLUDENABLE, INPUT },
- { UART3_RTS_SD, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { UART3_RX_IRRX, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { UART3_TX_IRTX, MUXMODE0, PULLTYPENOSELECT, OUTPUT },
- { HSUSB0_CLK, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_STP, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { HSUSB0_DIR, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_NXT, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA0, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA1, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA2, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA3, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA4, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA5, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA6, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { HSUSB0_DATA7, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { I2C1_SCL, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { I2C1_SDA, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { I2C2_SCL, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { I2C2_SDA, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { I2C3_SCL, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { I2C3_SDA, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { HDQ_SIO, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { MCSPI1_CLK, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MCSPI1_SIMO, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { MCSPI1_SOMI, MUXMODE0, PULLTYPENOSELECT, INPUT },
- { MCSPI1_CS0, MUXMODE0, PULLUDENABLE, INPUT },
- { MCSPI1_CS1, MUXMODE0, PULLUDENABLE, OUTPUT },
- { MCSPI1_CS2, MUXMODE4, PULLTYPENOSELECT, OUTPUT },
- { MCSPI1_CS3, MUXMODE3, PULLTYPESELECT, INPUT },
- { MCSPI2_CLK, MUXMODE3, PULLTYPESELECT, INPUT },
- { MCSPI2_SIMO, MUXMODE3, PULLTYPESELECT, INPUT },
- { MCSPI2_SOMI, MUXMODE3, PULLTYPESELECT, INPUT },
- { MCSPI2_CS0, MUXMODE3, PULLTYPESELECT, INPUT },
- { MCSPI2_CS1, MUXMODE3, PULLTYPESELECT, INPUT },
- { SYS_NIRQ, MUXMODE0, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { SYS_CLKOUT2, MUXMODE4, (PULLTYPESELECT | PULLUDENABLE), INPUT },
- { ETK_CLK, MUXMODE3, (PULLTYPESELECT | PULLUDENABLE), OUTPUT },
- { ETK_CTL, MUXMODE3, PULLTYPESELECT, OUTPUT },
- { ETK_D0, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D1, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D2, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D3, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D4, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D5, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D6, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D7, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D8, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D9, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D10, MUXMODE3, PULLTYPESELECT, OUTPUT },
- { ETK_D11, MUXMODE3, PULLTYPESELECT, OUTPUT },
- { ETK_D12, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D13, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D14, MUXMODE3, PULLTYPESELECT, INPUT },
- { ETK_D15, MUXMODE3, PULLTYPESELECT, INPUT }
+ { SDRC_D0, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D1, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D2, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D3, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D4, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D5, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D6, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D7, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D8, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D9, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D10, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D11, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D12, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D13, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D14, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D15, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D16, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D17, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D18, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D19, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D20, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D21, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D22, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D23, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D24, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D25, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D26, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D27, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D28, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D29, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D30, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_D31, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_CLK, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_DQS0, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_CKE0, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { SDRC_CKE1, MUXMODE7, PULL_DISABLED, INPUT },
+ { SDRC_DQS1, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_DQS2, MUXMODE0, PULL_DISABLED, INPUT },
+ { SDRC_DQS3, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_A1, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A2, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A3, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A4, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A5, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A6, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A7, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A8, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A9, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_A10, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_D0, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D1, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D2, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D3, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D4, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D5, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D6, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D7, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D8, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D9, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D10, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D11, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D12, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D13, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D14, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_D15, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NCS0, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NCS1, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { GPMC_NCS2, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { GPMC_NCS3, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { GPMC_NCS4, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { GPMC_NCS5, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_NCS6, MUXMODE1, PULL_DISABLED, INPUT },
+ { GPMC_NCS7, MUXMODE1, PULL_UP_SELECTED, INPUT },
+ { GPMC_CLK, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_NADV_ALE, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NOE, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NWE, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NBE0_CLE, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { GPMC_NBE1, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_NWP, MUXMODE0, PULL_DISABLED, INPUT },
+ { GPMC_WAIT0, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { GPMC_WAIT1, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { GPMC_WAIT2, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { GPMC_WAIT3, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { DSS_PCLK, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_HSYNC, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_PSYNC, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_ACBIAS, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA0, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA1, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA2, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA3, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA4, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA5, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA6, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA7, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA8, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA9, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA10, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA11, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA12, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA13, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA14, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA15, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA16, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA17, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA18, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA19, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA20, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA21, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA22, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { DSS_DATA23, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { CAM_HS, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { CAM_VS, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { CAM_XCLKA, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { CAM_PCLK, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { CAM_FLD, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { CAM_D0, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D1, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D2, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D3, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D4, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D5, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D6, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D7, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D8, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D9, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D10, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_D11, MUXMODE0, PULL_DISABLED, INPUT },
+ { CAM_XCLKB, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { CAM_WEN, MUXMODE4, PULL_DISABLED, INPUT },
+ { CAM_STROBE, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { CSI2_DX0, MUXMODE0, PULL_DISABLED, INPUT },
+ { CSI2_DY0, MUXMODE0, PULL_DISABLED, INPUT },
+ { CSI2_DX1, MUXMODE0, PULL_DISABLED, INPUT },
+ { CSI2_DY1, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCBSP2_FSX, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCBSP2_CLKX, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCBSP2_DR, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCBSP2_DX, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { MMC1_CLK, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { MMC1_CMD, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT0, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT1, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT2, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT3, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT4, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT5, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT6, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC1_DAT7, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MMC2_CLK, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_CMD, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT0, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT1, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT2, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT3, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT4, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT5, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT6, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MMC2_DAT7, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MCBSP3_DX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP3_DR, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP3_CLKX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP3_FSX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { UART2_CTS, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { UART2_RTS, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { UART2_TX, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { UART2_RX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { UART1_TX, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { UART1_RTS, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { UART1_CTS, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { UART1_RX, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCBSP4_CLKX, MUXMODE1, PULL_DISABLED, INPUT },
+ { MCBSP4_DR, MUXMODE1, PULL_DISABLED, INPUT },
+ { MCBSP4_DX, MUXMODE1, PULL_DISABLED, INPUT },
+ { MCBSP4_FSX, MUXMODE1, PULL_DISABLED, INPUT },
+ { MCBSP1_CLKR, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP1_FSR, MUXMODE4, PULL_UP_SELECTED, OUTPUT },
+ { MCBSP1_DX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP1_DR, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP1_CLKS, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MCBSP1_FSX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCBSP1_CLKX, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { UART3_CTS_RCTX,MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { UART3_RTS_SD, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { UART3_RX_IRRX, MUXMODE0, PULL_DISABLED, INPUT },
+ { UART3_TX_IRTX, MUXMODE0, PULL_DISABLED, OUTPUT },
+ { HSUSB0_CLK, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_STP, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { HSUSB0_DIR, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_NXT, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA0, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA1, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA2, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA3, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA4, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA5, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA6, MUXMODE0, PULL_DISABLED, INPUT },
+ { HSUSB0_DATA7, MUXMODE0, PULL_DISABLED, INPUT },
+ { I2C1_SCL, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { I2C1_SDA, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { I2C2_SCL, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { I2C2_SDA, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { I2C3_SCL, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { I2C3_SDA, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { HDQ_SIO, MUXMODE4, PULL_UP_SELECTED, OUTPUT },
+ { MCSPI1_CLK, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MCSPI1_SIMO, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { MCSPI1_SOMI, MUXMODE0, PULL_DISABLED, INPUT },
+ { MCSPI1_CS0, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { MCSPI1_CS1, MUXMODE0, PULL_UP_SELECTED, OUTPUT },
+ { MCSPI1_CS2, MUXMODE4, PULL_DISABLED, OUTPUT },
+ { MCSPI1_CS3, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { MCSPI2_CLK, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { MCSPI2_SIMO, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { MCSPI2_SOMI, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { MCSPI2_CS0, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { MCSPI2_CS1, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { SYS_NIRQ, MUXMODE0, PULL_UP_SELECTED, INPUT },
+ { SYS_CLKOUT2, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { ETK_CLK, MUXMODE3, PULL_UP_SELECTED, OUTPUT },
+ { ETK_CTL, MUXMODE3, PULL_UP_SELECTED, OUTPUT },
+ { ETK_D0, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D1, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D2, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D3, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D4, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D5, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D6, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D7, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D8, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D9, MUXMODE4, PULL_UP_SELECTED, INPUT },
+ { ETK_D10, MUXMODE3, PULL_UP_SELECTED, OUTPUT },
+ { ETK_D11, MUXMODE3, PULL_UP_SELECTED, OUTPUT },
+ { ETK_D12, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D13, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D14, MUXMODE3, PULL_UP_SELECTED, INPUT },
+ { ETK_D15, MUXMODE3, PULL_UP_SELECTED, INPUT }
};
VOID
diff --git a/Omap35xxPkg/Include/Omap3530/Omap3530PadConfiguration.h b/Omap35xxPkg/Include/Omap3530/Omap3530PadConfiguration.h
index e87dcd2370..613209d2dc 100644
--- a/Omap35xxPkg/Include/Omap3530/Omap3530PadConfiguration.h
+++ b/Omap35xxPkg/Include/Omap3530/Omap3530PadConfiguration.h
@@ -280,10 +280,9 @@
#define WAKEUP_OFFSET 14
#define WAKEUP_MASK (0x2UL << WAKEUP_OFFSET)
-#define PULLUDDISABLE (0x0UL << 0)
-#define PULLUDENABLE BIT0
-#define PULLTYPENOSELECT (0x0UL << 1)
-#define PULLTYPESELECT BIT1
+#define PULL_DOWN_SELECTED ((0x0UL << 1) | BIT0)
+#define PULL_UP_SELECTED (BIT1 | BIT0)
+#define PULL_DISABLED (0x0UL << 0)
#define OUTPUT (0x0UL) //Pin is configured in output only mode.
#define INPUT (0x1UL) //Pin is configured in bi-directional mode.
diff --git a/Omap35xxPkg/Include/TPS65950.h b/Omap35xxPkg/Include/TPS65950.h
index a331a20119..ee26a0368a 100644
--- a/Omap35xxPkg/Include/TPS65950.h
+++ b/Omap35xxPkg/Include/TPS65950.h
@@ -36,6 +36,13 @@
#define VSEL_3_00V 0x2
#define VSEL_3_15V 0x3
+#define TPS65950_GPIO_CTRL 0xaa //I2C_ADDR_GRP_ID2
+#define CARD_DETECT_ENABLE (BIT2 | BIT0) // GPIO ON + GPIO CD1 enabled
+
+
+#define GPIODATAIN1 0x98 //I2C_ADDR_GRP_ID2
+#define CARD_DETECT_BIT BIT0
+
//LEDEN register
#define LEDEN 0xEE
#define LEDAON BIT0
diff --git a/Omap35xxPkg/MMCHSDxe/MMCHS.c b/Omap35xxPkg/MMCHSDxe/MMCHS.c
index 25299a8b17..61bf215f7e 100644
--- a/Omap35xxPkg/MMCHSDxe/MMCHS.c
+++ b/Omap35xxPkg/MMCHSDxe/MMCHS.c
@@ -1,4 +1,13 @@
/** @file
+ MMC/SD Card driver for OMAP 35xx (SDIO not supported)
+
+ This driver always produces a BlockIo protocol but it starts off with no Media
+ present. A TimerCallBack detects when media is inserted or removed and after
+ a media change event a call to BlockIo ReadBlocks/WriteBlocks will cause the
+ media to be detected (or removed) and the BlockIo Media structure will get
+ updated. No MMC/SD Card harward registers are updated until the first BlockIo
+ ReadBlocks/WriteBlocks after media has been insterted (booting with a card
+ plugged in counts as an insertion event).
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
@@ -16,10 +25,10 @@
#include "MMCHS.h"
-EFI_BLOCK_IO_MEDIA MMCHSMedia = {
+EFI_BLOCK_IO_MEDIA gMMCHSMedia = {
SIGNATURE_32('s','d','i','o'), // MediaId
TRUE, // RemovableMedia
- TRUE, // MediaPresent
+ FALSE, // MediaPresent
FALSE, // LogicalPartition
FALSE, // ReadOnly
FALSE, // WriteCaching
@@ -34,8 +43,7 @@ typedef struct {
EFI_DEVICE_PATH End;
} MMCHS_DEVICE_PATH;
-MMCHS_DEVICE_PATH gMmcHsDevicePath =
-{
+MMCHS_DEVICE_PATH gMmcHsDevicePath = {
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
@@ -51,14 +59,16 @@ MMCHS_DEVICE_PATH gMmcHsDevicePath =
}
};
-CARD_INFO *gCardInfo;
+CARD_INFO gCardInfo;
EMBEDDED_EXTERNAL_DEVICE *gTPS65950;
+EFI_EVENT gTimerEvent;
+BOOLEAN gMediaChange = FALSE;
//
// Internal Functions
//
-STATIC
+
VOID
ParseCardCIDData (
UINT32 Response0,
@@ -67,29 +77,29 @@ ParseCardCIDData (
UINT32 Response3
)
{
- gCardInfo->CIDData.MDT = ((Response0 >> 8) & 0xFFF);
- gCardInfo->CIDData.PSN = (((Response0 >> 24) & 0xFF) | ((Response1 & 0xFFFFFF) << 8));
- gCardInfo->CIDData.PRV = ((Response1 >> 24) & 0xFF);
- gCardInfo->CIDData.PNM[4] = ((Response2) & 0xFF);
- gCardInfo->CIDData.PNM[3] = ((Response2 >> 8) & 0xFF);
- gCardInfo->CIDData.PNM[2] = ((Response2 >> 16) & 0xFF);
- gCardInfo->CIDData.PNM[1] = ((Response2 >> 24) & 0xFF);
- gCardInfo->CIDData.PNM[0] = ((Response3) & 0xFF);
- gCardInfo->CIDData.OID = ((Response3 >> 8) & 0xFFFF);
- gCardInfo->CIDData.MID = ((Response3 >> 24) & 0xFF);
+ gCardInfo.CIDData.MDT = ((Response0 >> 8) & 0xFFF);
+ gCardInfo.CIDData.PSN = (((Response0 >> 24) & 0xFF) | ((Response1 & 0xFFFFFF) << 8));
+ gCardInfo.CIDData.PRV = ((Response1 >> 24) & 0xFF);
+ gCardInfo.CIDData.PNM[4] = ((Response2) & 0xFF);
+ gCardInfo.CIDData.PNM[3] = ((Response2 >> 8) & 0xFF);
+ gCardInfo.CIDData.PNM[2] = ((Response2 >> 16) & 0xFF);
+ gCardInfo.CIDData.PNM[1] = ((Response2 >> 24) & 0xFF);
+ gCardInfo.CIDData.PNM[0] = ((Response3) & 0xFF);
+ gCardInfo.CIDData.OID = ((Response3 >> 8) & 0xFFFF);
+ gCardInfo.CIDData.MID = ((Response3 >> 24) & 0xFF);
}
-STATIC
+
VOID
UpdateMMCHSClkFrequency (
UINTN NewCLKD
)
{
//Set Clock enable to 0x0 to not provide the clock to the card
- MmioAnd32(MMCHS_SYSCTL, ~CEN);
+ MmioAnd32 (MMCHS_SYSCTL, ~CEN);
//Set new clock frequency.
- MmioAndThenOr32(MMCHS_SYSCTL, ~CLKD_MASK, NewCLKD << 6);
+ MmioAndThenOr32 (MMCHS_SYSCTL, ~CLKD_MASK, NewCLKD << 6);
//Poll till Internal Clock Stable
while ((MmioRead32 (MMCHS_SYSCTL) & ICS_MASK) != ICS);
@@ -98,7 +108,7 @@ UpdateMMCHSClkFrequency (
MmioOr32 (MMCHS_SYSCTL, CEN);
}
-STATIC
+
EFI_STATUS
SendCmd (
UINTN Cmd,
@@ -116,7 +126,7 @@ SendCmd (
MmioWrite32 (MMCHS_BLK, BLEN_512BYTES);
//Setting Data timeout counter value to max value.
- MmioAndThenOr32(MMCHS_SYSCTL, ~DTO_MASK, DTO_VAL);
+ MmioAndThenOr32 (MMCHS_SYSCTL, ~DTO_MASK, DTO_VAL);
//Clear Status register.
MmioWrite32 (MMCHS_STAT, 0xFFFFFFFF);
@@ -163,7 +173,7 @@ SendCmd (
return EFI_SUCCESS;
}
-STATIC
+
VOID
GetBlockInformation (
UINTN *BlockSize,
@@ -173,8 +183,8 @@ GetBlockInformation (
CSD_SDV2 *CsdSDV2Data;
UINTN CardSize;
- if (gCardInfo->CardType == SD_CARD_2_HIGH) {
- CsdSDV2Data = (CSD_SDV2 *)&gCardInfo->CSDData;
+ if (gCardInfo.CardType == SD_CARD_2_HIGH) {
+ CsdSDV2Data = (CSD_SDV2 *)&gCardInfo.CSDData;
//Populate BlockSize.
*BlockSize = (0x1UL << CsdSDV2Data->READ_BL_LEN);
@@ -184,11 +194,11 @@ GetBlockInformation (
*NumBlocks = ((CardSize + 1) * 1024);
} else {
//Populate BlockSize.
- *BlockSize = (0x1UL << gCardInfo->CSDData.READ_BL_LEN);
+ *BlockSize = (0x1UL << gCardInfo.CSDData.READ_BL_LEN);
//Calculate Total number of blocks.
- CardSize = gCardInfo->CSDData.C_SIZELow2 | (gCardInfo->CSDData.C_SIZEHigh10 << 2);
- *NumBlocks = (CardSize + 1) * (1 << (gCardInfo->CSDData.C_SIZE_MULT + 2));
+ CardSize = gCardInfo.CSDData.C_SIZELow2 | (gCardInfo.CSDData.C_SIZEHigh10 << 2);
+ *NumBlocks = (CardSize + 1) * (1 << (gCardInfo.CSDData.C_SIZE_MULT + 2));
}
//For >=2G card, BlockSize may be 1K, but the transfer size is 512 bytes.
@@ -197,10 +207,10 @@ GetBlockInformation (
*BlockSize = 512;
}
- DEBUG ((EFI_D_INFO, "Card type: %x, BlockSize: %x, NumBlocks: %x\n", gCardInfo->CardType, *BlockSize, *NumBlocks));
+ DEBUG ((EFI_D_INFO, "Card type: %x, BlockSize: %x, NumBlocks: %x\n", gCardInfo.CardType, *BlockSize, *NumBlocks));
}
-STATIC
+
VOID
CalculateCardCLKD (
UINTN *ClockFrequencySelect
@@ -211,7 +221,7 @@ CalculateCardCLKD (
UINTN TimeValue = 0 ;
UINTN Frequency = 0;
- MaxDataTransferRate = gCardInfo->CSDData.TRAN_SPEED;
+ MaxDataTransferRate = gCardInfo.CSDData.TRAN_SPEED;
//Calculate Transfer rate unit (Bits 2:0 of TRAN_SPEED)
switch (MaxDataTransferRate & 0x7) {
@@ -311,7 +321,7 @@ CalculateCardCLKD (
DEBUG ((EFI_D_INFO, "MaxDataTransferRate: 0x%x, Frequency: %d KHz, ClockFrequencySelect: %x\n", MaxDataTransferRate, Frequency/1000, *ClockFrequencySelect));
}
-STATIC
+
VOID
GetCardConfigurationData (
VOID
@@ -323,15 +333,15 @@ GetCardConfigurationData (
//Calculate BlockSize and Total number of blocks in the detected card.
GetBlockInformation(&BlockSize, &NumBlocks);
- gCardInfo->BlockSize = BlockSize;
- gCardInfo->NumBlocks = NumBlocks;
+ gCardInfo.BlockSize = BlockSize;
+ gCardInfo.NumBlocks = NumBlocks;
//Calculate Card clock divider value.
CalculateCardCLKD(&ClockFrequencySelect);
- gCardInfo->ClockFrequencySelect = ClockFrequencySelect;
+ gCardInfo.ClockFrequencySelect = ClockFrequencySelect;
}
-STATIC
+
EFI_STATUS
InitializeMMCHS (
VOID
@@ -342,55 +352,29 @@ InitializeMMCHS (
//Select Device group to belong to P1 device group in Power IC.
Data = DEV_GRP_P1;
- Status = gTPS65950->Write(gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VMMC1_DEV_GRP), 1, &Data);
+ Status = gTPS65950->Write (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VMMC1_DEV_GRP), 1, &Data);
ASSERT_EFI_ERROR(Status);
//Configure voltage regulator for MMC1 in Power IC to output 3.0 voltage.
Data = VSEL_3_00V;
- Status = gTPS65950->Write(gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VMMC1_DEDICATED_REG), 1, &Data);
+ Status = gTPS65950->Write (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VMMC1_DEDICATED_REG), 1, &Data);
ASSERT_EFI_ERROR(Status);
//After ramping up voltage, set VDDS stable bit to indicate that voltage level is stable.
MmioOr32 (CONTROL_PBIAS_LITE, (PBIASLITEVMODE0 | PBIASLITEPWRDNZ0 | PBIASSPEEDCTRL0 | PBIASLITEVMODE1 | PBIASLITEWRDNZ1));
- //Software reset of the MMCHS host controller.
- MmioWrite32 (MMCHS_SYSCONFIG, SOFTRESET);
- gBS->Stall(1000);
- while ((MmioRead32 (MMCHS_SYSSTATUS) & RESETDONE_MASK) != RESETDONE);
+ // Enable WP GPIO
+ MmioAndThenOr32 (GPIO1_BASE + GPIO_OE, ~BIT23, BIT23);
- //Soft reset for all.
- MmioWrite32 (MMCHS_SYSCTL, SRA);
- gBS->Stall(1000);
- while ((MmioRead32 (MMCHS_SYSCTL) & SRA) != 0x0);
-
- //Voltage capabilities initialization. Activate VS18 and VS30.
- MmioOr32 (MMCHS_CAPA, (VS30 | VS18));
-
- //Wakeup configuration
- MmioOr32 (MMCHS_SYSCONFIG, ENAWAKEUP);
- MmioOr32 (MMCHS_HCTL, IWE);
+ // Enable Card Detect
+ Data = CARD_DETECT_ENABLE;
+ gTPS65950->Write (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID2, TPS65950_GPIO_CTRL), 1, &Data);
- //MMCHS Controller default initialization
- MmioOr32 (MMCHS_CON, (OD | DW8_1_4_BIT | CEATA_OFF));
-
- MmioWrite32 (MMCHS_HCTL, (SDVS_3_0_V | DTW_1_BIT | SDBP_OFF));
-
- //Enable internal clock
- MmioOr32 (MMCHS_SYSCTL, ICE);
-
- //Set the clock frequency to 80KHz.
- UpdateMMCHSClkFrequency(CLKD_80KHZ);
-
- //Enable SD bus power.
- MmioOr32 (MMCHS_HCTL, (SDBP_ON));
-
- //Poll till SD bus power bit is set.
- while ((MmioRead32 (MMCHS_HCTL) & SDBP_MASK) != SDBP_ON);
return Status;
}
-STATIC
+
EFI_STATUS
PerformCardIdenfication (
VOID
@@ -403,7 +387,7 @@ PerformCardIdenfication (
BOOLEAN SDCmd8Supported = FALSE;
//Enable interrupts.
- MmioWrite32 (MMCHS_IE, (BADA_EN | CERR_EN | DEB_EN | DCRC_EN | DTO_EN | CIE_EN |
+ MmioWrite32 (MMCHS_IE, (BADA_EN | CERR_EN | DEB_EN | DCRC_EN | DTO_EN | CIE_EN |
CEB_EN | CCRC_EN | CTO_EN | BRR_EN | BWR_EN | TC_EN | CC_EN));
//Controller INIT procedure start.
@@ -422,7 +406,7 @@ PerformCardIdenfication (
while (!(MmioRead32 (MMCHS_STAT) & CC));
//End initialization sequence
- MmioAnd32(MMCHS_CON, ~INIT);
+ MmioAnd32 (MMCHS_CON, ~INIT);
MmioOr32 (MMCHS_HCTL, (SDVS_3_0_V | DTW_1_BIT | SDBP_ON));
@@ -432,7 +416,7 @@ PerformCardIdenfication (
MmioOr32 (MMCHS_CON, OD);
//Send CMD0 command.
- Status = SendCmd(CMD0, CMD0_INT_EN, CmdArgument);
+ Status = SendCmd (CMD0, CMD0_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "Cmd0 fails.\n"));
return Status;
@@ -441,7 +425,7 @@ PerformCardIdenfication (
DEBUG ((EFI_D_INFO, "CMD0 response: %x\n", MmioRead32 (MMCHS_RSP10)));
//Send CMD5 command.
- Status = SendCmd(CMD5, CMD5_INT_EN, CmdArgument);
+ Status = SendCmd (CMD5, CMD5_INT_EN, CmdArgument);
if (Status == EFI_SUCCESS) {
DEBUG ((EFI_D_ERROR, "CMD5 Success. SDIO card. Follow SDIO card specification.\n"));
DEBUG ((EFI_D_INFO, "CMD5 response: %x\n", MmioRead32 (MMCHS_RSP10)));
@@ -459,7 +443,7 @@ PerformCardIdenfication (
//Only 2.7V - 3.6V is supported for SD2.0, only SD 2.0 card can pass.
//MMC & SD1.1 card will fail this command.
CmdArgument = CMD8_ARG;
- Status = SendCmd(CMD8, CMD8_INT_EN, CmdArgument);
+ Status = SendCmd (CMD8, CMD8_INT_EN, CmdArgument);
if (Status == EFI_SUCCESS) {
Response = MmioRead32 (MMCHS_RSP10);
DEBUG ((EFI_D_INFO, "CMD8 success. CMD8 response: %x\n", Response));
@@ -480,34 +464,34 @@ PerformCardIdenfication (
while (RetryCount < MAX_RETRY_COUNT) {
//Send CMD55 command.
CmdArgument = 0;
- Status = SendCmd(CMD55, CMD55_INT_EN, CmdArgument);
+ Status = SendCmd (CMD55, CMD55_INT_EN, CmdArgument);
if (Status == EFI_SUCCESS) {
DEBUG ((EFI_D_INFO, "CMD55 success. CMD55 response: %x\n", MmioRead32 (MMCHS_RSP10)));
- gCardInfo->CardType = SD_CARD;
+ gCardInfo.CardType = SD_CARD;
} else {
DEBUG ((EFI_D_INFO, "CMD55 fails.\n"));
- gCardInfo->CardType = MMC_CARD;
+ gCardInfo.CardType = MMC_CARD;
}
//Send appropriate command for the card type which got detected.
- if (gCardInfo->CardType == SD_CARD) {
- CmdArgument = ((UINTN *) &(gCardInfo->OCRData))[0];
+ if (gCardInfo.CardType == SD_CARD) {
+ CmdArgument = ((UINTN *) &(gCardInfo.OCRData))[0];
//Set HCS bit.
if (SDCmd8Supported) {
CmdArgument |= HCS;
}
- Status = SendCmd(ACMD41, ACMD41_INT_EN, CmdArgument);
+ Status = SendCmd (ACMD41, ACMD41_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_INFO, "ACMD41 fails.\n"));
return Status;
}
- ((UINT32 *) &(gCardInfo->OCRData))[0] = MmioRead32 (MMCHS_RSP10);
- DEBUG ((EFI_D_INFO, "SD card detected. ACMD41 OCR: %x\n", ((UINT32 *) &(gCardInfo->OCRData))[0]));
- } else if (gCardInfo->CardType == MMC_CARD) {
+ ((UINT32 *) &(gCardInfo.OCRData))[0] = MmioRead32 (MMCHS_RSP10);
+ DEBUG ((EFI_D_INFO, "SD card detected. ACMD41 OCR: %x\n", ((UINT32 *) &(gCardInfo.OCRData))[0]));
+ } else if (gCardInfo.CardType == MMC_CARD) {
CmdArgument = 0;
- Status = SendCmd(CMD1, CMD1_INT_EN, CmdArgument);
+ Status = SendCmd (CMD1, CMD1_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_INFO, "CMD1 fails.\n"));
return Status;
@@ -521,16 +505,16 @@ PerformCardIdenfication (
}
//Poll the card until it is out of its power-up sequence.
- if (gCardInfo->OCRData.Busy == 1) {
+ if (gCardInfo.OCRData.Busy == 1) {
if (SDCmd8Supported) {
- gCardInfo->CardType = SD_CARD_2;
+ gCardInfo.CardType = SD_CARD_2;
}
//Card is ready. Check CCS (Card capacity status) bit (bit#30).
//SD 2.0 standard card will response with CCS 0, SD high capacity card will respond with CCS 1.
- if (gCardInfo->OCRData.AccessMode & BIT1) {
- gCardInfo->CardType = SD_CARD_2_HIGH;
+ if (gCardInfo.OCRData.AccessMode & BIT1) {
+ gCardInfo.CardType = SD_CARD_2_HIGH;
DEBUG ((EFI_D_INFO, "High capacity card.\n"));
} else {
DEBUG ((EFI_D_INFO, "Standard capacity card.\n"));
@@ -550,7 +534,7 @@ PerformCardIdenfication (
//Read CID data.
CmdArgument = 0;
- Status = SendCmd(CMD2, CMD2_INT_EN, CmdArgument);
+ Status = SendCmd (CMD2, CMD2_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD2 fails. Status: %x\n", Status));
return Status;
@@ -563,25 +547,25 @@ PerformCardIdenfication (
//Read RCA
CmdArgument = 0;
- Status = SendCmd(CMD3, CMD3_INT_EN, CmdArgument);
+ Status = SendCmd (CMD3, CMD3_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD3 fails. Status: %x\n", Status));
return Status;
}
//Set RCA for the detected card. RCA is CMD3 response.
- gCardInfo->RCA = (MmioRead32 (MMCHS_RSP10) >> 16);
- DEBUG ((EFI_D_INFO, "CMD3 response: RCA %x\n", gCardInfo->RCA));
+ gCardInfo.RCA = (MmioRead32 (MMCHS_RSP10) >> 16);
+ DEBUG ((EFI_D_INFO, "CMD3 response: RCA %x\n", gCardInfo.RCA));
//MMC Bus setting change after card identification.
- MmioAnd32(MMCHS_CON, ~OD);
+ MmioAnd32 (MMCHS_CON, ~OD);
MmioOr32 (MMCHS_HCTL, SDVS_3_0_V);
UpdateMMCHSClkFrequency(CLKD_400KHZ); //Set the clock frequency to 400KHz.
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
GetCardSpecificData (
VOID
@@ -591,18 +575,18 @@ GetCardSpecificData (
UINTN CmdArgument;
//Send CMD9 to retrieve CSD.
- CmdArgument = gCardInfo->RCA << 16;
- Status = SendCmd(CMD9, CMD9_INT_EN, CmdArgument);
+ CmdArgument = gCardInfo.RCA << 16;
+ Status = SendCmd (CMD9, CMD9_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD9 fails. Status: %x\n", Status));
return Status;
}
//Populate 128-bit CSD register data.
- ((UINT32 *)&(gCardInfo->CSDData))[0] = MmioRead32 (MMCHS_RSP10);
- ((UINT32 *)&(gCardInfo->CSDData))[1] = MmioRead32 (MMCHS_RSP32);
- ((UINT32 *)&(gCardInfo->CSDData))[2] = MmioRead32 (MMCHS_RSP54);
- ((UINT32 *)&(gCardInfo->CSDData))[3] = MmioRead32 (MMCHS_RSP76);
+ ((UINT32 *)&(gCardInfo.CSDData))[0] = MmioRead32 (MMCHS_RSP10);
+ ((UINT32 *)&(gCardInfo.CSDData))[1] = MmioRead32 (MMCHS_RSP32);
+ ((UINT32 *)&(gCardInfo.CSDData))[2] = MmioRead32 (MMCHS_RSP54);
+ ((UINT32 *)&(gCardInfo.CSDData))[3] = MmioRead32 (MMCHS_RSP76);
DEBUG ((EFI_D_INFO, "CMD9 response: %x %x %x %x\n", MmioRead32 (MMCHS_RSP10), MmioRead32 (MMCHS_RSP32), MmioRead32 (MMCHS_RSP54), MmioRead32 (MMCHS_RSP76)));
@@ -610,12 +594,12 @@ GetCardSpecificData (
GetCardConfigurationData();
//Change MMCHS clock frequency to what detected card can support.
- UpdateMMCHSClkFrequency(gCardInfo->ClockFrequencySelect);
+ UpdateMMCHSClkFrequency(gCardInfo.ClockFrequencySelect);
return Status;
}
-STATIC
+
EFI_STATUS
PerformCardConfiguration (
VOID
@@ -625,16 +609,16 @@ PerformCardConfiguration (
EFI_STATUS Status;
//Send CMD7
- CmdArgument = gCardInfo->RCA << 16;
- Status = SendCmd(CMD7, CMD7_INT_EN, CmdArgument);
+ CmdArgument = gCardInfo.RCA << 16;
+ Status = SendCmd (CMD7, CMD7_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD7 fails. Status: %x\n", Status));
return Status;
}
//Send CMD16 to set the block length
- CmdArgument = gCardInfo->BlockSize;
- Status = SendCmd(CMD16, CMD16_INT_EN, CmdArgument);
+ CmdArgument = gCardInfo.BlockSize;
+ Status = SendCmd (CMD16, CMD16_INT_EN, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD16 fails. Status: %x\n", Status));
return Status;
@@ -643,9 +627,9 @@ PerformCardConfiguration (
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
-ReadBlockData(
+ReadBlockData (
IN EFI_BLOCK_IO_PROTOCOL *This,
OUT VOID *Buffer
)
@@ -685,9 +669,9 @@ ReadBlockData(
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
-WriteBlockData(
+WriteBlockData (
IN EFI_BLOCK_IO_PROTOCOL *This,
OUT VOID *Buffer
)
@@ -728,9 +712,9 @@ WriteBlockData(
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
-TransferBlockData(
+TransferBlockData (
IN EFI_BLOCK_IO_PROTOCOL *This,
OUT VOID *Buffer,
IN OPERATION_TYPE OperationType
@@ -789,7 +773,113 @@ TransferBlockData(
return EFI_SUCCESS;
}
-STATIC
+BOOLEAN
+CardPresent (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ UINT8 Data;
+
+ //
+ // Card detect is a GPIO0 on the TPS65950
+ //
+ Status = gTPS65950->Read (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID2, GPIODATAIN1), 1, &Data);
+ if (EFI_ERROR (Status)) {
+ return FALSE;
+ }
+
+ if ((Data & CARD_DETECT_BIT) == CARD_DETECT_BIT) {
+ // No Card present
+ return FALSE;
+ } else {
+ return TRUE;
+ }
+}
+
+EFI_STATUS
+DetectCard (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+
+ if (!CardPresent ()) {
+ return EFI_NO_MEDIA;
+ }
+
+ //Initialize MMC host controller clocks.
+ Status = InitializeMMCHS ();
+ if (EFI_ERROR(Status)) {
+ DEBUG ((EFI_D_ERROR, "Initialize MMC host controller fails. Status: %x\n", Status));
+ return Status;
+ }
+
+ //Software reset of the MMCHS host controller.
+ MmioWrite32 (MMCHS_SYSCONFIG, SOFTRESET);
+ gBS->Stall(1000);
+ while ((MmioRead32 (MMCHS_SYSSTATUS) & RESETDONE_MASK) != RESETDONE);
+
+ //Soft reset for all.
+ MmioWrite32 (MMCHS_SYSCTL, SRA);
+ gBS->Stall(1000);
+ while ((MmioRead32 (MMCHS_SYSCTL) & SRA) != 0x0);
+
+ //Voltage capabilities initialization. Activate VS18 and VS30.
+ MmioOr32 (MMCHS_CAPA, (VS30 | VS18));
+
+ //Wakeup configuration
+ MmioOr32 (MMCHS_SYSCONFIG, ENAWAKEUP);
+ MmioOr32 (MMCHS_HCTL, IWE);
+
+ //MMCHS Controller default initialization
+ MmioOr32 (MMCHS_CON, (OD | DW8_1_4_BIT | CEATA_OFF));
+
+ MmioWrite32 (MMCHS_HCTL, (SDVS_3_0_V | DTW_1_BIT | SDBP_OFF));
+
+ //Enable internal clock
+ MmioOr32 (MMCHS_SYSCTL, ICE);
+
+ //Set the clock frequency to 80KHz.
+ UpdateMMCHSClkFrequency (CLKD_80KHZ);
+
+ //Enable SD bus power.
+ MmioOr32 (MMCHS_HCTL, (SDBP_ON));
+
+ //Poll till SD bus power bit is set.
+ while ((MmioRead32 (MMCHS_HCTL) & SDBP_MASK) != SDBP_ON);
+
+ //Card idenfication
+ Status = PerformCardIdenfication ();
+ if (EFI_ERROR(Status)) {
+ DEBUG ((EFI_D_ERROR, "No MMC/SD card detected.\n"));
+ return Status;
+ }
+
+ //Get CSD (Card specific data) for the detected card.
+ Status = GetCardSpecificData();
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ //Configure the card in data transfer mode.
+ Status = PerformCardConfiguration();
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ //Patch the Media structure.
+ gMMCHSMedia.LastBlock = (gCardInfo.NumBlocks - 1);
+ gMMCHSMedia.BlockSize = gCardInfo.BlockSize;
+ gMMCHSMedia.ReadOnly = (MmioRead32 (GPIO1_BASE + GPIO_DATAIN) & BIT23) == BIT23;
+ gMMCHSMedia.MediaPresent = TRUE;
+ gMMCHSMedia.MediaId++;
+ gMediaChange = FALSE;
+
+ return Status;
+}
+
+
EFI_STATUS
SdReadWrite (
IN EFI_BLOCK_IO_PROTOCOL *This,
@@ -799,24 +889,79 @@ SdReadWrite (
IN OPERATION_TYPE OperationType
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status = EFI_SUCCESS;
UINTN RetryCount = 0;
UINTN NumBlocks;
UINTN Cmd = 0;
UINTN CmdInterruptEnable = 0;
UINTN CmdArgument = 0;
+ EFI_TPL OldTpl;
+ BOOLEAN MediaPresentLastTime;
+ BOOLEAN Update;
+
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
+
+
+ if (Buffer == NULL) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Done;
+ }
+
+ Update = FALSE;
+ MediaPresentLastTime = gMMCHSMedia.MediaPresent;
+
+ if (gMediaChange) {
+ Status = DetectCard ();
+ if (EFI_ERROR (Status)) {
+ // We detected a removal
+ gMMCHSMedia.MediaPresent = FALSE;
+ gMMCHSMedia.LastBlock = 0;
+ gMMCHSMedia.BlockSize = 512; // Should be zero but there is a bug in DiskIo
+ gMMCHSMedia.ReadOnly = FALSE;
+ } else {
+ Update = TRUE;
+ }
+ gMediaChange = FALSE;
+ } else if (!gMMCHSMedia.MediaPresent) {
+ Status = EFI_NO_MEDIA;
+ goto Done;
+ }
+
+ if ((MediaPresentLastTime != gMMCHSMedia.MediaPresent) || Update) {
+ gBS->ReinstallProtocolInterface (
+ gImageHandle,
+ &gEfiBlockIoProtocolGuid,
+ &gBlockIo,
+ &gBlockIo
+ );
+ }
+
+ if (EFI_ERROR (Status)) {
+ goto Done;
+ }
+
+ if (Lba > This->Media->LastBlock) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Done;
+ }
+
+ if ((BufferSize % This->Media->BlockSize) != 0) {
+ Status = EFI_BAD_BUFFER_SIZE;
+ goto Done;
+ }
//Check if the data lines are not in use.
while ((RetryCount++ < MAX_RETRY_COUNT) && ((MmioRead32 (MMCHS_PSTATE) & DATI_MASK) != DATI_ALLOWED));
if (RetryCount == MAX_RETRY_COUNT) {
- return EFI_TIMEOUT;
+ Status = EFI_TIMEOUT;
+ goto Done;
}
//Populate the command information based on the operation type.
if (OperationType == READ) {
Cmd = CMD17; //Single block read
CmdInterruptEnable = CMD17_INT_EN;
- } else if (OperationType == WRITE) {
+ } else if (OperationType == WRITE) {
Cmd = CMD24; //Single block write
CmdInterruptEnable = CMD24_INT_EN;
}
@@ -825,7 +970,7 @@ SdReadWrite (
NumBlocks = (BufferSize + (This->Media->BlockSize - 1))/This->Media->BlockSize;
//Set command argument based on the card access mode (Byte mode or Block mode)
- if (gCardInfo->OCRData.AccessMode & BIT1) {
+ if (gCardInfo.OCRData.AccessMode & BIT1) {
CmdArgument = (UINTN)Lba;
} else {
CmdArgument = (UINTN)Lba * This->Media->BlockSize;
@@ -833,21 +978,21 @@ SdReadWrite (
while(NumBlocks) {
//Send Command.
- Status = SendCmd(Cmd, CmdInterruptEnable, CmdArgument);
+ Status = SendCmd (Cmd, CmdInterruptEnable, CmdArgument);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "CMD fails. Status: %x\n", Status));
- return Status;
+ goto Done;
}
//Transfer a block worth of data.
Status = TransferBlockData(This, Buffer, OperationType);
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "TransferBlockData fails. %x\n", Status));
- return Status;
+ goto Done;
}
//Adjust command argument.
- if (gCardInfo->OCRData.AccessMode & BIT1) {
+ if (gCardInfo.OCRData.AccessMode & BIT1) {
CmdArgument++; //Increase BlockIndex by one.
} else {
CmdArgument += This->Media->BlockSize; //Increase BlockIndex by BlockSize
@@ -858,9 +1003,23 @@ SdReadWrite (
NumBlocks--;
}
- return EFI_SUCCESS;
+Done:
+ gBS->RestoreTPL (OldTpl);
+ return Status;
}
+
+/**
+ Reset the Block Device.
+
+ @param This Indicates a pointer to the calling context.
+ @param ExtendedVerification Driver may perform diagnostics on reset.
+
+ @retval EFI_SUCCESS The device was reset.
+ @retval EFI_DEVICE_ERROR The device is not functioning properly and could
+ not be reset.
+
+**/
EFI_STATUS
EFIAPI
MMCHSReset (
@@ -868,9 +1027,30 @@ MMCHSReset (
IN BOOLEAN ExtendedVerification
)
{
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
+
+/**
+ Read BufferSize bytes from Lba into Buffer.
+
+ @param This Indicates a pointer to the calling context.
+ @param MediaId Id of the media, changes every time the media is replaced.
+ @param Lba The starting Logical Block Address to read from
+ @param BufferSize Size of Buffer, must be a multiple of device block size.
+ @param Buffer A pointer to the destination buffer for the data. The caller is
+ responsible for either having implicit or explicit ownership of the buffer.
+
+ @retval EFI_SUCCESS The data was read correctly from the device.
+ @retval EFI_DEVICE_ERROR The device reported an error while performing the read.
+ @retval EFI_NO_MEDIA There is no media in the device.
+ @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device.
+ @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device.
+ @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid,
+ or the buffer is not on proper alignment.
+EFI_STATUS
+
+**/
EFI_STATUS
EFIAPI
MMCHSReadBlocks (
@@ -883,30 +1063,33 @@ MMCHSReadBlocks (
{
EFI_STATUS Status;
- if (Buffer == NULL)
- {
- return EFI_INVALID_PARAMETER;
- }
-
- if (Lba > This->Media->LastBlock)
- {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((BufferSize % This->Media->BlockSize) != 0)
- {
- return EFI_BAD_BUFFER_SIZE;
- }
-
//Perform Read operation.
- Status = SdReadWrite(This, (UINTN)Lba, Buffer, BufferSize, READ);
- if (EFI_ERROR(Status)) {
- DEBUG ((EFI_D_ERROR, "Read operation fails.\n"));
- }
+ Status = SdReadWrite (This, (UINTN)Lba, Buffer, BufferSize, READ);
- return Status;
+ return Status;
}
+
+/**
+ Write BufferSize bytes from Lba into Buffer.
+
+ @param This Indicates a pointer to the calling context.
+ @param MediaId The media ID that the write request is for.
+ @param Lba The starting logical block address to be written. The caller is
+ responsible for writing to only legitimate locations.
+ @param BufferSize Size of Buffer, must be a multiple of device block size.
+ @param Buffer A pointer to the source buffer for the data.
+
+ @retval EFI_SUCCESS The data was written correctly to the device.
+ @retval EFI_WRITE_PROTECTED The device can not be written to.
+ @retval EFI_DEVICE_ERROR The device reported an error while performing the write.
+ @retval EFI_NO_MEDIA There is no media in the device.
+ @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device.
+ @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device.
+ @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid,
+ or the buffer is not on proper alignment.
+
+**/
EFI_STATUS
EFIAPI
MMCHSWriteBlocks (
@@ -917,33 +1100,25 @@ MMCHSWriteBlocks (
IN VOID *Buffer
)
{
- EFI_STATUS Status;
-
- if (Buffer == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (Lba > This->Media->LastBlock) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((BufferSize % This->Media->BlockSize) != 0) {
- return EFI_BAD_BUFFER_SIZE;
- }
-
- if (This->Media->ReadOnly) {
- return EFI_WRITE_PROTECTED;
- }
+ EFI_STATUS Status;
//Perform write operation.
- Status = SdReadWrite(This, (UINTN)Lba, Buffer, BufferSize, WRITE);
- if (EFI_ERROR(Status)) {
- DEBUG ((EFI_D_ERROR, "Write operation fails.\n"));
- }
-
- return Status;
+ Status = SdReadWrite (This, (UINTN)Lba, Buffer, BufferSize, WRITE);
+
+ return Status;
}
+
+/**
+ Flush the Block Device.
+
+ @param This Indicates a pointer to the calling context.
+
+ @retval EFI_SUCCESS All outstanding data was written to the device
+ @retval EFI_DEVICE_ERROR The device reported an error while writting back the data
+ @retval EFI_NO_MEDIA There is no media in the device.
+
+**/
EFI_STATUS
EFIAPI
MMCHSFlushBlocks (
@@ -953,17 +1128,53 @@ MMCHSFlushBlocks (
return EFI_SUCCESS;
}
-EFI_BLOCK_IO_PROTOCOL BlockIo =
-{
+
+EFI_BLOCK_IO_PROTOCOL gBlockIo = {
EFI_BLOCK_IO_INTERFACE_REVISION, // Revision
- &MMCHSMedia, // *Media
+ &gMMCHSMedia, // *Media
MMCHSReset, // Reset
MMCHSReadBlocks, // ReadBlocks
MMCHSWriteBlocks, // WriteBlocks
MMCHSFlushBlocks // FlushBlocks
};
+
+/**
+ Timer callback to convert card present hardware into a boolean that indicates
+ a media change event has happened. If you just check the GPIO you could see
+ card 1 and then check again after card 1 was removed and card 2 was inserted
+ and you would still see media present. Thus you need the timer tick to catch
+ the toggle event.
+
+ @param Event Event whose notification function is being invoked.
+ @param Context The pointer to the notification function's context,
+ which is implementation-dependent. Not used.
+
+**/
+VOID
+EFIAPI
+TimerCallback (
+ IN EFI_EVENT Event,
+ IN VOID *Context
+ )
+{
+ BOOLEAN Present;
+
+ Present = CardPresent ();
+ if (gMMCHSMedia.MediaPresent) {
+ if (!Present && !gMediaChange) {
+ gMediaChange = TRUE;
+ }
+ } else {
+ if (Present && !gMediaChange) {
+ gMediaChange = TRUE;
+ }
+ }
+}
+
+
EFI_STATUS
+EFIAPI
MMCHSInitialize (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
@@ -971,48 +1182,23 @@ MMCHSInitialize (
{
EFI_STATUS Status;
- Status = gBS->LocateProtocol(&gEmbeddedExternalDeviceProtocolGuid, NULL, (VOID **)&gTPS65950);
+ Status = gBS->LocateProtocol (&gEmbeddedExternalDeviceProtocolGuid, NULL, (VOID **)&gTPS65950);
ASSERT_EFI_ERROR(Status);
- gCardInfo = (CARD_INFO *)AllocateZeroPool(sizeof(CARD_INFO));
- if (gCardInfo == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-
- //Initialize MMC host controller.
- Status = InitializeMMCHS();
- if (EFI_ERROR(Status)) {
- DEBUG ((EFI_D_ERROR, "Initialize MMC host controller fails. Status: %x\n", Status));
- return Status;
- }
-
- //Card idenfication
- Status = PerformCardIdenfication();
- if (EFI_ERROR(Status)) {
- DEBUG ((EFI_D_ERROR, "No MMC/SD card detected.\n"));
- return EFI_SUCCESS; //NOTE: Check if this is correct..
- }
-
- //Get CSD (Card specific data) for the detected card.
- Status = GetCardSpecificData();
- if (EFI_ERROR(Status)) {
- return Status;
- }
-
- //Configure the card in data transfer mode.
- Status = PerformCardConfiguration();
- if (EFI_ERROR(Status)) {
- return Status;
- }
-
- //Patch the Media structure.
- MMCHSMedia.LastBlock = (gCardInfo->NumBlocks - 1);
- MMCHSMedia.BlockSize = gCardInfo->BlockSize;
+ ZeroMem (&gCardInfo, sizeof (CARD_INFO));
+
+ Status = gBS->CreateEvent (EVT_TIMER | EVT_NOTIFY_SIGNAL, TPL_CALLBACK, TimerCallback, NULL, &gTimerEvent);
+ ASSERT_EFI_ERROR (Status);
+
+ Status = gBS->SetTimer (gTimerEvent, TimerPeriodic, 1000000); // make me a PCD
+ ASSERT_EFI_ERROR (Status);
//Publish BlockIO.
- Status = gBS->InstallMultipleProtocolInterfaces(&ImageHandle,
- &gEfiBlockIoProtocolGuid, &BlockIo,
- &gEfiDevicePathProtocolGuid, &gMmcHsDevicePath,
- NULL);
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &ImageHandle,
+ &gEfiBlockIoProtocolGuid, &gBlockIo,
+ &gEfiDevicePathProtocolGuid, &gMmcHsDevicePath,
+ NULL
+ );
return Status;
}
diff --git a/Omap35xxPkg/MMCHSDxe/MMCHS.h b/Omap35xxPkg/MMCHSDxe/MMCHS.h
index d5964a97c3..8fa1ba1b67 100644
--- a/Omap35xxPkg/MMCHSDxe/MMCHS.h
+++ b/Omap35xxPkg/MMCHSDxe/MMCHS.h
@@ -21,16 +21,16 @@
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
#include <Library/UefiBootServicesTableLib.h>
+#include <Library/BaseMemoryLib.h>
#include <Protocol/EmbeddedExternalDevice.h>
#include <Protocol/BlockIo.h>
-#include <Protocol/Cpu.h>
#include <Protocol/DevicePath.h>
#include <Omap3530/Omap3530.h>
#include <TPS65950.h>
-#define MAX_RETRY_COUNT 100
+#define MAX_RETRY_COUNT (100*5)
#define HCS BIT30 //Host capacity support/1 = Supporting high capacity
#define CCS BIT30 //Card capacity status/1 = High capacity card
@@ -59,18 +59,21 @@ typedef struct {
typedef struct {
UINT8 NOT_USED: 1; // Not used, always 1 [0:0]
UINT8 CRC: 7; // CRC [7:1]
+
UINT8 RESERVED_1: 2; // Reserved [9:8]
UINT8 FILE_FORMAT: 2; // File format [11:10]
UINT8 TMP_WRITE_PROTECT: 1; // Temporary write protection [12:12]
UINT8 PERM_WRITE_PROTECT: 1; // Permanent write protection [13:13]
UINT8 COPY: 1; // Copy flag (OTP) [14:14]
UINT8 FILE_FORMAT_GRP: 1; // File format group [15:15]
+
UINT16 RESERVED_2: 5; // Reserved [20:16]
UINT16 WRITE_BL_PARTIAL: 1; // Partial blocks for write allowed [21:21]
UINT16 WRITE_BL_LEN: 4; // Max. write data block length [25:22]
UINT16 R2W_FACTOR: 3; // Write speed factor [28:26]
UINT16 RESERVED_3: 2; // Reserved [30:29]
UINT16 WP_GRP_ENABLE: 1; // Write protect group enable [31:31]
+
UINT32 WP_GRP_SIZE: 7; // Write protect group size [38:32]
UINT32 SECTOR_SIZE: 7; // Erase sector size [45:39]
UINT32 ERASE_BLK_EN: 1; // Erase single block enable [46:46]
@@ -79,8 +82,9 @@ typedef struct {
UINT32 VDD_W_CURR_MIN: 3; // Max. write current @ VDD min [55:53]
UINT32 VDD_R_CURR_MAX: 3; // Max. read current @ VDD max [58:56]
UINT32 VDD_R_CURR_MIN: 3; // Max. read current @ VDD min [61:59]
- UINT32 C_SIZELow2: 2; // Device size [73:62]
- UINT32 C_SIZEHigh10: 10;// Device size [73:62]
+ UINT32 C_SIZELow2: 2; // Device size [63:62]
+
+ UINT32 C_SIZEHigh10: 10;// Device size [73:64]
UINT32 RESERVED_4: 2; // Reserved [75:74]
UINT32 DSR_IMP: 1; // DSR implemented [76:76]
UINT32 READ_BLK_MISALIGN: 1; // Read block misalignment [77:77]
@@ -88,9 +92,11 @@ typedef struct {
UINT32 READ_BL_PARTIAL: 1; // Partial blocks for read allowed [79:79]
UINT32 READ_BL_LEN: 4; // Max. read data block length [83:80]
UINT32 CCC: 12;// Card command classes [95:84]
+
UINT8 TRAN_SPEED ; // Max. bus clock frequency [103:96]
UINT8 NSAC ; // Data read access-time 2 in CLK cycles (NSAC*100) [111:104]
UINT8 TAAC ; // Data read access-time 1 [119:112]
+
UINT8 RESERVED_5: 6; // Reserved [125:120]
UINT8 CSD_STRUCTURE: 2; // CSD structure [127:126]
}CSD;
@@ -143,8 +149,7 @@ typedef enum {
WRITE
} OPERATION_TYPE;
-typedef struct
-{
+typedef struct {
UINT16 RCA;
UINTN BlockSize;
UINTN NumBlocks;
@@ -155,4 +160,11 @@ typedef struct
CSD CSDData;
} CARD_INFO;
+EFI_STATUS
+DetectCard (
+ VOID
+ );
+
+extern EFI_BLOCK_IO_PROTOCOL gBlockIo;
+
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 05:00:05 +0000