OSDN Git Service

can: tcan4x5x: move regmap code into seperate file
authorMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 15 Dec 2020 23:17:34 +0000 (00:17 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 6 Jan 2021 14:15:37 +0000 (15:15 +0100)
This patch moves the regmap code into a seperate file.

Reviewed-by: Dan Murphy <dmurphy@ti.com>
Tested-by: Sean Nyekjaer <sean@geanix.com>
Link: https://lore.kernel.org/r/20201215231746.1132907-5-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/m_can/Makefile
drivers/net/can/m_can/tcan4x5x-core.c
drivers/net/can/m_can/tcan4x5x-regmap.c [new file with mode: 0644]
drivers/net/can/m_can/tcan4x5x.h [new file with mode: 0644]

index 91f9190..d717bbc 100644 (file)
@@ -10,3 +10,4 @@ obj-$(CONFIG_CAN_M_CAN_TCAN4X5X) += tcan4x5x.o
 
 tcan4x5x-objs :=
 tcan4x5x-objs += tcan4x5x-core.o
+tcan4x5x-objs += tcan4x5x-regmap.o
index 1b47c9d..739b8f8 100644 (file)
@@ -2,13 +2,7 @@
 // SPI to CAN driver for the Texas Instruments TCAN4x5x
 // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
-#include <linux/regmap.h>
-#include <linux/spi/spi.h>
-
-#include <linux/regulator/consumer.h>
-#include <linux/gpio/consumer.h>
-
-#include "m_can.h"
+#include "tcan4x5x.h"
 
 #define TCAN4X5X_EXT_CLK_DEF 40000000
 
 
 #define TCAN4X5X_MRAM_START 0x8000
 #define TCAN4X5X_MCAN_OFFSET 0x1000
-#define TCAN4X5X_MAX_REGISTER 0x8fff
 
 #define TCAN4X5X_CLEAR_ALL_INT 0xffffffff
 #define TCAN4X5X_SET_ALL_INT 0xffffffff
 
-#define TCAN4X5X_WRITE_CMD (0x61 << 24)
-#define TCAN4X5X_READ_CMD (0x41 << 24)
-
 #define TCAN4X5X_MODE_SEL_MASK (BIT(7) | BIT(6))
 #define TCAN4X5X_MODE_SLEEP 0x00
 #define TCAN4X5X_MODE_STANDBY BIT(6)
 #define TCAN4X5X_WD_3_S_TIMER BIT(29)
 #define TCAN4X5X_WD_6_S_TIMER (BIT(28) | BIT(29))
 
-struct tcan4x5x_priv {
-       struct m_can_classdev cdev;
-
-       struct regmap *regmap;
-       struct spi_device *spi;
-
-       struct gpio_desc *reset_gpio;
-       struct gpio_desc *device_wake_gpio;
-       struct gpio_desc *device_state_gpio;
-       struct regulator *power;
-};
-
 static inline struct tcan4x5x_priv *cdev_to_priv(struct m_can_classdev *cdev)
 {
        return container_of(cdev, struct tcan4x5x_priv, cdev);
@@ -190,72 +168,6 @@ static int tcan4x5x_reset(struct tcan4x5x_priv *priv)
        return ret;
 }
 
-static int regmap_spi_gather_write(void *context, const void *reg,
-                                  size_t reg_len, const void *val,
-                                  size_t val_len)
-{
-       struct device *dev = context;
-       struct spi_device *spi = to_spi_device(dev);
-       struct spi_message m;
-       u32 addr;
-       struct spi_transfer t[2] = {
-               { .tx_buf = &addr, .len = reg_len, .cs_change = 0,},
-               { .tx_buf = val, .len = val_len, },
-       };
-
-       addr = TCAN4X5X_WRITE_CMD | (*((u16 *)reg) << 8) | val_len >> 2;
-
-       spi_message_init(&m);
-       spi_message_add_tail(&t[0], &m);
-       spi_message_add_tail(&t[1], &m);
-
-       return spi_sync(spi, &m);
-}
-
-static int tcan4x5x_regmap_write(void *context, const void *data, size_t count)
-{
-       u16 *reg = (u16 *)(data);
-       const u32 *val = data + 4;
-
-       return regmap_spi_gather_write(context, reg, 4, val, count - 4);
-}
-
-static int regmap_spi_async_write(void *context,
-                                 const void *reg, size_t reg_len,
-                                 const void *val, size_t val_len,
-                                 struct regmap_async *a)
-{
-       return -ENOTSUPP;
-}
-
-static struct regmap_async *regmap_spi_async_alloc(void)
-{
-       return NULL;
-}
-
-static int tcan4x5x_regmap_read(void *context,
-                               const void *reg, size_t reg_size,
-                               void *val, size_t val_size)
-{
-       struct device *dev = context;
-       struct spi_device *spi = to_spi_device(dev);
-
-       u32 addr = TCAN4X5X_READ_CMD | (*((u16 *)reg) << 8) | val_size >> 2;
-
-       return spi_write_then_read(spi, &addr, reg_size, (u32 *)val, val_size);
-}
-
-static struct regmap_bus tcan4x5x_bus = {
-       .write = tcan4x5x_regmap_write,
-       .gather_write = regmap_spi_gather_write,
-       .async_write = regmap_spi_async_write,
-       .async_alloc = regmap_spi_async_alloc,
-       .read = tcan4x5x_regmap_read,
-       .read_flag_mask = 0x00,
-       .reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
-       .val_format_endian_default = REGMAP_ENDIAN_NATIVE,
-};
-
 static u32 tcan4x5x_read_reg(struct m_can_classdev *cdev, int reg)
 {
        struct tcan4x5x_priv *priv = cdev_to_priv(cdev);
@@ -410,13 +322,6 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev)
        return 0;
 }
 
-static const struct regmap_config tcan4x5x_regmap = {
-       .reg_bits = 32,
-       .val_bits = 32,
-       .cache_type = REGCACHE_NONE,
-       .max_register = TCAN4X5X_MAX_REGISTER,
-};
-
 static struct m_can_ops tcan4x5x_ops = {
        .init = tcan4x5x_init,
        .read_reg = tcan4x5x_read_reg,
@@ -480,12 +385,9 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
        if (ret)
                goto out_m_can_class_free_dev;
 
-       priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus,
-                                       &spi->dev, &tcan4x5x_regmap);
-       if (IS_ERR(priv->regmap)) {
-               ret = PTR_ERR(priv->regmap);
+       ret = tcan4x5x_regmap_init(priv);
+       if (ret)
                goto out_m_can_class_free_dev;
-       }
 
        ret = tcan4x5x_power_enable(priv->power, 1);
        if (ret)
diff --git a/drivers/net/can/m_can/tcan4x5x-regmap.c b/drivers/net/can/m_can/tcan4x5x-regmap.c
new file mode 100644 (file)
index 0000000..f130c35
--- /dev/null
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// tcan4x5x - Texas Instruments TCAN4x5x Family CAN controller driver
+//
+// Copyright (c) 2020 Pengutronix,
+//                    Marc Kleine-Budde <kernel@pengutronix.de>
+// Copyright (c) 2018-2019 Texas Instruments Incorporated
+//                    http://www.ti.com/
+
+#include "tcan4x5x.h"
+
+#define TCAN4X5X_WRITE_CMD (0x61 << 24)
+#define TCAN4X5X_READ_CMD (0x41 << 24)
+
+#define TCAN4X5X_MAX_REGISTER 0x8fff
+
+static int regmap_spi_gather_write(void *context, const void *reg,
+                                  size_t reg_len, const void *val,
+                                  size_t val_len)
+{
+       struct device *dev = context;
+       struct spi_device *spi = to_spi_device(dev);
+       struct spi_message m;
+       u32 addr;
+       struct spi_transfer t[2] = {
+               { .tx_buf = &addr, .len = reg_len, .cs_change = 0,},
+               { .tx_buf = val, .len = val_len, },
+       };
+
+       addr = TCAN4X5X_WRITE_CMD | (*((u16 *)reg) << 8) | val_len >> 2;
+
+       spi_message_init(&m);
+       spi_message_add_tail(&t[0], &m);
+       spi_message_add_tail(&t[1], &m);
+
+       return spi_sync(spi, &m);
+}
+
+static int tcan4x5x_regmap_write(void *context, const void *data, size_t count)
+{
+       u16 *reg = (u16 *)(data);
+       const u32 *val = data + 4;
+
+       return regmap_spi_gather_write(context, reg, 4, val, count - 4);
+}
+
+static int regmap_spi_async_write(void *context,
+                                 const void *reg, size_t reg_len,
+                                 const void *val, size_t val_len,
+                                 struct regmap_async *a)
+{
+       return -ENOTSUPP;
+}
+
+static struct regmap_async *regmap_spi_async_alloc(void)
+{
+       return NULL;
+}
+
+static int tcan4x5x_regmap_read(void *context,
+                               const void *reg, size_t reg_size,
+                               void *val, size_t val_size)
+{
+       struct device *dev = context;
+       struct spi_device *spi = to_spi_device(dev);
+
+       u32 addr = TCAN4X5X_READ_CMD | (*((u16 *)reg) << 8) | val_size >> 2;
+
+       return spi_write_then_read(spi, &addr, reg_size, (u32 *)val, val_size);
+}
+
+static const struct regmap_config tcan4x5x_regmap = {
+       .reg_bits = 32,
+       .val_bits = 32,
+       .cache_type = REGCACHE_NONE,
+       .max_register = TCAN4X5X_MAX_REGISTER,
+};
+
+static struct regmap_bus tcan4x5x_bus = {
+       .write = tcan4x5x_regmap_write,
+       .gather_write = regmap_spi_gather_write,
+       .async_write = regmap_spi_async_write,
+       .async_alloc = regmap_spi_async_alloc,
+       .read = tcan4x5x_regmap_read,
+       .read_flag_mask = 0x00,
+       .reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
+       .val_format_endian_default = REGMAP_ENDIAN_NATIVE,
+};
+
+int tcan4x5x_regmap_init(struct tcan4x5x_priv *priv)
+{
+       priv->regmap = devm_regmap_init(&priv->spi->dev, &tcan4x5x_bus,
+                                       &priv->spi->dev, &tcan4x5x_regmap);
+       return PTR_ERR_OR_ZERO(priv->regmap);
+}
diff --git a/drivers/net/can/m_can/tcan4x5x.h b/drivers/net/can/m_can/tcan4x5x.h
new file mode 100644 (file)
index 0000000..e5bdd91
--- /dev/null
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * tcan4x5x - Texas Instruments TCAN4x5x Family CAN controller driver
+ *
+ * Copyright (c) 2020 Pengutronix,
+ *                    Marc Kleine-Budde <kernel@pengutronix.de>
+ */
+
+#ifndef _TCAN4X5X_H
+#define _TCAN4X5X_H
+
+#include <linux/gpio/consumer.h>
+#include <linux/regmap.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/spi/spi.h>
+
+#include "m_can.h"
+
+struct tcan4x5x_priv {
+       struct m_can_classdev cdev;
+
+       struct regmap *regmap;
+       struct spi_device *spi;
+
+       struct gpio_desc *reset_gpio;
+       struct gpio_desc *device_wake_gpio;
+       struct gpio_desc *device_state_gpio;
+       struct regulator *power;
+};
+
+int tcan4x5x_regmap_init(struct tcan4x5x_priv *priv);
+
+#endif