Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(max2871): Wait for VAS to finish before turning on RFA

Browse Source
This commit is contained in:
Tobias Schneider
2015-06-09 07:07:53 +02:00
parent 4629a94070
commit 745456dc28
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/common/hackrf_core.h
View File

@ -164,6 +164,7 @@ extern "C"
#define SCU_VCO_SCLK (P2_6) /* GPIO5[6] on P2_6 */ #define SCU_VCO_SCLK (P2_6) /* GPIO5[6] on P2_6 */
#define SCU_VCO_SDATA (P6_4) /* GPIO3[3] on P6_4 */ #define SCU_VCO_SDATA (P6_4) /* GPIO3[3] on P6_4 */
#define SCU_VCO_LE (P5_5) /* GPIO2[14] on P5_5 */ #define SCU_VCO_LE (P5_5) /* GPIO2[14] on P5_5 */
#define SCU_VCO_MUX (PB_5) /* GPIO5[25] on PB_5 */
#define SCU_MIXER_EN (P6_8) /* GPIO5[16] on P6_8 */ #define SCU_MIXER_EN (P6_8) /* GPIO5[16] on P6_8 */
#define SCU_SYNT_RFOUT_EN (P6_9) /* GPIO3[5] on P6_9 */ #define SCU_SYNT_RFOUT_EN (P6_9) /* GPIO3[5] on P6_9 */
#endif #endif
@ -324,6 +325,8 @@ extern "C"
#define PORT_VCO_SDATA (GPIO3) #define PORT_VCO_SDATA (GPIO3)
#define PIN_VCO_LE (BIT14) /* GPIO2[14] on P5_5 */ #define PIN_VCO_LE (BIT14) /* GPIO2[14] on P5_5 */
#define PORT_VCO_LE (GPIO2) #define PORT_VCO_LE (GPIO2)
#define PIN_VCO_MUX (BIT25) /* GPIO5[25] on PB_5 */
#define PORT_VCO_MUX (GPIO5)
#define PIN_MIXER_EN (BIT16) /* GPIO5[16] on P6_8 */ #define PIN_MIXER_EN (BIT16) /* GPIO5[16] on P6_8 */
#define PORT_MIXER_EN (GPIO5) #define PORT_MIXER_EN (GPIO5)
#define PIN_SYNT_RFOUT_EN (BIT5) /* GPIO3[5] on P6_9 */ #define PIN_SYNT_RFOUT_EN (BIT5) /* GPIO3[5] on P6_9 */

43
firmware/common/max2871.c
View File

@ -29,6 +29,7 @@ void mixer_setup(void)
//Only used for the debug pin config: scu_pinmux(SCU_VCO_SCLK, SCU_GPIO_FAST); //Only used for the debug pin config: scu_pinmux(SCU_VCO_SCLK, SCU_GPIO_FAST);
scu_pinmux(SCU_VCO_SDATA, SCU_GPIO_FAST); scu_pinmux(SCU_VCO_SDATA, SCU_GPIO_FAST);
scu_pinmux(SCU_VCO_LE, SCU_GPIO_FAST); scu_pinmux(SCU_VCO_LE, SCU_GPIO_FAST);
scu_pinmux(SCU_VCO_MUX, SCU_GPIO_FAST | SCU_CONF_FUNCTION4);
scu_pinmux(SCU_SYNT_RFOUT_EN, SCU_GPIO_FAST); scu_pinmux(SCU_SYNT_RFOUT_EN, SCU_GPIO_FAST);
/* Set GPIO pins as outputs. */ /* Set GPIO pins as outputs. */
@ -38,6 +39,9 @@ void mixer_setup(void)
GPIO_DIR(PORT_VCO_LE) |= PIN_VCO_LE; GPIO_DIR(PORT_VCO_LE) |= PIN_VCO_LE;
GPIO_DIR(PORT_SYNT_RFOUT_EN) |= PIN_SYNT_RFOUT_EN; GPIO_DIR(PORT_SYNT_RFOUT_EN) |= PIN_SYNT_RFOUT_EN;
/* MUX is an input */
GPIO_DIR(PORT_VCO_MUX) &= ~(PIN_VCO_MUX);
/* set to known state */ /* set to known state */
gpio_set(PORT_VCO_CE, PIN_VCO_CE); /* active high */ gpio_set(PORT_VCO_CE, PIN_VCO_CE); /* active high */
gpio_clear(PORT_VCO_SCLK, PIN_VCO_SCLK); gpio_clear(PORT_VCO_SCLK, PIN_VCO_SCLK);
@ -61,7 +65,7 @@ void mixer_setup(void)
max2871_set_M(0); max2871_set_M(0);
max2871_set_LDS(0); max2871_set_LDS(0);
max2871_set_SDN(0); max2871_set_SDN(0);
max2871_set_MUX(3); max2871_set_MUX(0x0C); // Register 6 readback
max2871_set_DBR(0); max2871_set_DBR(0);
max2871_set_RDIV2(0); max2871_set_RDIV2(0);
max2871_set_R(50); // 1 MHz f_PFD max2871_set_R(50); // 1 MHz f_PFD
@ -91,7 +95,7 @@ void mixer_setup(void)
max2871_set_BDIV(0); max2871_set_BDIV(0);
max2871_set_RFB_EN(0); max2871_set_RFB_EN(0);
max2871_set_BPWR(0); max2871_set_BPWR(0);
max2871_set_RFA_EN(1); max2871_set_RFA_EN(0);
max2871_set_APWR(3); max2871_set_APWR(3);
max2871_set_SDPLL(0); max2871_set_SDPLL(0);
max2871_set_F01(1); max2871_set_F01(1);
@ -164,6 +168,32 @@ static void max2871_spi_write(uint8_t r, uint32_t v) {
#endif #endif
} }
static uint32_t max2871_spi_read(void)
{
uint32_t bits = 32;
uint32_t data = 0;
max2871_spi_write(0x06, 0x0);
serial_delay();
gpio_set(PORT_VCO_SCLK, PIN_VCO_SCLK);
serial_delay();
gpio_clear(PORT_VCO_SCLK, PIN_VCO_SCLK);
serial_delay();
while (bits--) {
gpio_set(PORT_VCO_SCLK, PIN_VCO_SCLK);
serial_delay();
gpio_clear(PORT_VCO_SCLK, PIN_VCO_SCLK);
serial_delay();
data <<= 1;
data |= GPIO_STATE(PORT_VCO_MUX, PIN_VCO_MUX) ? 1 : 0;
}
return data;
}
static void max2871_write_registers(void) static void max2871_write_registers(void)
{ {
int i; int i;
@ -182,9 +212,18 @@ uint64_t mixer_set_frequency(uint16_t mhz)
n *= 2; n *= 2;
diva += 1; diva += 1;
} }
max2871_set_RFA_EN(0);
max2871_write_registers();
max2871_set_N(n); max2871_set_N(n);
max2871_set_DIVA(diva); max2871_set_DIVA(diva);
max2871_write_registers();
while(max2871_spi_read() & MAX2871_VASA);
max2871_set_RFA_EN(1);
max2871_write_registers();
return mhz; return mhz;
} }

2
firmware/common/max2871_regs.h
View File

@ -2,6 +2,8 @@
#define MAX2871_H #define MAX2871_H
#include <stdint.h> #include <stdint.h>
#define MAX2871_VASA (1 << 9)
void max2871_regs_init(void); void max2871_regs_init(void);
uint32_t max2871_get_register(int reg); uint32_t max2871_get_register(int reg);