Commit c3cfb90966f88d2f3ba5df9c41f31b8f08e5f3de
2013-12-29T10:40:24
Use an equation instead of a lookup table to set the frequency for 55nm avalon allowing arbitrary values to be used.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/driver-avalon.c b/driver-avalon.c
index 40467ad..3e3a6d7 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -110,57 +110,12 @@ static int avalon_init_task(struct avalon_task *at,
buf[10] = 0x00;
buf[11] = 0x00;
- if (asic == AVALON_A3256) {
- lefreq16 = (uint16_t *)&buf[6];
+ /* With 55nm, this is the real clock in Mhz, 1Mhz means 2Mhs */
+ lefreq16 = (uint16_t *)&buf[6];
+ if (asic == AVALON_A3256)
*lefreq16 = htole16(frequency * 8);
- } else {
- switch (frequency / 2) { /* This is the real clock in Mhz, 1Mhz means 2Mhs */
- case 1000:
- buf[6] = 0xe0;
- buf[7] = 0x84;
- break;
- case 950:
- buf[6] = 0xa0;
- buf[7] = 0x84;
- break;
- case 900:
- buf[6] = 0x60;
- buf[7] = 0x84;
- break;
- case 850:
- buf[6] = 0x20;
- buf[7] = 0x84;
- break;
- case 800:
- buf[6] = 0xe0;
- buf[7] = 0x83;
- break;
- case 750:
- buf[6] = 0xa0;
- buf[7] = 0x83;
- break;
- case 700:
- buf[6] = 0x60;
- buf[7] = 0x83;
- break;
- case 650:
- buf[6] = 0x20;
- buf[7] = 0x83;
- break;
- case 600:
- buf[6] = 0xe0;
- buf[7] = 0x82;
- break;
- case 550:
- buf[6] = 0xa0;
- buf[7] = 0x82;
- break;
- default: /* 500Mhz etc */
- buf[6] = 0xe0;
- buf[7] = 0x94;
- break;
- }
- }
+ else
+ *lefreq16 = htole16(frequency / 50 * 0x20 + 0x7FE0);
return 0;
}