Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xilinx_hwicap: add support for virtex6 FPGAs

This patch adds support for the virtex6 FPGA to the xilinx_hwicap driver.

Tested on a Xilinx ML605 board. The patch is against the latest linus-tree.

Signed-off-by: Ariane Keller <ariane.keller@tik.ee.ethz.ch>
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Daniel Borkmann and committed by
Greg Kroah-Hartman
73eb94a0 b4161f0b

+30
+30
drivers/char/xilinx_hwicap/xilinx_hwicap.c
··· 167 167 .BOOTSTS = UNIMPLEMENTED, 168 168 .CTL_1 = UNIMPLEMENTED, 169 169 }; 170 + 170 171 static const struct config_registers v5_config_registers = { 171 172 .CRC = 0, 172 173 .FAR = 1, ··· 191 190 .TIMER = 17, 192 191 .BOOTSTS = 18, 193 192 .CTL_1 = 19, 193 + }; 194 + 195 + static const struct config_registers v6_config_registers = { 196 + .CRC = 0, 197 + .FAR = 1, 198 + .FDRI = 2, 199 + .FDRO = 3, 200 + .CMD = 4, 201 + .CTL = 5, 202 + .MASK = 6, 203 + .STAT = 7, 204 + .LOUT = 8, 205 + .COR = 9, 206 + .MFWR = 10, 207 + .FLR = UNIMPLEMENTED, 208 + .KEY = UNIMPLEMENTED, 209 + .CBC = 11, 210 + .IDCODE = 12, 211 + .AXSS = 13, 212 + .C0R_1 = 14, 213 + .CSOB = 15, 214 + .WBSTAR = 16, 215 + .TIMER = 17, 216 + .BOOTSTS = 22, 217 + .CTL_1 = 24, 194 218 }; 195 219 196 220 /** ··· 770 744 regs = &v4_config_registers; 771 745 } else if (!strcmp(family, "virtex5")) { 772 746 regs = &v5_config_registers; 747 + } else if (!strcmp(family, "virtex6")) { 748 + regs = &v6_config_registers; 773 749 } 774 750 } 775 751 return hwicap_setup(&op->dev, id ? *id : -1, &res, config, ··· 813 785 regs = &v4_config_registers; 814 786 } else if (!strcmp(family, "virtex5")) { 815 787 regs = &v5_config_registers; 788 + } else if (!strcmp(family, "virtex6")) { 789 + regs = &v6_config_registers; 816 790 } 817 791 } 818 792