4 files changed, 39 insertions, 2 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 0689bf6b0183..b2402eb076c7 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -62,7 +62,7 @@ config HW_RANDOM_AMD
 
 config HW_RANDOM_ATMEL
         tristate "Atmel Random Number Generator support"
-        depends on HW_RANDOM && ARCH_AT91SAM9G45
+        depends on HW_RANDOM && HAVE_CLK
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index ddf86b6500b7..cdf2f5451c76 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1895,6 +1895,13 @@ static int virtcons_restore(struct virtio_device *vdev)
 
                 /* Get port open/close status on the host */
                 send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);
+
+                /*
+                 * If a port was open at the time of suspending, we
+                 * have to let the host know that it's still open.
+                 */
+                if (port->guest_connected)
+                        send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 1);
         }
         return 0;
 }
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 31ba11ca75e1..2c5d15beea35 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -167,6 +167,7 @@ static const struct config_registers v4_config_registers = {
         .BOOTSTS = UNIMPLEMENTED,
         .CTL_1 = UNIMPLEMENTED,
 };
+
 static const struct config_registers v5_config_registers = {
         .CRC = 0,
         .FAR = 1,
@@ -192,6 +193,31 @@ static const struct config_registers v5_config_registers = {
         .CTL_1 = 19,
 };
 
+static const struct config_registers v6_config_registers = {
+        .CRC = 0,
+        .FAR = 1,
+        .FDRI = 2,
+        .FDRO = 3,
+        .CMD = 4,
+        .CTL = 5,
+        .MASK = 6,
+        .STAT = 7,
+        .LOUT = 8,
+        .COR = 9,
+        .MFWR = 10,
+        .FLR = UNIMPLEMENTED,
+        .KEY = UNIMPLEMENTED,
+        .CBC = 11,
+        .IDCODE = 12,
+        .AXSS = 13,
+        .C0R_1 = 14,
+        .CSOB = 15,
+        .WBSTAR = 16,
+        .TIMER = 17,
+        .BOOTSTS = 22,
+        .CTL_1 = 24,
+};
+
 /**
  * hwicap_command_desync - Send a DESYNC command to the ICAP port.
  * @drvdata: a pointer to the drvdata.
@@ -744,6 +770,8 @@ static int __devinit hwicap_of_probe(struct platform_device *op,
                         regs = &v4_config_registers;
                 } else if (!strcmp(family, "virtex5")) {
                         regs = &v5_config_registers;
+                } else if (!strcmp(family, "virtex6")) {
+                        regs = &v6_config_registers;
                 }
         }
         return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
@@ -785,6 +813,8 @@ static int __devinit hwicap_drv_probe(struct platform_device *pdev)
                         regs = &v4_config_registers;
                 } else if (!strcmp(family, "virtex5")) {
                         regs = &v5_config_registers;
+                } else if (!strcmp(family, "virtex6")) {
+                        regs = &v6_config_registers;
                 }
         }
 
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 8cca11981c5f..d31ee23c9f13 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -86,7 +86,7 @@ struct hwicap_driver_config {
 };
 
 /* Number of times to poll the done regsiter */
-#define XHI_MAX_RETRIES     10
+#define XHI_MAX_RETRIES     5000
 
 /************ Constant Definitions *************/