2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index ea280d437ca1..0d9353756598 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -196,6 +196,7 @@ struct cc2520_private {
         u8 *buf;                        /* SPI TX/Rx data buffer */
         struct mutex buffer_mutex;      /* SPI buffer mutex */
         bool is_tx;                     /* Flag for sync b/w Tx and Rx */
+        bool amplified;                 /* Flag for CC2591 */
         int fifo_pin;                   /* FIFO GPIO pin number */
         struct work_struct fifop_irqwork;/* Workqueue for FIFOP */
         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->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;
 }
@@ -781,7 +784,7 @@ static int cc2520_hw_init(struct cc2520_private *priv)
          * amplifier. See section 8 page 17 of TI application note AN065.
          * http://www.ti.com/lit/an/swra229a/swra229a.pdf
          */
-        if (pdata.amplified) {
+        if (priv->amplified) {
                 ret = cc2520_write_register(priv, CC2520_AGCCTRL1, 0x16);
                 if (ret)
                         goto err_ret;
@@ -896,6 +899,9 @@ static int cc2520_probe(struct spi_device *spi)
         spin_lock_init(&priv->lock);
         init_completion(&priv->tx_complete);
 
+        /* Assumption that CC2591 is not connected */
+        priv->amplified = false;
+
         /* Request all the gpio's */
         if (!gpio_is_valid(pdata.fifo)) {
                 dev_err(&spi->dev, "fifo gpio is not valid\n");
diff --git a/include/linux/spi/cc2520.h b/include/linux/spi/cc2520.h
index e741e8baad92..85b8ee67e937 100644
--- a/include/linux/spi/cc2520.h
+++ b/include/linux/spi/cc2520.h
@@ -21,7 +21,6 @@ struct cc2520_platform_data {
         int sfd;
         int reset;
         int vreg;
-        bool amplified;
 };
 
 #endif