On Wed, 23 Apr 2025, a0282524688@xxxxxxxxx wrote:
> From: Ming Yu <tmyu0@xxxxxxxxxxx>
>
> The Nuvoton NCT6694 provides an USB interface to the host to
> access its features.
>
> Sub-devices can use the USB functions nct6694_read_msg() and
> nct6694_write_msg() to issue a command. They can also request
> interrupt that will be called when the USB device receives its
> interrupt pipe.
>
> Signed-off-by: Ming Yu <tmyu0@xxxxxxxxxxx>
> ---
v10 and no change log? Please add a change log.
> MAINTAINERS | 6 +
> drivers/mfd/Kconfig | 15 ++
> drivers/mfd/Makefile | 2 +
> drivers/mfd/nct6694.c | 387 ++++++++++++++++++++++++++++++++++++
> include/linux/mfd/nct6694.h | 101 ++++++++++
> 5 files changed, 511 insertions(+)
> create mode 100644 drivers/mfd/nct6694.c
> create mode 100644 include/linux/mfd/nct6694.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fa1e04e87d1d..b2dfcc063f88 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -17358,6 +17358,12 @@ F: drivers/nubus/
> F: include/linux/nubus.h
> F: include/uapi/linux/nubus.h
>
> +NUVOTON NCT6694 MFD DRIVER
> +M: Ming Yu <tmyu0@xxxxxxxxxxx>
> +S: Supported
> +F: drivers/mfd/nct6694.c
> +F: include/linux/mfd/nct6694.h
> +
> NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
> M: Antonino Daplas <adaplas@xxxxxxxxx>
> L: linux-fbdev@xxxxxxxxxxxxxxx
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 22b936310039..cd4d826a7fcb 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -1058,6 +1058,21 @@ config MFD_MENF21BMC
> This driver can also be built as a module. If so the module
> will be called menf21bmc.
>
> +config MFD_NCT6694
> + tristate "Nuvoton NCT6694 support"
> + select MFD_CORE
> + depends on USB
> + help
> + This enables support for the Nuvoton USB device NCT6694, which shares
> + peripherals.
> + The Nuvoton NCT6694 is a peripheral expander with 16 GPIO chips,
> + 6 I2C controllers, 2 CANfd controllers, 2 Watchdog timers, ADC,
> + PWM, and RTC.
> + This driver provides core APIs to access the NCT6694 hardware
> + monitoring and control features.
> + Additional drivers must be enabled to utilize the specific
> + functionalities of the device.
> +
> config MFD_OCELOT
> tristate "Microsemi Ocelot External Control Support"
> depends on SPI_MASTER
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 948cbdf42a18..471dc1f183b8 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -120,6 +120,8 @@ obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o
> obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o
> obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o
>
> +obj-$(CONFIG_MFD_NCT6694) += nct6694.o
> +
> obj-$(CONFIG_MFD_CORE) += mfd-core.o
>
> ocelot-soc-objs := ocelot-core.o ocelot-spi.o
> diff --git a/drivers/mfd/nct6694.c b/drivers/mfd/nct6694.c
> new file mode 100644
> index 000000000000..2480ca56f350
> --- /dev/null
> +++ b/drivers/mfd/nct6694.c
> @@ -0,0 +1,387 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2024 Nuvoton Technology Corp.
> + *
> + * Nuvoton NCT6694 core driver using USB interface to provide
> + * access to the NCT6694 hardware monitoring and control features.
> + *
> + * The NCT6694 is an integrated controller that provides GPIO, I2C,
> + * CAN, WDT, HWMON and RTC management.
> + *
Superfluous blank line.
> + */
> +
> +#include <linux/bits.h>
> +#include <linux/interrupt.h>
> +#include <linux/irq.h>
> +#include <linux/irqdomain.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/nct6694.h>
> +#include <linux/module.h>
> +#include <linux/slab.h>
> +#include <linux/usb.h>
> +
> +static const struct mfd_cell nct6694_devs[] = {
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 0),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 1),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 2),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 3),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 4),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 5),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 6),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 7),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 8),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 9),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 10),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 11),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 12),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 13),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 14),
> + MFD_CELL_BASIC("nct6694-gpio", NULL, NULL, 0, 15),
These are all identical.
I thought you were going to use PLATFORM_DEVID_AUTO? In fact, you are
already using PLATFORM_DEVID_AUTO since you are calling
mfd_add_hotplug_devices(). So you don't need this IDs.
MFD_CELL_NAME() should do.
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 0),
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 1),
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 2),
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 3),
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 4),
> + MFD_CELL_BASIC("nct6694-i2c", NULL, NULL, 0, 5),
> +
> + MFD_CELL_BASIC("nct6694-canfd", NULL, NULL, 0, 0),
> + MFD_CELL_BASIC("nct6694-canfd", NULL, NULL, 0, 1),
> +
> + MFD_CELL_BASIC("nct6694-wdt", NULL, NULL, 0, 0),
> + MFD_CELL_BASIC("nct6694-wdt", NULL, NULL, 0, 1),
> +
> + MFD_CELL_NAME("nct6694-hwmon"),
> + MFD_CELL_NAME("nct6694-rtc"),
> +};
[...]
> diff --git a/include/linux/mfd/nct6694.h b/include/linux/mfd/nct6694.h
> new file mode 100644
> index 000000000000..7a02e5b14bbb
> --- /dev/null
> +++ b/include/linux/mfd/nct6694.h
> @@ -0,0 +1,101 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2024 Nuvoton Technology Corp.
> + *
> + * Nuvoton NCT6694 USB transaction and data structure.
> + *
Remove this line please.
> + */
> +
> +#ifndef __MFD_NCT6694_H
> +#define __MFD_NCT6694_H
> +
> +#define NCT6694_VENDOR_ID 0x0416
> +#define NCT6694_PRODUCT_ID 0x200B
> +#define NCT6694_INT_IN_EP 0x81
> +#define NCT6694_BULK_IN_EP 0x02
> +#define NCT6694_BULK_OUT_EP 0x03
> +
> +#define NCT6694_HCTRL_SET 0x40
> +#define NCT6694_HCTRL_GET 0x80
> +
> +#define NCT6694_URB_TIMEOUT 1000
> +
> +enum nct6694_irq_id {
> + NCT6694_IRQ_GPIO0 = 0,
> + NCT6694_IRQ_GPIO1,
> + NCT6694_IRQ_GPIO2,
> + NCT6694_IRQ_GPIO3,
> + NCT6694_IRQ_GPIO4,
> + NCT6694_IRQ_GPIO5,
> + NCT6694_IRQ_GPIO6,
> + NCT6694_IRQ_GPIO7,
> + NCT6694_IRQ_GPIO8,
> + NCT6694_IRQ_GPIO9,
> + NCT6694_IRQ_GPIOA,
> + NCT6694_IRQ_GPIOB,
> + NCT6694_IRQ_GPIOC,
> + NCT6694_IRQ_GPIOD,
> + NCT6694_IRQ_GPIOE,
> + NCT6694_IRQ_GPIOF,
> + NCT6694_IRQ_CAN0,
> + NCT6694_IRQ_CAN1,
> + NCT6694_IRQ_RTC,
> + NCT6694_NR_IRQS,
> +};
> +
> +enum nct6694_response_err_status {
> + NCT6694_NO_ERROR = 0,
> + NCT6694_FORMAT_ERROR,
> + NCT6694_RESERVED1,
> + NCT6694_RESERVED2,
> + NCT6694_NOT_SUPPORT_ERROR,
> + NCT6694_NO_RESPONSE_ERROR,
> + NCT6694_TIMEOUT_ERROR,
> + NCT6694_PENDING,
> +};
> +
> +struct __packed nct6694_cmd_header {
> + u8 rsv1;
> + u8 mod;
> + union __packed {
> + __le16 offset;
> + struct __packed {
> + u8 cmd;
> + u8 sel;
> + };
> + };
> + u8 hctrl;
> + u8 rsv2;
> + __le16 len;
> +};
> +
> +struct __packed nct6694_response_header {
> + u8 sequence_id;
> + u8 sts;
> + u8 reserved[4];
> + __le16 len;
> +};
> +
> +union __packed nct6694_usb_msg {
> + struct nct6694_cmd_header cmd_header;
> + struct nct6694_response_header response_header;
> +};
> +
> +struct nct6694 {
> + struct device *dev;
> + struct irq_domain *domain;
> + /* Mutex to protect access to the device */
Place these single line comments on the end of the line you're commenting.
Actually, considering the nomenclature here, they're probably not
required at all.
> + struct mutex access_lock;
> + /* Mutex to protect access to the IRQ */
> + struct mutex irq_lock;
> + struct urb *int_in_urb;
> + struct usb_device *udev;
> + union nct6694_usb_msg *usb_msg;
> + unsigned char *int_buffer;
> + unsigned int irq_enable;
> +};
> +
> +int nct6694_read_msg(struct nct6694 *nct6694, const struct nct6694_cmd_header *cmd_hd, void *buf);
> +int nct6694_write_msg(struct nct6694 *nct6694, const struct nct6694_cmd_header *cmd_hd, void *buf);
> +
> +#endif
> --
> 2.34.1
>
--
Lee Jones [李琼斯]
