summaryrefslogtreecommitdiffstats
path: root/drivers/net/ieee802154/at86rf230.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2023-02-01 21:10:26 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2023-02-01 21:16:44 +0100
commit9f2ad955f98366003e887e32bdd4ea98ef2a04f4 (patch)
treeaba1bd77853dd259bf2764f2aa8e30d29c31a3b6 /drivers/net/ieee802154/at86rf230.c
parentcc2520: move to gpio descriptors (diff)
downloadlinux-9f2ad955f98366003e887e32bdd4ea98ef2a04f4.tar.xz
linux-9f2ad955f98366003e887e32bdd4ea98ef2a04f4.zip
Revert "at86rf230: convert to gpio descriptors"
This reverts commit 622bd6ea90086beb98ac439edd7d57de73d1d6f9. Dmitry Torokhov points out that this conversion leaves an existing board in reset state due to not properly handled polarity. Additionally, the GPIO name inadvertenly changes from "reset-gpio" to "rstn-gpios". Revert to avoid these regressions. Follow up patches for a better conversion are applied as well. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Diffstat (limited to 'drivers/net/ieee802154/at86rf230.c')
-rw-r--r--drivers/net/ieee802154/at86rf230.c82
1 files changed, 57 insertions, 25 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index a4a6b7490fdc..15f283b26721 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -15,12 +15,13 @@
#include <linux/jiffies.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/gpio.h>
#include <linux/delay.h>
-#include <linux/gpio/consumer.h>
#include <linux/spi/spi.h>
-#include <linux/property.h>
+#include <linux/spi/at86rf230.h>
#include <linux/regmap.h>
#include <linux/skbuff.h>
+#include <linux/of_gpio.h>
#include <linux/ieee802154.h>
#include <net/mac802154.h>
@@ -81,7 +82,7 @@ struct at86rf230_local {
struct ieee802154_hw *hw;
struct at86rf2xx_chip_data *data;
struct regmap *regmap;
- struct gpio_desc *slp_tr;
+ int slp_tr;
bool sleep;
struct completion state_complete;
@@ -106,8 +107,8 @@ at86rf230_async_state_change(struct at86rf230_local *lp,
static inline void
at86rf230_sleep(struct at86rf230_local *lp)
{
- if (lp->slp_tr) {
- gpiod_set_value(lp->slp_tr, 1);
+ if (gpio_is_valid(lp->slp_tr)) {
+ gpio_set_value(lp->slp_tr, 1);
usleep_range(lp->data->t_off_to_sleep,
lp->data->t_off_to_sleep + 10);
lp->sleep = true;
@@ -117,8 +118,8 @@ at86rf230_sleep(struct at86rf230_local *lp)
static inline void
at86rf230_awake(struct at86rf230_local *lp)
{
- if (lp->slp_tr) {
- gpiod_set_value(lp->slp_tr, 0);
+ if (gpio_is_valid(lp->slp_tr)) {
+ gpio_set_value(lp->slp_tr, 0);
usleep_range(lp->data->t_sleep_to_off,
lp->data->t_sleep_to_off + 100);
lp->sleep = false;
@@ -203,9 +204,9 @@ at86rf230_write_subreg(struct at86rf230_local *lp,
static inline void
at86rf230_slp_tr_rising_edge(struct at86rf230_local *lp)
{
- gpiod_set_value(lp->slp_tr, 1);
+ gpio_set_value(lp->slp_tr, 1);
udelay(1);
- gpiod_set_value(lp->slp_tr, 0);
+ gpio_set_value(lp->slp_tr, 0);
}
static bool
@@ -818,7 +819,7 @@ at86rf230_write_frame_complete(void *context)
ctx->trx.len = 2;
- if (lp->slp_tr)
+ if (gpio_is_valid(lp->slp_tr))
at86rf230_slp_tr_rising_edge(lp);
else
at86rf230_async_write_reg(lp, RG_TRX_STATE, STATE_BUSY_TX, ctx,
@@ -1415,6 +1416,32 @@ static int at86rf230_hw_init(struct at86rf230_local *lp, u8 xtal_trim)
}
static int
+at86rf230_get_pdata(struct spi_device *spi, int *rstn, int *slp_tr,
+ u8 *xtal_trim)
+{
+ struct at86rf230_platform_data *pdata = spi->dev.platform_data;
+ int ret;
+
+ if (!IS_ENABLED(CONFIG_OF) || !spi->dev.of_node) {
+ if (!pdata)
+ return -ENOENT;
+
+ *rstn = pdata->rstn;
+ *slp_tr = pdata->slp_tr;
+ *xtal_trim = pdata->xtal_trim;
+ return 0;
+ }
+
+ *rstn = of_get_named_gpio(spi->dev.of_node, "reset-gpio", 0);
+ *slp_tr = of_get_named_gpio(spi->dev.of_node, "sleep-gpio", 0);
+ ret = of_property_read_u8(spi->dev.of_node, "xtal-trim", xtal_trim);
+ if (ret < 0 && ret != -EINVAL)
+ return ret;
+
+ return 0;
+}
+
+static int
at86rf230_detect_device(struct at86rf230_local *lp)
{
unsigned int part, version, val;
@@ -1520,8 +1547,7 @@ static int at86rf230_probe(struct spi_device *spi)
struct ieee802154_hw *hw;
struct at86rf230_local *lp;
unsigned int status;
- int rc, irq_type;
- struct gpio_desc *rstn, *slp_tr;
+ int rc, irq_type, rstn, slp_tr;
u8 xtal_trim = 0;
if (!spi->irq) {
@@ -1529,26 +1555,32 @@ static int at86rf230_probe(struct spi_device *spi)
return -EINVAL;
}
- rc = device_property_read_u8(&spi->dev, "xtal-trim", &xtal_trim);
- if (rc < 0 && rc != -EINVAL) {
- dev_err(&spi->dev, "failed to parse xtal-trim: %d\n", rc);
+ rc = at86rf230_get_pdata(spi, &rstn, &slp_tr, &xtal_trim);
+ if (rc < 0) {
+ dev_err(&spi->dev, "failed to parse platform_data: %d\n", rc);
return rc;
}
- rstn = devm_gpiod_get_optional(&spi->dev, "rstn", GPIOD_OUT_HIGH);
- if (IS_ERR(rstn))
- return PTR_ERR(rstn);
+ if (gpio_is_valid(rstn)) {
+ rc = devm_gpio_request_one(&spi->dev, rstn,
+ GPIOF_OUT_INIT_HIGH, "rstn");
+ if (rc)
+ return rc;
+ }
- slp_tr = devm_gpiod_get_optional(&spi->dev, "slp_tr", GPIOD_OUT_LOW);
- if (IS_ERR(slp_tr))
- return PTR_ERR(slp_tr);
+ if (gpio_is_valid(slp_tr)) {
+ rc = devm_gpio_request_one(&spi->dev, slp_tr,
+ GPIOF_OUT_INIT_LOW, "slp_tr");
+ if (rc)
+ return rc;
+ }
/* Reset */
- if (rstn) {
+ if (gpio_is_valid(rstn)) {
udelay(1);
- gpiod_set_value_cansleep(rstn, 0);
+ gpio_set_value_cansleep(rstn, 0);
udelay(1);
- gpiod_set_value_cansleep(rstn, 1);
+ gpio_set_value_cansleep(rstn, 1);
usleep_range(120, 240);
}
@@ -1650,7 +1682,7 @@ MODULE_DEVICE_TABLE(spi, at86rf230_device_id);
static struct spi_driver at86rf230_driver = {
.id_table = at86rf230_device_id,
.driver = {
- .of_match_table = at86rf230_of_match,
+ .of_match_table = of_match_ptr(at86rf230_of_match),
.name = "at86rf230",
},
.probe = at86rf230_probe,