From: Tom Rix <Tom.Rix@windriver.com>
Date: Fri, 20 Feb 2009 01:27:22 +0000 (-0600)
Subject: ARM:PXA Remove redefinition of mmc_cid and mmc_csd.
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9490f465642c80c054854689a2ef1a77d65cf1f3;p=u-boot.git

ARM:PXA Remove redefinition of mmc_cid and mmc_csd.

These structures are defined in the common mmc.h

This was compile checked on cerf250.
---

diff --git a/cpu/pxa/mmc.h b/cpu/pxa/mmc.h
index 85e144b682..6fa42686e6 100644
--- a/cpu/pxa/mmc.h
+++ b/cpu/pxa/mmc.h
@@ -135,55 +135,4 @@
 #define MMC_R1B_ADDR_ERR		0x2000
 #define MMC_R1B_PARAM_ERR		0x4000
 
-typedef struct mmc_cid
-{
-/* FIXME: BYTE_ORDER */
-   uchar year:4,
-   month:4;
-   uchar sn[3];
-   uchar fwrev:4,
-   hwrev:4;
-   uchar name[6];
-   uchar id[3];
-} mmc_cid_t;
-
-typedef struct mmc_csd
-{
-	uint8_t		csd_structure:2,
-			spec_ver:4,
-			rsvd1:2;
-	uint8_t		taac;
-	uint8_t		nsac;
-	uint8_t		tran_speed;
-	uint16_t	ccc:12,
-			read_bl_len:4;
-	uint64_t	read_bl_partial:1,
-			write_blk_misalign:1,
-			read_blk_misalign:1,
-			dsr_imp:1,
-			rsvd2:2,
-			c_size:12,
-			vdd_r_curr_min:3,
-			vdd_r_curr_max:3,
-			vdd_w_curr_min:3,
-			vdd_w_curr_max:3,
-			c_size_mult:3,
-			erase_blk_en:1,
-			sector_size:7,
-			wp_grp_size:7,
-			wp_grp_enable:1,
-			default_ecc:2,
-			r2w_factor:3,
-			write_bl_len:4,
-			write_bl_partial:1,
-			rsvd3:4,
-			content_prot_app:1;
-	uint8_t		file_format_grp:1,
-			copy:1,
-			perm_write_protect:1,
-			tmp_write_protect:1,
-			file_format:2,
-			ecc:2;
-} mmc_csd_t;
-
 #endif /* __MMC_PXA_P_H__ */