svn commit: r266065 - in stable/10/sys: arm/at91 conf dev/nand

[Ian Lepore]

Author: ian
Date: Wed May 14 18:16:32 2014
New Revision: 266065
URL: http://svnweb.freebsd.org/changeset/base/266065

Log:
  MFC r260092, r260093, r260121, r260180,
  
    Allow AT91_MCI_ALLOW_OVERCLOCK to be an option in kernel config files.
  
    Set the SoC name for the atmelbus name.
  
    Add support for Samsung K9F2G08U0A (256MiB SLC) NAND
  
    Comment updates.

Modified:
  stable/10/sys/arm/at91/at91.c
  stable/10/sys/conf/options.arm
  stable/10/sys/dev/nand/nand_id.c
  stable/10/sys/dev/nand/nandbus.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/at91/at91.c
==============================================================================
--- stable/10/sys/arm/at91/at91.c	Wed May 14 18:15:55 2014	(r266064)
+++ stable/10/sys/arm/at91/at91.c	Wed May 14 18:16:32 2014	(r266065)
@@ -231,7 +231,7 @@ static int
 at91_probe(device_t dev)
 {
 
-	device_set_desc(dev, "AT91 device bus");
+	device_set_desc(dev, soc_info.name);
 	return (BUS_PROBE_NOWILDCARD);
 }
 

Modified: stable/10/sys/conf/options.arm
==============================================================================
--- stable/10/sys/conf/options.arm	Wed May 14 18:15:55 2014	(r266064)
+++ stable/10/sys/conf/options.arm	Wed May 14 18:16:32 2014	(r266065)
@@ -55,6 +55,7 @@ XSACLE_DISABLE_CCNT	opt_timer.h
 VERBOSE_INIT_ARM	opt_global.h
 VM_MAXUSER_ADDRESS	opt_global.h
 AT91_ATE_USE_RMII	opt_at91.h
+AT91_MCI_ALLOW_OVERCLOCK opt_at91.h
 AT91_MCI_HAS_4WIRE	opt_at91.h
 AT91_MCI_SLOT_B		opt_at91.h
 GFB_DEBUG		opt_gfb.h

Modified: stable/10/sys/dev/nand/nand_id.c
==============================================================================
--- stable/10/sys/dev/nand/nand_id.c	Wed May 14 18:15:55 2014	(r266064)
+++ stable/10/sys/dev/nand/nand_id.c	Wed May 14 18:16:32 2014	(r266065)
@@ -39,6 +39,8 @@ struct nand_params nand_ids[] = {
 	    0x400, 0x800, 0x40, 0x40, 0 },
 	{ { NAND_MAN_SAMSUNG, 0xdc }, "Samsung NAND 512MiB 3,3V 8-bit",
 	    0x200, 0x800, 0x40, 0x40, 0 },
+	{ { NAND_MAN_SAMSUNG, 0xda }, "Samsung NAND 256MiB 3,3V 8-bit",
+	    0x100, 0x800, 0x40, 0x40, 0 },
 	{ { NAND_MAN_HYNIX, 0x76 }, "Hynix NAND 64MiB 3,3V 8-bit",
 	    0x40, 0x200, 0x10, 0x20, 0 },
 	{ { NAND_MAN_HYNIX, 0xdc }, "Hynix NAND 512MiB 3,3V 8-bit",

Modified: stable/10/sys/dev/nand/nandbus.c
==============================================================================
--- stable/10/sys/dev/nand/nandbus.c	Wed May 14 18:15:55 2014	(r266064)
+++ stable/10/sys/dev/nand/nandbus.c	Wed May 14 18:16:32 2014	(r266065)
@@ -503,7 +503,7 @@ nandbus_wait_ready(device_t dev, uint8_t
 	struct timeval tv, tv2;
 
 	tv2.tv_sec = 0;
-	tv2.tv_usec = 50 * 5000; /* 10ms */
+	tv2.tv_usec = 50 * 5000; /* 250ms */
 
 	getmicrotime(&tv);
 	timevaladd(&tv, &tv2);