aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2011-10-17 06:36:23 -0400
committerChris Ball <cjb@laptop.org>2011-10-26 16:32:25 -0400
commit4e0a5adf46ee7810af2e1b7e4e8c2a298652618e (patch)
tree64b60adcedd341a02a8f150ce7257e2b0eb40e0c /include/linux/mmc
parentc43fd7746698a10aa6435d62ec28f977dd6246cc (diff)
mmc: dw_mmc: modify DATA register offset
In dw_mmc 2.40a spec, Data register's offset is changed. Before we used Data register offset 0x100. but if somebody uses a 2.40a controller, we must use 0x200 for Data register. This patch adds a version-id checking point and uses SDMMC_DATA(x) instead of SDMMC_DATA. It assumes 2.40a is the latest version. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/dw_mmc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 6b46819705d1..6dc9b80568a0 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -72,6 +72,8 @@ struct mmc_data;
72 * rate and timeout calculations. 72 * rate and timeout calculations.
73 * @current_speed: Configured rate of the controller. 73 * @current_speed: Configured rate of the controller.
74 * @num_slots: Number of slots available. 74 * @num_slots: Number of slots available.
75 * @verid: Denote Version ID.
76 * @data_offset: Set the offset of DATA register according to VERID.
75 * @pdev: Platform device associated with the MMC controller. 77 * @pdev: Platform device associated with the MMC controller.
76 * @pdata: Platform data associated with the MMC controller. 78 * @pdata: Platform data associated with the MMC controller.
77 * @slot: Slots sharing this MMC controller. 79 * @slot: Slots sharing this MMC controller.
@@ -147,6 +149,8 @@ struct dw_mci {
147 u32 current_speed; 149 u32 current_speed;
148 u32 num_slots; 150 u32 num_slots;
149 u32 fifoth_val; 151 u32 fifoth_val;
152 u16 verid;
153 u16 data_offset;
150 struct platform_device *pdev; 154 struct platform_device *pdev;
151 struct dw_mci_board *pdata; 155 struct dw_mci_board *pdata;
152 struct dw_mci_slot *slot[MAX_MCI_SLOTS]; 156 struct dw_mci_slot *slot[MAX_MCI_SLOTS];