* [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC
@ 2014-10-02 9:55 Simon Vincent
2014-10-05 21:33 ` Alan Ott
0 siblings, 1 reply; 4+ messages in thread
From: Simon Vincent @ 2014-10-02 9:55 UTC (permalink / raw)
To: linux-wpan; +Cc: alex.aring, alan, Simon Vincent
The MRF24J40MC module has an external amplifier which should be
enabled. The TX power has to be lowered to meet FCC regs.
Signed-off-by: Simon Vincent <simon.vincent@xsilon.com>
---
v2 -> v3:
* Added extra code comments and removed check of spi return values.
drivers/net/ieee802154/mrf24j40.c | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 07e0b88..ff3ca07 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -43,6 +43,8 @@
#define REG_TXSTBL 0x2E /* TX Stabilization */
#define REG_INTSTAT 0x31 /* Interrupt Status */
#define REG_INTCON 0x32 /* Interrupt Control */
+#define REG_GPIO 0x33 /* GPIO */
+#define REG_TRISGPIO 0x34 /* GPIO direction */
#define REG_RFCTL 0x36 /* RF Control Mode Register */
#define REG_BBREG1 0x39 /* Baseband Registers */
#define REG_BBREG2 0x3A /* */
@@ -63,6 +65,7 @@
#define REG_SLPCON1 0x220
#define REG_WAKETIMEL 0x222 /* Wake-up Time Match Value Low */
#define REG_WAKETIMEH 0x223 /* Wake-up Time Match Value High */
+#define REG_TESTMODE 0x22F /* Test mode */
#define REG_RX_FIFO 0x300 /* Receive FIFO */
/* Device configuration: Only channels 11-26 on page 0 are supported. */
@@ -75,6 +78,8 @@
#define RX_FIFO_SIZE 144 /* From datasheet */
#define SET_CHANNEL_DELAY_US 192 /* From datasheet */
+enum mrf24j40_modules { MRF24J40, MRF24J40MA, MRF24J40MC };
+
/* Device Private Data */
struct mrf24j40 {
struct spi_device *spi;
@@ -691,6 +696,28 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)
if (ret)
goto err_ret;
+ if (spi_get_device_id(devrec->spi)->driver_data == MRF24J40MC) {
+ /* Enable external amplifier.
+ * From MRF24J40MC datasheet section 1.3: Operation.
+ */
+ write_long_reg(devrec, REG_TESTMODE, &val);
+ val |= 0x7; /* Configure GPIO 0-2 to control amplifier */
+ write_long_reg(devrec, REG_TESTMODE, val);
+
+ read_short_reg(devrec, REG_TRISGPIO, &val);
+ val |= 0x8; /* Set GPIO3 as output. */
+ write_short_reg(devrec, REG_TRISGPIO, val);
+
+ read_short_reg(devrec, REG_GPIO, &val);
+ val |= 0x8; /* Set GPIO3 HIGH to enable U5 voltage regulator */
+ write_short_reg(devrec, REG_GPIO, val);
+
+ /* Reduce TX pwr to meet FCC requirements.
+ * From MRF24J40MC datasheet section 3.1.1
+ */
+ write_long_reg(devrec, REG_RFCON3, 0x28);
+ }
+
return 0;
err_ret:
@@ -779,8 +806,9 @@ static int mrf24j40_remove(struct spi_device *spi)
}
static const struct spi_device_id mrf24j40_ids[] = {
- { "mrf24j40", 0 },
- { "mrf24j40ma", 0 },
+ { "mrf24j40", MRF24J40 },
+ { "mrf24j40ma", MRF24J40MA },
+ { "mrf24j40mc", MRF24J40MC },
{ },
};
MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC
2014-10-02 9:55 [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC Simon Vincent
@ 2014-10-05 21:33 ` Alan Ott
2014-10-06 9:41 ` Simon Vincent
0 siblings, 1 reply; 4+ messages in thread
From: Alan Ott @ 2014-10-05 21:33 UTC (permalink / raw)
To: Simon Vincent, linux-wpan; +Cc: alex.aring
On 10/02/2014 05:55 AM, Simon Vincent wrote:
> The MRF24J40MC module has an external amplifier which should be
> enabled. The TX power has to be lowered to meet FCC regs.
>
> Signed-off-by: Simon Vincent <simon.vincent@xsilon.com>
> ---
> v2 -> v3:
> * Added extra code comments and removed check of spi return values.
>
> drivers/net/ieee802154/mrf24j40.c | 32 ++++++++++++++++++++++++++++++--
> 1 file changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
> index 07e0b88..ff3ca07 100644
> --- a/drivers/net/ieee802154/mrf24j40.c
> +++ b/drivers/net/ieee802154/mrf24j40.c
> @@ -43,6 +43,8 @@
> #define REG_TXSTBL 0x2E /* TX Stabilization */
> #define REG_INTSTAT 0x31 /* Interrupt Status */
> #define REG_INTCON 0x32 /* Interrupt Control */
> +#define REG_GPIO 0x33 /* GPIO */
> +#define REG_TRISGPIO 0x34 /* GPIO direction */
> #define REG_RFCTL 0x36 /* RF Control Mode Register */
> #define REG_BBREG1 0x39 /* Baseband Registers */
> #define REG_BBREG2 0x3A /* */
> @@ -63,6 +65,7 @@
> #define REG_SLPCON1 0x220
> #define REG_WAKETIMEL 0x222 /* Wake-up Time Match Value Low */
> #define REG_WAKETIMEH 0x223 /* Wake-up Time Match Value High */
> +#define REG_TESTMODE 0x22F /* Test mode */
> #define REG_RX_FIFO 0x300 /* Receive FIFO */
>
> /* Device configuration: Only channels 11-26 on page 0 are supported. */
> @@ -75,6 +78,8 @@
> #define RX_FIFO_SIZE 144 /* From datasheet */
> #define SET_CHANNEL_DELAY_US 192 /* From datasheet */
>
> +enum mrf24j40_modules { MRF24J40, MRF24J40MA, MRF24J40MC };
> +
> /* Device Private Data */
> struct mrf24j40 {
> struct spi_device *spi;
> @@ -691,6 +696,28 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)
> if (ret)
> goto err_ret;
>
> + if (spi_get_device_id(devrec->spi)->driver_data == MRF24J40MC) {
> + /* Enable external amplifier.
> + * From MRF24J40MC datasheet section 1.3: Operation.
> + */
> + write_long_reg(devrec, REG_TESTMODE, &val);
This compiles? I think you want read_*() here. I'm surprised the
write_*() compiles with a pointer parameter given the kernel's
warning/error settings.
> + val |= 0x7; /* Configure GPIO 0-2 to control amplifier */
> + write_long_reg(devrec, REG_TESTMODE, val);
> +
> + read_short_reg(devrec, REG_TRISGPIO, &val);
> + val |= 0x8; /* Set GPIO3 as output. */
> + write_short_reg(devrec, REG_TRISGPIO, val);
> +
> + read_short_reg(devrec, REG_GPIO, &val);
> + val |= 0x8; /* Set GPIO3 HIGH to enable U5 voltage regulator */
> + write_short_reg(devrec, REG_GPIO, val);
> +
> + /* Reduce TX pwr to meet FCC requirements.
> + * From MRF24J40MC datasheet section 3.1.1
> + */
> + write_long_reg(devrec, REG_RFCON3, 0x28);
> + }
> +
> return 0;
>
> err_ret:
> @@ -779,8 +806,9 @@ static int mrf24j40_remove(struct spi_device *spi)
> }
>
> static const struct spi_device_id mrf24j40_ids[] = {
> - { "mrf24j40", 0 },
> - { "mrf24j40ma", 0 },
> + { "mrf24j40", MRF24J40 },
> + { "mrf24j40ma", MRF24J40MA },
> + { "mrf24j40mc", MRF24J40MC },
> { },
> };
> MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC
@ 2014-10-06 9:37 Simon Vincent
0 siblings, 0 replies; 4+ messages in thread
From: Simon Vincent @ 2014-10-06 9:37 UTC (permalink / raw)
To: linux-wpan; +Cc: alex.aring, alan, Simon Vincent
The MRF24J40MC module has an external amplifier which should be
enabled. The TX power has to be lowered to meet FCC regs.
Signed-off-by: Simon Vincent <simon.vincent@xsilon.com>
---
v2 -> v3:
* Added extra code comments and removed check of spi return values.
drivers/net/ieee802154/mrf24j40.c | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 07e0b88..ff3ca07 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -43,6 +43,8 @@
#define REG_TXSTBL 0x2E /* TX Stabilization */
#define REG_INTSTAT 0x31 /* Interrupt Status */
#define REG_INTCON 0x32 /* Interrupt Control */
+#define REG_GPIO 0x33 /* GPIO */
+#define REG_TRISGPIO 0x34 /* GPIO direction */
#define REG_RFCTL 0x36 /* RF Control Mode Register */
#define REG_BBREG1 0x39 /* Baseband Registers */
#define REG_BBREG2 0x3A /* */
@@ -63,6 +65,7 @@
#define REG_SLPCON1 0x220
#define REG_WAKETIMEL 0x222 /* Wake-up Time Match Value Low */
#define REG_WAKETIMEH 0x223 /* Wake-up Time Match Value High */
+#define REG_TESTMODE 0x22F /* Test mode */
#define REG_RX_FIFO 0x300 /* Receive FIFO */
/* Device configuration: Only channels 11-26 on page 0 are supported. */
@@ -75,6 +78,8 @@
#define RX_FIFO_SIZE 144 /* From datasheet */
#define SET_CHANNEL_DELAY_US 192 /* From datasheet */
+enum mrf24j40_modules { MRF24J40, MRF24J40MA, MRF24J40MC };
+
/* Device Private Data */
struct mrf24j40 {
struct spi_device *spi;
@@ -691,6 +696,28 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)
if (ret)
goto err_ret;
+ if (spi_get_device_id(devrec->spi)->driver_data == MRF24J40MC) {
+ /* Enable external amplifier.
+ * From MRF24J40MC datasheet section 1.3: Operation.
+ */
+ read_long_reg(devrec, REG_TESTMODE, &val);
+ val |= 0x7; /* Configure GPIO 0-2 to control amplifier */
+ write_long_reg(devrec, REG_TESTMODE, val);
+
+ read_short_reg(devrec, REG_TRISGPIO, &val);
+ val |= 0x8; /* Set GPIO3 as output. */
+ write_short_reg(devrec, REG_TRISGPIO, val);
+
+ read_short_reg(devrec, REG_GPIO, &val);
+ val |= 0x8; /* Set GPIO3 HIGH to enable U5 voltage regulator */
+ write_short_reg(devrec, REG_GPIO, val);
+
+ /* Reduce TX pwr to meet FCC requirements.
+ * From MRF24J40MC datasheet section 3.1.1
+ */
+ write_long_reg(devrec, REG_RFCON3, 0x28);
+ }
+
return 0;
err_ret:
@@ -779,8 +806,9 @@ static int mrf24j40_remove(struct spi_device *spi)
}
static const struct spi_device_id mrf24j40_ids[] = {
- { "mrf24j40", 0 },
- { "mrf24j40ma", 0 },
+ { "mrf24j40", MRF24J40 },
+ { "mrf24j40ma", MRF24J40MA },
+ { "mrf24j40mc", MRF24J40MC },
{ },
};
MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC
2014-10-05 21:33 ` Alan Ott
@ 2014-10-06 9:41 ` Simon Vincent
0 siblings, 0 replies; 4+ messages in thread
From: Simon Vincent @ 2014-10-06 9:41 UTC (permalink / raw)
To: Alan Ott, linux-wpan
On 05/10/14 22:33, Alan Ott wrote:
> On 10/02/2014 05:55 AM, Simon Vincent wrote:
>> The MRF24J40MC module has an external amplifier which should be
>> enabled. The TX power has to be lowered to meet FCC regs.
>>
>> Signed-off-by: Simon Vincent <simon.vincent@xsilon.com>
>> ---
>> v2 -> v3:
>> * Added extra code comments and removed check of spi return values.
>>
>> drivers/net/ieee802154/mrf24j40.c | 32
>> ++++++++++++++++++++++++++++++--
>> 1 file changed, 30 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ieee802154/mrf24j40.c
>> b/drivers/net/ieee802154/mrf24j40.c
>> index 07e0b88..ff3ca07 100644
>> --- a/drivers/net/ieee802154/mrf24j40.c
>> +++ b/drivers/net/ieee802154/mrf24j40.c
>> @@ -43,6 +43,8 @@
>> #define REG_TXSTBL 0x2E /* TX Stabilization */
>> #define REG_INTSTAT 0x31 /* Interrupt Status */
>> #define REG_INTCON 0x32 /* Interrupt Control */
>> +#define REG_GPIO 0x33 /* GPIO */
>> +#define REG_TRISGPIO 0x34 /* GPIO direction */
>> #define REG_RFCTL 0x36 /* RF Control Mode Register */
>> #define REG_BBREG1 0x39 /* Baseband Registers */
>> #define REG_BBREG2 0x3A /* */
>> @@ -63,6 +65,7 @@
>> #define REG_SLPCON1 0x220
>> #define REG_WAKETIMEL 0x222 /* Wake-up Time Match Value Low */
>> #define REG_WAKETIMEH 0x223 /* Wake-up Time Match Value High */
>> +#define REG_TESTMODE 0x22F /* Test mode */
>> #define REG_RX_FIFO 0x300 /* Receive FIFO */
>>
>> /* Device configuration: Only channels 11-26 on page 0 are
>> supported. */
>> @@ -75,6 +78,8 @@
>> #define RX_FIFO_SIZE 144 /* From datasheet */
>> #define SET_CHANNEL_DELAY_US 192 /* From datasheet */
>>
>> +enum mrf24j40_modules { MRF24J40, MRF24J40MA, MRF24J40MC };
>> +
>> /* Device Private Data */
>> struct mrf24j40 {
>> struct spi_device *spi;
>> @@ -691,6 +696,28 @@ static int mrf24j40_hw_init(struct mrf24j40
>> *devrec)
>> if (ret)
>> goto err_ret;
>>
>> + if (spi_get_device_id(devrec->spi)->driver_data == MRF24J40MC) {
>> + /* Enable external amplifier.
>> + * From MRF24J40MC datasheet section 1.3: Operation.
>> + */
>> + write_long_reg(devrec, REG_TESTMODE, &val);
>
> This compiles? I think you want read_*() here. I'm surprised the
> write_*() compiles with a pointer parameter given the kernel's
> warning/error settings.
>
Sorry I had picked up on this during testing but I must have sent the
wrong patch. I have sent a v4 patch now with this corrected.
Simon
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-06 9:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-02 9:55 [PATCH linux-wpan v3] ieee802154: mrf24j40: Add support for MRF24J40MC Simon Vincent
2014-10-05 21:33 ` Alan Ott
2014-10-06 9:41 ` Simon Vincent
-- strict thread matches above, loose matches on Subject: below --
2014-10-06 9:37 Simon Vincent
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).