ARM:PXA Remove redefinition of mmc_cid and mmc_csd.
PATCH 1/4 ARM:PXA Remove redefinition of mmc_cid and mmc_csd.
From: Tom Rix <[email protected]>
These structures are defined in the common mmc.h
This was compile checked on cerf250.
--- cpu/pxa/mmc.h | 51 --------------------------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-)
cpu/pxa/mmc.h +0 -51
@@ -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__ */
Signature · 1 line
1.5.6.5
PATCH 2/4 pxa: move mmc drivers to drivers/mmc
introduce new macro CONFIG_PXA_MMC to activate it
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- cpu/pxa/Makefile | 2 +- drivers/mmc/Makefile | 1 + cpu/pxa/mmc.c => drivers/mmc/pxa_mmc.c | 6 +----- cpu/pxa/mmc.h => drivers/mmc/pxa_mmc.h | 0 include/configs/delta.h | 7 +++++-- include/configs/lubbock.h | 7 +++++-- include/configs/pleb2.h | 5 +++++ include/configs/pxa255_idp.h | 5 ++++- include/configs/trizepsiv.h | 5 ++++- include/configs/xsengine.h | 8 ++++++-- include/configs/zylonite.h | 8 ++++++-- 11 files changed, 38 insertions(+), 16 deletions(-) rename cpu/pxa/mmc.c => drivers/mmc/pxa_mmc.c (99%) rename cpu/pxa/mmc.h => drivers/mmc/pxa_mmc.h (100%)
cpu/pxa/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o -COBJS = serial.o interrupts.o cpu.o i2c.o pxafb.o mmc.o usb.o +COBJS = serial.o interrupts.o cpu.o i2c.o pxafb.o usb.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
drivers/mmc/Makefile +1 -0
@@ -30,6 +30,7 @@ COBJS-$(CONFIG_ATMEL_MCI) += atmel_mci.o COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o +COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/mmc/pxa_mmc.c renamed from cpu/pxa/mmc.c +1 -5
@@ -28,9 +28,7 @@#include <asm/arch/hardware.h> #include <part.h> -#include "mmc.h" - -#ifdef CONFIG_MMC +#include "pxa_mmc.h" extern int fat_register_device (block_dev_desc_t * dev_desc,int part_no);
@@ -646,5 +644,3 @@ mmc_legacy_init(int verbose)return rc; } - -#endif /* CONFIG_MMC */
drivers/mmc/pxa_mmc.h renamed from cpu/pxa/mmc.h +0 -0
include/configs/delta.h +5 -2
@@ -34,7 +34,6 @@#ifdef CONFIG_LCD #define CONFIG_SHARP_LM8V31 #endif -/* #define CONFIG_MMC 1 */ #define BOARD_LATE_INIT 1#undef CONFIG_SKIP_RELOCATE_UBOOT
@@ -181,7 +180,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -/* #define CONFIG_SYS_MMC_BASE 0xF0000000 */ +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC +#define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif /* * Stack sizes
include/configs/lubbock.h +5 -2
@@ -40,7 +40,7 @@#ifdef CONFIG_LCD #define CONFIG_SHARP_LM8V31 #endif -#define CONFIG_MMC 1 +#define CONFIG_MMC #define BOARD_LATE_INIT 1#define CONFIG_DOS_PARTITION
@@ -83,7 +83,6 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_MMC #define CONFIG_CMD_FAT
@@ -133,7 +132,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif /* * Stack sizes
include/configs/pleb2.h +5 -0
@@ -132,6 +132,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC +#endif +/* * Stack sizes *
include/configs/pxa255_idp.h +4 -1
@@ -119,7 +119,6 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_DHCP
@@ -249,7 +248,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif /* * Stack sizes
include/configs/trizepsiv.h +4 -1
@@ -79,7 +79,6 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_IMLS #define CONFIG_CMD_PING
@@ -174,7 +173,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif /* * Stack sizes
include/configs/xsengine.h +6 -2
@@ -115,7 +115,6 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_PING #define CONFIG_CMD_JFFS2
@@ -142,9 +141,14 @@#define CONFIG_SYS_MEMTEST_END 0xA0800000/* 4 ... 8 MB in DRAM */ #undef CONFIG_SYS_CLKS_IN_HZ/* everything, incl board info, in Hz */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }/* valid baudrates */ -#define CONFIG_SYS_MMC_BASE 0xF0000000#define CONFIG_SYS_LOAD_ADDR 0xA0000000/* load kernel to this address */ +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC +#define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif +/* Stack sizes - The stack sizes are set up in start.S using the settings below */ #define CONFIG_STACKSIZE (128*1024)/* regular stack */ #ifdef CONFIG_USE_IRQ
include/configs/zylonite.h +6 -2
@@ -41,7 +41,7 @@#ifdef CONFIG_LCD #define CONFIG_SHARP_LM8V31 #endif -/* #define CONFIG_MMC 1 */ +#undef CONFIG_MMC#define BOARD_LATE_INIT 1#undef CONFIG_SKIP_RELOCATE_UBOOT
@@ -152,7 +152,11 @@/* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -/* #define CONFIG_SYS_MMC_BASE 0xF0000000 */ +#ifdef CONFIG_MMC +#define CONFIG_PXA_MMC +#define CONFIG_CMD_MMC +#define CONFIG_SYS_MMC_BASE 0xF0000000 +#endif /* * Stack sizes
Signature · 1 line
1.5.6.5
PATCH 3/4 Reduce the scope of PXA's mmc_read/mmc_write/mmc_bread functions
From: Andy Fleming <[email protected]>
These names are being taken over by the new MMC framework. Hopefuly the PXA can be easily ported, and these functions will go away entirely.
Signed-off-by Andy Fleming <[email protected]>
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- drivers/mmc/pxa_mmc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/pxa_mmc.c +4 -4
@@ -216,7 +216,7 @@ mmc_block_write(ulong dst, uchar * src, int len)int /****************************************************/ -mmc_read (ulong src,uchar * dst,int size) +pxa_mmc_read (long src,uchar * dst,int size)/****************************************************/ {ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -292,7 +292,7 @@ mmc_read(ulong src, uchar * dst, int size)int /****************************************************/ -mmc_write (uchar * src,ulong dst,int size) +pxa_mmc_write (uchar * src,ulong dst,int size)/****************************************************/ {ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -373,7 +373,7 @@ mmc_write(uchar * src, ulong dst, int size)return 0 ; } -ulong +static ulong /****************************************************/ mmc_bread (int dev_num,ulong blknr,lbaint_t blkcnt,void *dst)/****************************************************/
@@ -381,7 +381,7 @@ mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)int mmc_block_size =MMC_BLOCK_SIZE ;ulong src = blknr * mmc_block_size +CONFIG_SYS_MMC_BASE ; -mmc_read (src, (uchar *) dst, blkcnt * mmc_block_size); +pxa_mmc_read (src, (uchar *) dst, blkcnt * mmc_block_size);return blkcnt; }
Signature · 1 line
1.5.6.5
PATCH 4/4 ARM:PXA Use new definitions in mmc.h
From: Tom Rix <[email protected]>
Signed-off-by Tom Rix <[email protected]>
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- drivers/mmc/pxa_mmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mmc/pxa_mmc.c +1 -1
@@ -179,7 +179,7 @@ mmc_block_write(ulong dst, uchar * src, int len)MMC_STRPCL =MMC_STRPCL_STOP_CLK ;MMC_NOB =1 ;MMC_BLKLEN = len; -mmc_cmd (MMC_CMD_WRITE_BLOCK , argh, argl, +mmc_cmd (MMC_CMD_WRITE_SINGLE_BLOCK , argh, argl,MMC_CMDAT_R1 |MMC_CMDAT_WRITE |MMC_CMDAT_BLOCK |MMC_CMDAT_DATA_EN );
Signature · 1 line
1.5.6.5