diff mbox series

[4/4] mux: lan966: Add support for flexcom mux controller

Message ID 20220503105528.12824-5-kavyasree.kotagiri@microchip.com (mailing list archive)
State New, archived
Headers show
Series Add support for lan966 flexcom multiplexer | expand

Commit Message

Kavyasree Kotagiri May 3, 2022, 10:55 a.m. UTC 
LAN966 SoC have 5 flexcoms. Each flexcom has 2 chip-selects.
For each chip select of each flexcom there is a configuration
register FLEXCOM_SHARED[0-4]:SS_MASK[0-1]. The width of
configuration register is 21 because there are 21 shared pins
on each of which the chip select can be mapped. Each bit of the
register represents a different FLEXCOM_SHARED pin.

Signed-off-by: Kavyasree Kotagiri <kavyasree.kotagiri@microchip.com>
---
 arch/arm/mach-at91/Kconfig  |   2 +
 drivers/mfd/atmel-flexcom.c |  55 ++++++++++++++++-
 drivers/mux/Kconfig         |  12 ++++
 drivers/mux/Makefile        |   2 +
 drivers/mux/lan966-flx.c    | 116 ++++++++++++++++++++++++++++++++++++
 5 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mux/lan966-flx.c

Comments

Krzysztof Kozlowski May 3, 2022, 12:45 p.m. UTC | #1 
On 03/05/2022 12:55, Kavyasree Kotagiri wrote:
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/property.h>
> +#include <linux/mux/driver.h>
> +#include <linux/io.h>
> +
> +#define FLEX_SHRD_MASK		0x1FFFFF
> +#define LAN966_MAX_CS		21
> +
> +static void __iomem *flx_shared_base;

Why do you have file-scope shared variable? Cannot it be passed via
private data?

> +struct mux_lan966x {
> +	u32 offset;
> +	u32 ss_pin;
> +};
> +
> +static int mux_lan966x_set(struct mux_control *mux, int state)
> +{
> +	struct mux_lan966x *mux_lan966x = mux_chip_priv(mux->chip);
> +	u32 val;
> +
> +	val = ~(1 << mux_lan966x[state].ss_pin) & FLEX_SHRD_MASK;
> +	writel(val, flx_shared_base + mux_lan966x[state].offset);
> +
> +	return 0;
> +}
> +
> +static const struct mux_control_ops mux_lan966x_ops = {
> +	.set = mux_lan966x_set,
> +};
> +
> +static const struct of_device_id mux_lan966x_dt_ids[] = {
> +	{ .compatible = "microchip,lan966-flx-mux", },
> +	{ /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, mux_lan966x_dt_ids);
> +
> +static int mux_lan966x_probe(struct platform_device *pdev)
> +{
> +	struct device_node *np = pdev->dev.of_node;
> +	struct device *dev = &pdev->dev;
> +	struct mux_lan966x *mux_lan966x;
> +	struct mux_chip *mux_chip;
> +	int ret, num_fields, i;
> +
> +	ret = of_property_count_u32_elems(np, "mux-offset-pin");
> +	if (ret == 0 || ret % 2)
> +		ret = -EINVAL;
> +	if (ret < 0)
> +		return dev_err_probe(dev, ret,
> +				     "mux-offset-pin property missing or invalid");
> +	num_fields = ret / 2;
> +
> +	mux_chip = devm_mux_chip_alloc(dev, num_fields, sizeof(*mux_lan966x));
> +	if (IS_ERR(mux_chip))
> +		return dev_err_probe(dev, PTR_ERR(mux_chip),
> +				     "failed to allocate mux_chips\n");
> +
> +	mux_lan966x = mux_chip_priv(mux_chip);
> +
> +	flx_shared_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
> +	if (IS_ERR(flx_shared_base))
> +		return dev_err_probe(dev, PTR_ERR(flx_shared_base),
> +				     "failed to get flexcom shared base address\n");
> +
> +	for (i = 0; i < num_fields; i++) {
> +		struct mux_control *mux = &mux_chip->mux[i];
> +		u32 offset, shared_pin;
> +
> +		ret = of_property_read_u32_index(np, "mux-offset-pin",
> +						 2 * i, &offset);
> +		if (ret == 0)
> +			ret = of_property_read_u32_index(np, "mux-offset-pin",
> +							 2 * i + 1,
> +							 &shared_pin);
> +		if (ret < 0)
> +			return dev_err_probe(dev, ret,
> +					     "failed to read mux-offset-pin property: %d", i);
> +
> +		if (shared_pin >= LAN966_MAX_CS)
> +			return -EINVAL;
> +
> +		mux_lan966x[i].offset = offset;
> +		mux_lan966x[i].ss_pin = shared_pin;
> +
> +		mux->states = LAN966_MAX_CS;
> +	}
> +
> +	mux_chip->ops = &mux_lan966x_ops;
> +
> +	ret = devm_mux_chip_register(dev, mux_chip);
> +	if (ret < 0)
> +		return ret;
> +
> +	return 0;
> +}
> +
> +static struct platform_driver mux_lan966x_driver = {
> +	.driver = {
> +		.name = "lan966-mux",
> +		.of_match_table	= of_match_ptr(mux_lan966x_dt_ids),

of_match_ptr comes with maybe_unused on data structure. Are you sure it
does not have W=1 warnings during compile tests? Just drop the of_match_ptr.

> +	},
> +	.probe = mux_lan966x_probe,
> +};
> +
> +module_platform_driver(mux_lan966x_driver);

Missing MODULE() stuff.


Best regards,
Krzysztof
kernel test robot May 3, 2022, 7:57 p.m. UTC | #2 
Hi Kavyasree,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on lee-mfd/for-mfd-next]
[also build test ERROR on robh/for-next]
[cannot apply to soc/for-next linus/master v5.18-rc5 next-20220503]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Kavyasree-Kotagiri/Add-support-for-lan966-flexcom-multiplexer/20220503-190011
base:   https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next
config: mips-randconfig-r014-20220502 (https://download.01.org/0day-ci/archive/20220504/202205040310.pikNhpUq-lkp@intel.com/config)
compiler: mips64el-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/f8c4bcef1d51c8668507ca53f7cad11e6ace1b2b
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Kavyasree-Kotagiri/Add-support-for-lan966-flexcom-multiplexer/20220503-190011
        git checkout f8c4bcef1d51c8668507ca53f7cad11e6ace1b2b
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=mips SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/mailbox/mailbox-altera.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/hwspinlock/hwspinlock_core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_coredump.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_debugfs.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_sysfs.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_virtio.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_elf_loader.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/remoteproc/remoteproc_cdev.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/bus_type.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/bus.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/master.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/slave.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/mipi_disco.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/stream.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/sysfs_slave.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/sysfs_slave_dpn.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/soundwire/debugfs.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/devfreq/devfreq.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/devfreq/devfreq-event.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/devfreq/governor_simpleondemand.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/devfreq/governor_powersave.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/extcon/extcon.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/extcon/devres.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/extcon/extcon-gpio.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/extcon/extcon-usb-gpio.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/memory/jz4780-nemc.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/vme/vme.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/vme/bridges/vme_ca91cx42.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/vme/boards/vme_vmivme7805.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/ntb/core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/ntb/test/ntb_tool.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/ntb/ntb_transport.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/powercap/powercap_sys.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/powercap/idle_inject.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/ras/ras.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/ras/debugfs.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/hwtracing/intel_th/core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/hwtracing/intel_th/msu.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/hwtracing/intel_th/msu-sink.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/nvmem/core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/interconnect/core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/interconnect/bulk.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/counter/counter-core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/counter/counter-sysfs.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/counter/counter-chrdev.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `drivers/counter/ftm-quaddec.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/sound_core.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/sound.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/init.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/memory.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/control.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/misc.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/device.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/info.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/info_oss.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/isadma.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/sound_oss.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/ctljack.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/jack.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/timer.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/pcm.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/pcm_native.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/pcm_lib.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/pcm_misc.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/pcm_memory.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/memalloc.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq_device.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/rawmidi.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_lock.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_clientmgr.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_memory.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_queue.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_fifo.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_prioq.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_timer.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_system.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_ports.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_info.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_dummy.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_midi.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/core/seq/seq_midi_event.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/drivers/dummy.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/drivers/serial-u16550.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/drivers/mtpav.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_card.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_chmap.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_ctl_msg.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_jack.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_pcm.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_pcm_msg.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/virtio/virtio_pcm_ops.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `sound/last.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `arch/mips/pci/pci.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `arch/mips/pci/pci-legacy.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `arch/mips/pci/fixup-fuloong2e.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `arch/mips/pci/ops-loongson2.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: warning: orphan section `.ctors.65436' from `arch/mips/crypto/poly1305-glue.o' being placed in section `.ctors.65436'
   mips64el-linux-ld: drivers/mfd/atmel-flexcom.o: in function `atmel_flexcom_probe':
>> drivers/mfd/atmel-flexcom.c:97: undefined reference to `devm_mux_control_get'
   mips64el-linux-ld: drivers/mfd/atmel-flexcom.o: in function `mux_control_select':
>> include/linux/mux/consumer.h:34: undefined reference to `mux_control_select_delay'
   mips64el-linux-ld: drivers/mfd/atmel-flexcom.o: in function `atmel_flexcom_probe':
>> drivers/mfd/atmel-flexcom.c:109: undefined reference to `mux_control_deselect'


vim +97 drivers/mfd/atmel-flexcom.c

    41	
    42	static int atmel_flexcom_probe(struct platform_device *pdev)
    43	{
    44		struct device_node *np = pdev->dev.of_node;
    45		const struct atmel_flex_caps *caps;
    46		struct resource *res;
    47		struct atmel_flexcom *ddata;
    48		int err;
    49	
    50		ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
    51		if (!ddata)
    52			return -ENOMEM;
    53	
    54		platform_set_drvdata(pdev, ddata);
    55	
    56		err = of_property_read_u32(np, "atmel,flexcom-mode", &ddata->opmode);
    57		if (err)
    58			return err;
    59	
    60		if (ddata->opmode < ATMEL_FLEXCOM_MODE_USART ||
    61		    ddata->opmode > ATMEL_FLEXCOM_MODE_TWI)
    62			return -EINVAL;
    63	
    64		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    65		ddata->base = devm_ioremap_resource(&pdev->dev, res);
    66		if (IS_ERR(ddata->base))
    67			return PTR_ERR(ddata->base);
    68	
    69		ddata->clk = devm_clk_get(&pdev->dev, NULL);
    70		if (IS_ERR(ddata->clk))
    71			return PTR_ERR(ddata->clk);
    72	
    73		err = clk_prepare_enable(ddata->clk);
    74		if (err)
    75			return err;
    76	
    77		/*
    78		 * Set the Operating Mode in the Mode Register: only the selected device
    79		 * is clocked. Hence, registers of the other serial devices remain
    80		 * inaccessible and are read as zero. Also the external I/O lines of the
    81		 * Flexcom are muxed to reach the selected device.
    82		 */
    83		writel(FLEX_MR_OPMODE(ddata->opmode), ddata->base + FLEX_MR);
    84	
    85		caps = of_device_get_match_data(&pdev->dev);
    86		if (!caps) {
    87			dev_err(&pdev->dev, "Could not retrieve flexcom caps\n");
    88			return -EINVAL;
    89		}
    90	
    91		/* Flexcom Mux */
    92		if (caps->has_flx_mux && of_property_read_bool(np, "mux-controls")) {
    93			struct mux_control *flx_mux;
    94			struct of_phandle_args args;
    95			int i, count;
    96	
  > 97			flx_mux = devm_mux_control_get(&pdev->dev, NULL);
    98			if (IS_ERR(flx_mux))
    99				return PTR_ERR(flx_mux);
   100	
   101			count = of_property_count_strings(np, "mux-control-names");
   102			for (i = 0; i < count; i++) {
   103				err = of_parse_phandle_with_fixed_args(np, "mux-controls", 1, i, &args);
   104				if (err)
   105					break;
   106	
   107				err = mux_control_select(flx_mux, args.args[0]);
   108				if (!err) {
 > 109					mux_control_deselect(flx_mux);
   110				} else {
   111					dev_err(&pdev->dev, "Failed to select FLEXCOM mux\n");
   112					return err;
   113				}
   114			}
   115		}
   116	
   117		clk_disable_unprepare(ddata->clk);
   118	
   119		return devm_of_platform_populate(&pdev->dev);
   120	}
   121
kernel test robot May 5, 2022, 8:26 p.m. UTC | #3 
Hi Kavyasree,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on lee-mfd/for-mfd-next]
[also build test ERROR on robh/for-next]
[cannot apply to soc/for-next linus/master v5.18-rc5 next-20220505]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Kavyasree-Kotagiri/Add-support-for-lan966-flexcom-multiplexer/20220503-190011
base:   https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next
config: i386-randconfig-a002 (https://download.01.org/0day-ci/archive/20220506/202205060409.Vpkpcw6T-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 5e004fb787698440a387750db7f8028e7cb14cfc)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/f8c4bcef1d51c8668507ca53f7cad11e6ace1b2b
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Kavyasree-Kotagiri/Add-support-for-lan966-flexcom-multiplexer/20220503-190011
        git checkout f8c4bcef1d51c8668507ca53f7cad11e6ace1b2b
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> ld.lld: error: undefined symbol: devm_mux_control_get
   >>> referenced by atmel-flexcom.c
   >>> mfd/atmel-flexcom.o:(atmel_flexcom_probe) in archive drivers/built-in.a
--
>> ld.lld: error: undefined symbol: mux_control_select_delay
   >>> referenced by atmel-flexcom.c
   >>> mfd/atmel-flexcom.o:(atmel_flexcom_probe) in archive drivers/built-in.a
--
>> ld.lld: error: undefined symbol: mux_control_deselect
   >>> referenced by atmel-flexcom.c
   >>> mfd/atmel-flexcom.o:(atmel_flexcom_probe) in archive drivers/built-in.a
Kavyasree Kotagiri May 9, 2022, 8:25 a.m. UTC | #4 
> > +#include <linux/err.h>
> > +#include <linux/module.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/property.h>
> > +#include <linux/mux/driver.h>
> > +#include <linux/io.h>
> > +
> > +#define FLEX_SHRD_MASK               0x1FFFFF
> > +#define LAN966_MAX_CS                21
> > +
> > +static void __iomem *flx_shared_base;
> 
> Why do you have file-scope shared variable? Cannot it be passed via
> private data?
> 
I want flx_shared_base to be global variable and use struct mux_lan966x to represent only 
"mux-offset-pin" parameters.

> > +struct mux_lan966x {
> > +     u32 offset;
> > +     u32 ss_pin;
> > +};
> > +
> > +static int mux_lan966x_set(struct mux_control *mux, int state)
> > +{
> > +     struct mux_lan966x *mux_lan966x = mux_chip_priv(mux->chip);
> > +     u32 val;
> > +
> > +     val = ~(1 << mux_lan966x[state].ss_pin) & FLEX_SHRD_MASK;
> > +     writel(val, flx_shared_base + mux_lan966x[state].offset);
> > +
> > +     return 0;
> > +}
> > +
> > +static const struct mux_control_ops mux_lan966x_ops = {
> > +     .set = mux_lan966x_set,
> > +};
> > +
> > +static const struct of_device_id mux_lan966x_dt_ids[] = {
> > +     { .compatible = "microchip,lan966-flx-mux", },
> > +     { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, mux_lan966x_dt_ids);
> > +
> > +static int mux_lan966x_probe(struct platform_device *pdev)
> > +{
> > +     struct device_node *np = pdev->dev.of_node;
> > +     struct device *dev = &pdev->dev;
> > +     struct mux_lan966x *mux_lan966x;
> > +     struct mux_chip *mux_chip;
> > +     int ret, num_fields, i;
> > +
> > +     ret = of_property_count_u32_elems(np, "mux-offset-pin");
> > +     if (ret == 0 || ret % 2)
> > +             ret = -EINVAL;
> > +     if (ret < 0)
> > +             return dev_err_probe(dev, ret,
> > +                                  "mux-offset-pin property missing or invalid");
> > +     num_fields = ret / 2;
> > +
> > +     mux_chip = devm_mux_chip_alloc(dev, num_fields,
> sizeof(*mux_lan966x));
> > +     if (IS_ERR(mux_chip))
> > +             return dev_err_probe(dev, PTR_ERR(mux_chip),
> > +                                  "failed to allocate mux_chips\n");
> > +
> > +     mux_lan966x = mux_chip_priv(mux_chip);
> > +
> > +     flx_shared_base = devm_platform_get_and_ioremap_resource(pdev,
> 0, NULL);
> > +     if (IS_ERR(flx_shared_base))
> > +             return dev_err_probe(dev, PTR_ERR(flx_shared_base),
> > +                                  "failed to get flexcom shared base address\n");
> > +
> > +     for (i = 0; i < num_fields; i++) {
> > +             struct mux_control *mux = &mux_chip->mux[i];
> > +             u32 offset, shared_pin;
> > +
> > +             ret = of_property_read_u32_index(np, "mux-offset-pin",
> > +                                              2 * i, &offset);
> > +             if (ret == 0)
> > +                     ret = of_property_read_u32_index(np, "mux-offset-pin",
> > +                                                      2 * i + 1,
> > +                                                      &shared_pin);
> > +             if (ret < 0)
> > +                     return dev_err_probe(dev, ret,
> > +                                          "failed to read mux-offset-pin property: %d", i);
> > +
> > +             if (shared_pin >= LAN966_MAX_CS)
> > +                     return -EINVAL;
> > +
> > +             mux_lan966x[i].offset = offset;
> > +             mux_lan966x[i].ss_pin = shared_pin;
> > +
> > +             mux->states = LAN966_MAX_CS;
> > +     }
> > +
> > +     mux_chip->ops = &mux_lan966x_ops;
> > +
> > +     ret = devm_mux_chip_register(dev, mux_chip);
> > +     if (ret < 0)
> > +             return ret;
> > +
> > +     return 0;
> > +}
> > +
> > +static struct platform_driver mux_lan966x_driver = {
> > +     .driver = {
> > +             .name = "lan966-mux",
> > +             .of_match_table = of_match_ptr(mux_lan966x_dt_ids),
> 
> of_match_ptr comes with maybe_unused on data structure. Are you sure it
> does not have W=1 warnings during compile tests? Just drop the
> of_match_ptr.
> 
No,  I haven't noticed any warning. Other mux drivers also follow the same.

> > +     },
> > +     .probe = mux_lan966x_probe,
> > +};
> > +
> > +module_platform_driver(mux_lan966x_driver);
> 
> Missing MODULE() stuff.
Ok. I will add it in next version of patch series.

> 
> 
> Best regards,
> Krzysztof
diff mbox series

Patch

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 279810381256..26fb0f4e1b79 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -74,6 +74,8 @@  config SOC_LAN966
 	select DW_APB_TIMER_OF
 	select ARM_GIC
 	select MEMORY
+	select MULTIPLEXER
+	select MUX_LAN966
 	help
 	  This enables support for ARMv7 based Microchip LAN966 SoC family.
 
diff --git a/drivers/mfd/atmel-flexcom.c b/drivers/mfd/atmel-flexcom.c
index 33caa4fba6af..cf3dac383f30 100644
--- a/drivers/mfd/atmel-flexcom.c
+++ b/drivers/mfd/atmel-flexcom.c
@@ -17,6 +17,7 @@ 
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <dt-bindings/mfd/atmel-flexcom.h>
+#include <linux/mux/consumer.h>
 
 /* I/O register offsets */
 #define FLEX_MR		0x0	/* Mode Register */
@@ -28,6 +29,10 @@ 
 #define FLEX_MR_OPMODE(opmode)	(((opmode) << FLEX_MR_OPMODE_OFFSET) &	\
 				 FLEX_MR_OPMODE_MASK)
 
+struct atmel_flex_caps {
+	bool has_flx_mux;
+};
+
 struct atmel_flexcom {
 	void __iomem *base;
 	u32 opmode;
@@ -37,6 +42,7 @@  struct atmel_flexcom {
 static int atmel_flexcom_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
+	const struct atmel_flex_caps *caps;
 	struct resource *res;
 	struct atmel_flexcom *ddata;
 	int err;
@@ -76,13 +82,60 @@  static int atmel_flexcom_probe(struct platform_device *pdev)
 	 */
 	writel(FLEX_MR_OPMODE(ddata->opmode), ddata->base + FLEX_MR);
 
+	caps = of_device_get_match_data(&pdev->dev);
+	if (!caps) {
+		dev_err(&pdev->dev, "Could not retrieve flexcom caps\n");
+		return -EINVAL;
+	}
+
+	/* Flexcom Mux */
+	if (caps->has_flx_mux && of_property_read_bool(np, "mux-controls")) {
+		struct mux_control *flx_mux;
+		struct of_phandle_args args;
+		int i, count;
+
+		flx_mux = devm_mux_control_get(&pdev->dev, NULL);
+		if (IS_ERR(flx_mux))
+			return PTR_ERR(flx_mux);
+
+		count = of_property_count_strings(np, "mux-control-names");
+		for (i = 0; i < count; i++) {
+			err = of_parse_phandle_with_fixed_args(np, "mux-controls", 1, i, &args);
+			if (err)
+				break;
+
+			err = mux_control_select(flx_mux, args.args[0]);
+			if (!err) {
+				mux_control_deselect(flx_mux);
+			} else {
+				dev_err(&pdev->dev, "Failed to select FLEXCOM mux\n");
+				return err;
+			}
+		}
+	}
+
 	clk_disable_unprepare(ddata->clk);
 
 	return devm_of_platform_populate(&pdev->dev);
 }
 
+static const struct atmel_flex_caps atmel_flexcom_caps = {};
+
+static const struct atmel_flex_caps lan966x_flexcom_caps = {
+	.has_flx_mux = true,
+};
+
 static const struct of_device_id atmel_flexcom_of_match[] = {
-	{ .compatible = "atmel,sama5d2-flexcom" },
+	{
+		.compatible = "atmel,sama5d2-flexcom",
+		.data = &atmel_flexcom_caps,
+	},
+
+	{
+		.compatible = "microchip,lan966-flexcom",
+		.data = &lan966x_flexcom_caps,
+	},
+
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match);
diff --git a/drivers/mux/Kconfig b/drivers/mux/Kconfig
index e5c571fd232c..ea09f474bc2f 100644
--- a/drivers/mux/Kconfig
+++ b/drivers/mux/Kconfig
@@ -45,6 +45,18 @@  config MUX_GPIO
 	  To compile the driver as a module, choose M here: the module will
 	  be called mux-gpio.
 
+config MUX_LAN966
+	tristate "LAN966 Flexcom multiplexer"
+	depends on OF || COMPILE_TEST
+	help
+	Lan966 Flexcom Multiplexer controller.
+
+	The driver supports mapping 2 chip-selects of each of the lan966
+	flexcoms to 21 flexcom shared pins.
+
+	To compile the driver as a module, choose M here: the module will
+	be called mux-lan966.
+
 config MUX_MMIO
 	tristate "MMIO/Regmap register bitfield-controlled Multiplexer"
 	depends on OF || COMPILE_TEST
diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile
index 6e9fa47daf56..53a9840d96fa 100644
--- a/drivers/mux/Makefile
+++ b/drivers/mux/Makefile
@@ -7,10 +7,12 @@  mux-core-objs			:= core.o
 mux-adg792a-objs		:= adg792a.o
 mux-adgs1408-objs		:= adgs1408.o
 mux-gpio-objs			:= gpio.o
+mux-lan966-objs			:= lan966-flx.o
 mux-mmio-objs			:= mmio.o
 
 obj-$(CONFIG_MULTIPLEXER)	+= mux-core.o
 obj-$(CONFIG_MUX_ADG792A)	+= mux-adg792a.o
 obj-$(CONFIG_MUX_ADGS1408)	+= mux-adgs1408.o
 obj-$(CONFIG_MUX_GPIO)		+= mux-gpio.o
+obj-$(CONFIG_MUX_LAN966)	+= mux-lan966.o
 obj-$(CONFIG_MUX_MMIO)		+= mux-mmio.o
diff --git a/drivers/mux/lan966-flx.c b/drivers/mux/lan966-flx.c
new file mode 100644
index 000000000000..5d078a159fcd
--- /dev/null
+++ b/drivers/mux/lan966-flx.c
@@ -0,0 +1,116 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * LAN966 Flexcom MUX driver
+ *
+ * Copyright (c) Microchip Inc.
+ *
+ * Author: Kavyasree Kotagiri <kavyasree.kotagiri@microchip.com>
+ */
+
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/mux/driver.h>
+#include <linux/io.h>
+
+#define FLEX_SHRD_MASK		0x1FFFFF
+#define LAN966_MAX_CS		21
+
+static void __iomem *flx_shared_base;
+struct mux_lan966x {
+	u32 offset;
+	u32 ss_pin;
+};
+
+static int mux_lan966x_set(struct mux_control *mux, int state)
+{
+	struct mux_lan966x *mux_lan966x = mux_chip_priv(mux->chip);
+	u32 val;
+
+	val = ~(1 << mux_lan966x[state].ss_pin) & FLEX_SHRD_MASK;
+	writel(val, flx_shared_base + mux_lan966x[state].offset);
+
+	return 0;
+}
+
+static const struct mux_control_ops mux_lan966x_ops = {
+	.set = mux_lan966x_set,
+};
+
+static const struct of_device_id mux_lan966x_dt_ids[] = {
+	{ .compatible = "microchip,lan966-flx-mux", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mux_lan966x_dt_ids);
+
+static int mux_lan966x_probe(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct device *dev = &pdev->dev;
+	struct mux_lan966x *mux_lan966x;
+	struct mux_chip *mux_chip;
+	int ret, num_fields, i;
+
+	ret = of_property_count_u32_elems(np, "mux-offset-pin");
+	if (ret == 0 || ret % 2)
+		ret = -EINVAL;
+	if (ret < 0)
+		return dev_err_probe(dev, ret,
+				     "mux-offset-pin property missing or invalid");
+	num_fields = ret / 2;
+
+	mux_chip = devm_mux_chip_alloc(dev, num_fields, sizeof(*mux_lan966x));
+	if (IS_ERR(mux_chip))
+		return dev_err_probe(dev, PTR_ERR(mux_chip),
+				     "failed to allocate mux_chips\n");
+
+	mux_lan966x = mux_chip_priv(mux_chip);
+
+	flx_shared_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+	if (IS_ERR(flx_shared_base))
+		return dev_err_probe(dev, PTR_ERR(flx_shared_base),
+				     "failed to get flexcom shared base address\n");
+
+	for (i = 0; i < num_fields; i++) {
+		struct mux_control *mux = &mux_chip->mux[i];
+		u32 offset, shared_pin;
+
+		ret = of_property_read_u32_index(np, "mux-offset-pin",
+						 2 * i, &offset);
+		if (ret == 0)
+			ret = of_property_read_u32_index(np, "mux-offset-pin",
+							 2 * i + 1,
+							 &shared_pin);
+		if (ret < 0)
+			return dev_err_probe(dev, ret,
+					     "failed to read mux-offset-pin property: %d", i);
+
+		if (shared_pin >= LAN966_MAX_CS)
+			return -EINVAL;
+
+		mux_lan966x[i].offset = offset;
+		mux_lan966x[i].ss_pin = shared_pin;
+
+		mux->states = LAN966_MAX_CS;
+	}
+
+	mux_chip->ops = &mux_lan966x_ops;
+
+	ret = devm_mux_chip_register(dev, mux_chip);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static struct platform_driver mux_lan966x_driver = {
+	.driver = {
+		.name = "lan966-mux",
+		.of_match_table	= of_match_ptr(mux_lan966x_dt_ids),
+	},
+	.probe = mux_lan966x_probe,
+};
+
+module_platform_driver(mux_lan966x_driver);