hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cc2520: fix CC2591 handling 

This patch changes tha way of handling of cc2591-cc2520 combination
by moving amplified variable from platform data to private data.
This will be useful in other sections like tx power support.

Signed-off-by: Varka Bhadram <varkab@cdac.in>
Cc: Brad Campbell <bradjc5@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Varka Bhadram 2015-05-29 10:56:55 +05:30 committed by Marcel Holtmann
parent aad1b0b5d3
commit 1a1bc59c5f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ieee802154/cc2520.c
View File

@ -196,6 +196,7 @@ struct cc2520_private {
u8 *buf; /* SPI TX/Rx data buffer */ u8 *buf; /* SPI TX/Rx data buffer */
struct mutex buffer_mutex; /* SPI buffer mutex */ struct mutex buffer_mutex; /* SPI buffer mutex */
bool is_tx; /* Flag for sync b/w Tx and Rx */ bool is_tx; /* Flag for sync b/w Tx and Rx */
bool amplified; /* Flag for CC2591 */
int fifo_pin; /* FIFO GPIO pin number */ int fifo_pin; /* FIFO GPIO pin number */
struct work_struct fifop_irqwork;/* Workqueue for FIFOP */ struct work_struct fifop_irqwork;/* Workqueue for FIFOP */
spinlock_t lock; /* Lock for is_tx*/ spinlock_t lock; /* Lock for is_tx*/
@ -738,7 +739,9 @@ static int cc2520_get_platform_data(struct spi_device *spi,
pdata->vreg = of_get_named_gpio(np, "vreg-gpio", 0); pdata->vreg = of_get_named_gpio(np, "vreg-gpio", 0);
pdata->reset = of_get_named_gpio(np, "reset-gpio", 0); pdata->reset = of_get_named_gpio(np, "reset-gpio", 0);
pdata->amplified = of_property_read_bool(np, "amplified"); /* CC2591 front end for CC2520 */
if (of_property_read_bool(np, "amplified"))
priv->amplified = true;
return 0; return 0;
} }
@ -781,7 +784,7 @@ static int cc2520_hw_init(struct cc2520_private *priv)
* amplifier. See section 8 page 17 of TI application note AN065. * amplifier. See section 8 page 17 of TI application note AN065.
* http://www.ti.com/lit/an/swra229a/swra229a.pdf * http://www.ti.com/lit/an/swra229a/swra229a.pdf
*/ */
if (pdata.amplified) { if (priv->amplified) {
ret = cc2520_write_register(priv, CC2520_AGCCTRL1, 0x16); ret = cc2520_write_register(priv, CC2520_AGCCTRL1, 0x16);
if (ret) if (ret)
goto err_ret; goto err_ret;
@ -896,6 +899,9 @@ static int cc2520_probe(struct spi_device *spi)
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
init_completion(&priv->tx_complete); init_completion(&priv->tx_complete);
/* Assumption that CC2591 is not connected */
priv->amplified = false;
/* Request all the gpio's */ /* Request all the gpio's */
if (!gpio_is_valid(pdata.fifo)) { if (!gpio_is_valid(pdata.fifo)) {
dev_err(&spi->dev, "fifo gpio is not valid\n"); dev_err(&spi->dev, "fifo gpio is not valid\n");

1
include/linux/spi/cc2520.h
View File

@ -21,7 +21,6 @@ struct cc2520_platform_data {
int sfd; int sfd;
int reset; int reset;
int vreg; int vreg;
bool amplified;
}; };
#endif #endif