Common AHCI and SDHCI drivers

478 lines not on this page · raw message

478 lines not on this page · raw message

deleted file mode 100644
index d458d3b..0000000
@@ -1,72 +0,0 @@
-/*
- * (C) Copyright 2009 SAMSUNG Electronics
- * Minkyu Kang <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef __ASM_ARCH_MMC_H_
-#define __ASM_ARCH_MMC_H_
-
-#ifndef __ASSEMBLY__
-struct s5p_mmc {
-	unsigned int	sysad;
-	unsigned short	blksize;
-	unsigned short	blkcnt;
-	unsigned int	argument;
-	unsigned short	trnmod;
-	unsigned short	cmdreg;
-	unsigned int	rspreg0;
-	unsigned int	rspreg1;
-	unsigned int	rspreg2;
-	unsigned int	rspreg3;
-	unsigned int	bdata;
-	unsigned int	prnsts;
-	unsigned char	hostctl;
-	unsigned char	pwrcon;
-	unsigned char	blkgap;
-	unsigned char	wakcon;
-	unsigned short	clkcon;
-	unsigned char	timeoutcon;
-	unsigned char	swrst;
-	unsigned int	norintsts;	/* errintsts */
-	unsigned int	norintstsen;	/* errintstsen */
-	unsigned int	norintsigen;	/* errintsigen */
-	unsigned short	acmd12errsts;
-	unsigned char	res1[2];
-	unsigned int	capareg;
-	unsigned char	res2[4];
-	unsigned int	maxcurr;
-	unsigned char	res3[0x34];
-	unsigned int	control2;
-	unsigned int	control3;
-	unsigned char	res4[4];
-	unsigned int	control4;
-	unsigned char	res5[0x6e];
-	unsigned short	hcver;
-	unsigned char	res6[0xFFF00];
-};
-
-struct mmc_host {
-	struct s5p_mmc *reg;
-	unsigned int version;	/* SDHCI spec. version */
-	unsigned int clock;	/* Current clock (MHz) */
-};
-
-int s5p_mmc_init(int dev_index, int bus_width);
-
-#endif	/* __ASSEMBLY__ */
-#endif

72 lines not on this page · raw message

index 581935d..8e56f93 100644
@@ -23,8 +23,8 @@
  */
 
 #include <common.h>
+#include <sdhci.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -93,6 +93,6 @@ int board_mmc_init(bd_t *bis)
 		gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
 	}
 
-	return s5p_mmc_init(0, 4);
+	return sdhci_mmc_init((void *)samsung_get_base_mmc(), 4);
 }
 #endif

index b65bc6e..27cdce4 100644
@@ -23,10 +23,10 @@
  */
 
 #include <common.h>
+#include <sdhci.h>
 #include <asm/io.h>
 #include <asm/arch/adc.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -217,7 +217,7 @@ int board_mmc_init(bd_t *bis)
 	 * mmc0	 : eMMC (8-bit buswidth)
 	 * mmc2	 : SD card (4-bit buswidth)
 	 */
-	err = s5p_mmc_init(0, 8);
+	err = sdhci_mmc_init((void *)samsung_get_base_mmc(), 8);
 
 	/*
 	 * Check the T-flash  detect pin

@@ -241,7 +241,7 @@ int board_mmc_init(bd_t *bis)
 			/* GPK2[0:6] drv 4x */
 			gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
 		}
-		err = s5p_mmc_init(2, 4);
+		err = sdhci_mmc_init((void *)(samsung_get_base_mmc() + 0x20000), 4);
 	}
 
 	return err;

134 lines not on this page · raw message

new file mode 100644
index 0000000..cc29415
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2011 Calxeda, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int sdhci_mmc_init(void *base, int bus_width);
+

index f184821..b116b8c 100644
@@ -204,6 +204,10 @@ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 				writel(mask, &host->reg->norintsts);
 			break;
 		}
+		if (mask & (1 << 15)) {
+			writel(mask, &host->reg->norintsts);
+			return -1;
+		}
 	}
 
 	if (i == retry) {

index a3ca2dc..d431c5a 100644
@@ -468,7 +468,7 @@ static char *ata_id_strcpy(u16 *target, u16 *src, int len)
 {
 	int i;
 	for (i = 0; i < len / 2; i++)
-		target[i] = le16_to_cpu(src[i]);
+		target[i] = swab16(src[i]);
 	return (char *)target;
 }
 

index be4fe74..25a8299 100644
@@ -47,7 +47,8 @@
 #define SCSI_DEV_ID  0x5288
 
 #else
-#error no scsi device defined
+#define SCSI_VEND_ID 0
+#define SCSI_DEV_ID  0
 #endif
 
 

@@ -174,7 +175,7 @@ removable:
 		scsi_curr_dev = -1;
 }
 
-
+#ifdef CONFIG_PCI
 void scsi_init(void)
 {
 	int busdevfunc;

@@ -192,6 +193,7 @@ void scsi_init(void)
 	scsi_low_level_init(busdevfunc);
 	scsi_scan(1);
 }
+#endif
 
 block_dev_desc_t * scsi_get_dev(int dev)
 {

127 lines not on this page · raw message