[rt2x00-users] [PATCH 2/3] rt2x00: Correct initial value of US_CYC_CNT register for pcie interface

[Helmut Schaa]

Am Montag, 17. Januar 2011 schrieb Jay_Hung at ralinktech.com:
> From: RA-Jay Hung <jay_hung at ralinktech.com>
> 
> CLOCK CYCLE: Clock cycle count in 1us
> PCI:0x21, PCIE:0x7d, USB:0x1e
> 
> Signed-off-by: RA-Jay Hung <jay_hung at ralinktech.com>

I've never reviewed anything PCIe related but this looks good to me.

Acked-by: Helmut Schaa <helmut.schaa at googlemail.com>

Thanks,
Helmut

> ---
>  drivers/net/wireless/rt2x00/rt2800.h    |    4 ++++
>  drivers/net/wireless/rt2x00/rt2800lib.c |    4 ++++
>  2 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
> index ed7bdd0..094db1a 100644
> --- a/drivers/net/wireless/rt2x00/rt2800.h
> +++ b/drivers/net/wireless/rt2x00/rt2800.h
> @@ -372,8 +372,12 @@
>  
>  /*
>   * US_CYC_CNT
> + * BT_MODE_EN: Bluetooth mode enable
> + * CLOCK CYCLE: Clock cycle count in 1us.
> + * PCI:0x21, PCIE:0x7d, USB:0x1e
>   */
>  #define US_CYC_CNT			0x02a4
> +#define US_CYC_CNT_BT_MODE_EN		FIELD32(0x00000100)
>  #define US_CYC_CNT_CLOCK_CYCLE		FIELD32(0x000000ff)
>  
>  /*
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index d4a4473..c3cac3d 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -2350,6 +2350,10 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
>  		rt2800_register_read(rt2x00dev, US_CYC_CNT, &reg);
>  		rt2x00_set_field32(&reg, US_CYC_CNT_CLOCK_CYCLE, 30);
>  		rt2800_register_write(rt2x00dev, US_CYC_CNT, reg);
> +	} else if (rt2x00_is_pcie(rt2x00dev)) {
> +		rt2800_register_read(rt2x00dev, US_CYC_CNT, &reg);
> +		rt2x00_set_field32(&reg, US_CYC_CNT_CLOCK_CYCLE, 125);
> +		rt2800_register_write(rt2x00dev, US_CYC_CNT, reg);
>  	}
>  
>  	rt2800_register_read(rt2x00dev, HT_FBK_CFG0, &reg);
>