Patched in Tegra support.

2 files changed, 9 insertions, 38 deletions

diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 5224da5202d..e90e1c74fd4 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -89,6 +89,7 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 #ifdef CONFIG_OF
 /* For open firmware. */
@@ -167,7 +168,6 @@ 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,
@@ -193,31 +193,6 @@ 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.
@@ -595,7 +570,7 @@ static const struct file_operations hwicap_fops = {
         .llseek = noop_llseek,
 };
 
-static int hwicap_setup(struct device *dev, int id,
+static int __devinit hwicap_setup(struct device *dev, int id,
                 const struct resource *regs_res,
                 const struct hwicap_driver_config *config,
                 const struct config_registers *config_regs)
@@ -717,7 +692,7 @@ static struct hwicap_driver_config fifo_icap_config = {
         .reset = fifo_icap_reset,
 };
 
-static int hwicap_remove(struct device *dev)
+static int __devexit hwicap_remove(struct device *dev)
 {
         struct hwicap_drvdata *drvdata;
 
@@ -740,7 +715,7 @@ static int hwicap_remove(struct device *dev)
 }
 
 #ifdef CONFIG_OF
-static int hwicap_of_probe(struct platform_device *op,
+static int __devinit hwicap_of_probe(struct platform_device *op,
                                      const struct hwicap_driver_config *config)
 {
         struct resource res;
@@ -770,8 +745,6 @@ static int 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,8 +758,8 @@ static inline int hwicap_of_probe(struct platform_device *op,
 }
 #endif /* CONFIG_OF */
 
-static const struct of_device_id hwicap_of_match[];
-static int hwicap_drv_probe(struct platform_device *pdev)
+static const struct of_device_id __devinitconst hwicap_of_match[];
+static int __devinit hwicap_drv_probe(struct platform_device *pdev)
 {
         const struct of_device_id *match;
         struct resource *res;
@@ -813,8 +786,6 @@ static int 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;
                 }
         }
 
@@ -822,14 +793,14 @@ static int hwicap_drv_probe(struct platform_device *pdev)
                         &buffer_icap_config, regs);
 }
 
-static int hwicap_drv_remove(struct platform_device *pdev)
+static int __devexit hwicap_drv_remove(struct platform_device *pdev)
 {
         return hwicap_remove(&pdev->dev);
 }
 
 #ifdef CONFIG_OF
 /* Match table for device tree binding */
-static const struct of_device_id hwicap_of_match[] = {
+static const struct of_device_id __devinitconst hwicap_of_match[] = {
         { .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config},
         { .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config},
         {},
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index d31ee23c9f1..8cca11981c5 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     5000
+#define XHI_MAX_RETRIES     10
 
 /************ Constant Definitions *************/