Merge tag 'platform-drivers-x86-serial-multi-instantiate-1' into review-hans
This branch contains 5.17-rc1 + the SPI tree's spi-acpi-helpers tag + the other patches from the "[PATCH v6 0/9] Support Spi in i2c-multi-instantiate driver" series.
This commit is contained in:
Hans de Goede
@@ -990,16 +990,16 @@ config TOPSTAR_LAPTOP
|
||||
|
||||
If you have a Topstar laptop, say Y or M here.
|
||||
|
||||
config I2C_MULTI_INSTANTIATE
|
||||
tristate "I2C multi instantiate pseudo device driver"
|
||||
depends on I2C && ACPI
|
||||
config SERIAL_MULTI_INSTANTIATE
|
||||
tristate "Serial bus multi instantiate pseudo device driver"
|
||||
depends on I2C && SPI && ACPI
|
||||
help
|
||||
Some ACPI-based systems list multiple i2c-devices in a single ACPI
|
||||
firmware-node. This driver will instantiate separate i2c-clients
|
||||
Some ACPI-based systems list multiple devices in a single ACPI
|
||||
firmware-node. This driver will instantiate separate clients
|
||||
for each device in the firmware-node.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called i2c-multi-instantiate.
|
||||
will be called serial-multi-instantiate.
|
||||
|
||||
config MLX_PLATFORM
|
||||
tristate "Mellanox Technologies platform support"
|
||||
|
||||
@@ -110,7 +110,7 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o
|
||||
|
||||
# Platform drivers
|
||||
obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o
|
||||
obj-$(CONFIG_I2C_MULTI_INSTANTIATE) += i2c-multi-instantiate.o
|
||||
obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE) += serial-multi-instantiate.o
|
||||
obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
||||
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
|
||||
|
||||
@@ -1,174 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/*
|
||||
* I2C multi-instantiate driver, pseudo driver to instantiate multiple
|
||||
* i2c-clients from a single fwnode.
|
||||
*
|
||||
* Copyright 2018 Hans de Goede <hdegoede@redhat.com>
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/bits.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define IRQ_RESOURCE_TYPE GENMASK(1, 0)
|
||||
#define IRQ_RESOURCE_NONE 0
|
||||
#define IRQ_RESOURCE_GPIO 1
|
||||
#define IRQ_RESOURCE_APIC 2
|
||||
|
||||
struct i2c_inst_data {
|
||||
const char *type;
|
||||
unsigned int flags;
|
||||
int irq_idx;
|
||||
};
|
||||
|
||||
struct i2c_multi_inst_data {
|
||||
int num_clients;
|
||||
struct i2c_client *clients[];
|
||||
};
|
||||
|
||||
static int i2c_multi_inst_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct i2c_multi_inst_data *multi;
|
||||
const struct i2c_inst_data *inst_data;
|
||||
struct i2c_board_info board_info = {};
|
||||
struct device *dev = &pdev->dev;
|
||||
struct acpi_device *adev;
|
||||
char name[32];
|
||||
int i, ret;
|
||||
|
||||
inst_data = device_get_match_data(dev);
|
||||
if (!inst_data) {
|
||||
dev_err(dev, "Error ACPI match data is missing\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
adev = ACPI_COMPANION(dev);
|
||||
|
||||
/* Count number of clients to instantiate */
|
||||
ret = i2c_acpi_client_count(adev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
multi = devm_kmalloc(dev, struct_size(multi, clients, ret), GFP_KERNEL);
|
||||
if (!multi)
|
||||
return -ENOMEM;
|
||||
|
||||
multi->num_clients = ret;
|
||||
|
||||
for (i = 0; i < multi->num_clients && inst_data[i].type; i++) {
|
||||
memset(&board_info, 0, sizeof(board_info));
|
||||
strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE);
|
||||
snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev),
|
||||
inst_data[i].type, i);
|
||||
board_info.dev_name = name;
|
||||
switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) {
|
||||
case IRQ_RESOURCE_GPIO:
|
||||
ret = acpi_dev_gpio_irq_get(adev, inst_data[i].irq_idx);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Error requesting irq at index %d: %d\n",
|
||||
inst_data[i].irq_idx, ret);
|
||||
goto error;
|
||||
}
|
||||
board_info.irq = ret;
|
||||
break;
|
||||
case IRQ_RESOURCE_APIC:
|
||||
ret = platform_get_irq(pdev, inst_data[i].irq_idx);
|
||||
if (ret < 0) {
|
||||
dev_dbg(dev, "Error requesting irq at index %d: %d\n",
|
||||
inst_data[i].irq_idx, ret);
|
||||
goto error;
|
||||
}
|
||||
board_info.irq = ret;
|
||||
break;
|
||||
default:
|
||||
board_info.irq = 0;
|
||||
break;
|
||||
}
|
||||
multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info);
|
||||
if (IS_ERR(multi->clients[i])) {
|
||||
ret = dev_err_probe(dev, PTR_ERR(multi->clients[i]),
|
||||
"Error creating i2c-client, idx %d\n", i);
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
if (i < multi->num_clients) {
|
||||
dev_err(dev, "Error finding driver, idx %d\n", i);
|
||||
ret = -ENODEV;
|
||||
goto error;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, multi);
|
||||
return 0;
|
||||
|
||||
error:
|
||||
while (--i >= 0)
|
||||
i2c_unregister_device(multi->clients[i]);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int i2c_multi_inst_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct i2c_multi_inst_data *multi = platform_get_drvdata(pdev);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < multi->num_clients; i++)
|
||||
i2c_unregister_device(multi->clients[i]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_inst_data bsg1160_data[] = {
|
||||
{ "bmc150_accel", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "bmc150_magn" },
|
||||
{ "bmg160" },
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct i2c_inst_data bsg2150_data[] = {
|
||||
{ "bmc150_accel", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "bmc150_magn" },
|
||||
/* The resources describe a 3th client, but it is not really there. */
|
||||
{ "bsg2150_dummy_dev" },
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct i2c_inst_data int3515_data[] = {
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 0 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 1 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 2 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 3 },
|
||||
{}
|
||||
};
|
||||
|
||||
/*
|
||||
* Note new device-ids must also be added to i2c_multi_instantiate_ids in
|
||||
* drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
|
||||
*/
|
||||
static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = {
|
||||
{ "BSG1160", (unsigned long)bsg1160_data },
|
||||
{ "BSG2150", (unsigned long)bsg2150_data },
|
||||
{ "INT3515", (unsigned long)int3515_data },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids);
|
||||
|
||||
static struct platform_driver i2c_multi_inst_driver = {
|
||||
.driver = {
|
||||
.name = "I2C multi instantiate pseudo device driver",
|
||||
.acpi_match_table = i2c_multi_inst_acpi_ids,
|
||||
},
|
||||
.probe = i2c_multi_inst_probe,
|
||||
.remove = i2c_multi_inst_remove,
|
||||
};
|
||||
module_platform_driver(i2c_multi_inst_driver);
|
||||
|
||||
MODULE_DESCRIPTION("I2C multi instantiate pseudo device driver");
|
||||
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
348
drivers/platform/x86/serial-multi-instantiate.c
Normal file
348
drivers/platform/x86/serial-multi-instantiate.c
Normal file
@@ -0,0 +1,348 @@
|
||||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/*
|
||||
* Serial multi-instantiate driver, pseudo driver to instantiate multiple
|
||||
* client devices from a single fwnode.
|
||||
*
|
||||
* Copyright 2018 Hans de Goede <hdegoede@redhat.com>
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/bits.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define IRQ_RESOURCE_TYPE GENMASK(1, 0)
|
||||
#define IRQ_RESOURCE_NONE 0
|
||||
#define IRQ_RESOURCE_GPIO 1
|
||||
#define IRQ_RESOURCE_APIC 2
|
||||
|
||||
enum smi_bus_type {
|
||||
SMI_I2C,
|
||||
SMI_SPI,
|
||||
SMI_AUTO_DETECT,
|
||||
};
|
||||
|
||||
struct smi_instance {
|
||||
const char *type;
|
||||
unsigned int flags;
|
||||
int irq_idx;
|
||||
};
|
||||
|
||||
struct smi_node {
|
||||
enum smi_bus_type bus_type;
|
||||
struct smi_instance instances[];
|
||||
};
|
||||
|
||||
struct smi {
|
||||
int i2c_num;
|
||||
int spi_num;
|
||||
struct i2c_client **i2c_devs;
|
||||
struct spi_device **spi_devs;
|
||||
};
|
||||
|
||||
static int smi_get_irq(struct platform_device *pdev, struct acpi_device *adev,
|
||||
const struct smi_instance *inst)
|
||||
{
|
||||
int ret;
|
||||
|
||||
switch (inst->flags & IRQ_RESOURCE_TYPE) {
|
||||
case IRQ_RESOURCE_GPIO:
|
||||
ret = acpi_dev_gpio_irq_get(adev, inst->irq_idx);
|
||||
break;
|
||||
case IRQ_RESOURCE_APIC:
|
||||
ret = platform_get_irq(pdev, inst->irq_idx);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ret < 0)
|
||||
dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d: %d\n",
|
||||
inst->irq_idx, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void smi_devs_unregister(struct smi *smi)
|
||||
{
|
||||
while (smi->i2c_num > 0)
|
||||
i2c_unregister_device(smi->i2c_devs[--smi->i2c_num]);
|
||||
|
||||
while (smi->spi_num > 0)
|
||||
spi_unregister_device(smi->spi_devs[--smi->spi_num]);
|
||||
}
|
||||
|
||||
/**
|
||||
* smi_spi_probe - Instantiate multiple SPI devices from inst array
|
||||
* @pdev: Platform device
|
||||
* @adev: ACPI device
|
||||
* @smi: Internal struct for Serial multi instantiate driver
|
||||
* @inst_array: Array of instances to probe
|
||||
*
|
||||
* Returns the number of SPI devices instantiate, Zero if none is found or a negative error code.
|
||||
*/
|
||||
static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi,
|
||||
const struct smi_instance *inst_array)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct spi_controller *ctlr;
|
||||
struct spi_device *spi_dev;
|
||||
char name[50];
|
||||
int i, ret, count;
|
||||
|
||||
ret = acpi_spi_count_resources(adev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else if (!ret)
|
||||
return -ENODEV;
|
||||
|
||||
count = ret;
|
||||
|
||||
smi->spi_devs = devm_kcalloc(dev, count, sizeof(*smi->spi_devs), GFP_KERNEL);
|
||||
if (!smi->spi_devs)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < count && inst_array[i].type; i++) {
|
||||
|
||||
spi_dev = acpi_spi_device_alloc(NULL, adev, i);
|
||||
if (IS_ERR(spi_dev)) {
|
||||
ret = PTR_ERR(spi_dev);
|
||||
dev_err_probe(dev, ret, "failed to allocate SPI device %s from ACPI: %d\n",
|
||||
dev_name(&adev->dev), ret);
|
||||
goto error;
|
||||
}
|
||||
|
||||
ctlr = spi_dev->controller;
|
||||
|
||||
strscpy(spi_dev->modalias, inst_array[i].type, sizeof(spi_dev->modalias));
|
||||
|
||||
ret = smi_get_irq(pdev, adev, &inst_array[i]);
|
||||
if (ret < 0) {
|
||||
spi_dev_put(spi_dev);
|
||||
goto error;
|
||||
}
|
||||
spi_dev->irq = ret;
|
||||
|
||||
snprintf(name, sizeof(name), "%s-%s-%s.%d", dev_name(&ctlr->dev), dev_name(dev),
|
||||
inst_array[i].type, i);
|
||||
spi_dev->dev.init_name = name;
|
||||
|
||||
ret = spi_add_device(spi_dev);
|
||||
if (ret) {
|
||||
dev_err_probe(&ctlr->dev, ret,
|
||||
"failed to add SPI device %s from ACPI: %d\n",
|
||||
dev_name(&adev->dev), ret);
|
||||
spi_dev_put(spi_dev);
|
||||
goto error;
|
||||
}
|
||||
|
||||
dev_dbg(dev, "SPI device %s using chip select %u", name, spi_dev->chip_select);
|
||||
|
||||
smi->spi_devs[i] = spi_dev;
|
||||
smi->spi_num++;
|
||||
}
|
||||
|
||||
if (smi->spi_num < count) {
|
||||
dev_dbg(dev, "Error finding driver, idx %d\n", i);
|
||||
ret = -ENODEV;
|
||||
goto error;
|
||||
}
|
||||
|
||||
dev_info(dev, "Instantiated %d SPI devices.\n", smi->spi_num);
|
||||
|
||||
return 0;
|
||||
error:
|
||||
smi_devs_unregister(smi);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* smi_i2c_probe - Instantiate multiple I2C devices from inst array
|
||||
* @pdev: Platform device
|
||||
* @adev: ACPI device
|
||||
* @smi: Internal struct for Serial multi instantiate driver
|
||||
* @inst_array: Array of instances to probe
|
||||
*
|
||||
* Returns the number of I2C devices instantiate, Zero if none is found or a negative error code.
|
||||
*/
|
||||
static int smi_i2c_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi,
|
||||
const struct smi_instance *inst_array)
|
||||
{
|
||||
struct i2c_board_info board_info = {};
|
||||
struct device *dev = &pdev->dev;
|
||||
char name[32];
|
||||
int i, ret, count;
|
||||
|
||||
ret = i2c_acpi_client_count(adev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else if (!ret)
|
||||
return -ENODEV;
|
||||
|
||||
count = ret;
|
||||
|
||||
smi->i2c_devs = devm_kcalloc(dev, count, sizeof(*smi->i2c_devs), GFP_KERNEL);
|
||||
if (!smi->i2c_devs)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < count && inst_array[i].type; i++) {
|
||||
memset(&board_info, 0, sizeof(board_info));
|
||||
strscpy(board_info.type, inst_array[i].type, I2C_NAME_SIZE);
|
||||
snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst_array[i].type, i);
|
||||
board_info.dev_name = name;
|
||||
|
||||
ret = smi_get_irq(pdev, adev, &inst_array[i]);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
board_info.irq = ret;
|
||||
|
||||
smi->i2c_devs[i] = i2c_acpi_new_device(dev, i, &board_info);
|
||||
if (IS_ERR(smi->i2c_devs[i])) {
|
||||
ret = dev_err_probe(dev, PTR_ERR(smi->i2c_devs[i]),
|
||||
"Error creating i2c-client, idx %d\n", i);
|
||||
goto error;
|
||||
}
|
||||
smi->i2c_num++;
|
||||
}
|
||||
if (smi->i2c_num < count) {
|
||||
dev_dbg(dev, "Error finding driver, idx %d\n", i);
|
||||
ret = -ENODEV;
|
||||
goto error;
|
||||
}
|
||||
|
||||
dev_info(dev, "Instantiated %d I2C devices.\n", smi->i2c_num);
|
||||
|
||||
return 0;
|
||||
error:
|
||||
smi_devs_unregister(smi);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int smi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct smi_node *node;
|
||||
struct acpi_device *adev;
|
||||
struct smi *smi;
|
||||
|
||||
adev = ACPI_COMPANION(dev);
|
||||
if (!adev)
|
||||
return -ENODEV;
|
||||
|
||||
node = device_get_match_data(dev);
|
||||
if (!node) {
|
||||
dev_dbg(dev, "Error ACPI match data is missing\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
smi = devm_kzalloc(dev, sizeof(*smi), GFP_KERNEL);
|
||||
if (!smi)
|
||||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, smi);
|
||||
|
||||
switch (node->bus_type) {
|
||||
case SMI_I2C:
|
||||
return smi_i2c_probe(pdev, adev, smi, node->instances);
|
||||
case SMI_SPI:
|
||||
return smi_spi_probe(pdev, adev, smi, node->instances);
|
||||
case SMI_AUTO_DETECT:
|
||||
if (i2c_acpi_client_count(adev) > 0)
|
||||
return smi_i2c_probe(pdev, adev, smi, node->instances);
|
||||
else
|
||||
return smi_spi_probe(pdev, adev, smi, node->instances);
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0; /* never reached */
|
||||
}
|
||||
|
||||
static int smi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct smi *smi = platform_get_drvdata(pdev);
|
||||
|
||||
smi_devs_unregister(smi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct smi_node bsg1160_data = {
|
||||
.instances = {
|
||||
{ "bmc150_accel", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "bmc150_magn" },
|
||||
{ "bmg160" },
|
||||
{}
|
||||
},
|
||||
.bus_type = SMI_I2C,
|
||||
};
|
||||
|
||||
static const struct smi_node bsg2150_data = {
|
||||
.instances = {
|
||||
{ "bmc150_accel", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "bmc150_magn" },
|
||||
/* The resources describe a 3th client, but it is not really there. */
|
||||
{ "bsg2150_dummy_dev" },
|
||||
{}
|
||||
},
|
||||
.bus_type = SMI_I2C,
|
||||
};
|
||||
|
||||
static const struct smi_node int3515_data = {
|
||||
.instances = {
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 0 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 1 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 2 },
|
||||
{ "tps6598x", IRQ_RESOURCE_APIC, 3 },
|
||||
{}
|
||||
},
|
||||
.bus_type = SMI_I2C,
|
||||
};
|
||||
|
||||
static const struct smi_node cs35l41_hda = {
|
||||
.instances = {
|
||||
{ "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
|
||||
{ "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
|
||||
{}
|
||||
},
|
||||
.bus_type = SMI_AUTO_DETECT,
|
||||
};
|
||||
|
||||
/*
|
||||
* Note new device-ids must also be added to ignore_serial_bus_ids in
|
||||
* drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
|
||||
*/
|
||||
static const struct acpi_device_id smi_acpi_ids[] = {
|
||||
{ "BSG1160", (unsigned long)&bsg1160_data },
|
||||
{ "BSG2150", (unsigned long)&bsg2150_data },
|
||||
{ "INT3515", (unsigned long)&int3515_data },
|
||||
{ "CSC3551", (unsigned long)&cs35l41_hda },
|
||||
/* Non-conforming _HID for Cirrus Logic already released */
|
||||
{ "CLSA0100", (unsigned long)&cs35l41_hda },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, smi_acpi_ids);
|
||||
|
||||
static struct platform_driver smi_driver = {
|
||||
.driver = {
|
||||
.name = "Serial bus multi instantiate pseudo device driver",
|
||||
.acpi_match_table = smi_acpi_ids,
|
||||
},
|
||||
.probe = smi_probe,
|
||||
.remove = smi_remove,
|
||||
};
|
||||
module_platform_driver(smi_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Serial multi instantiate pseudo device driver");
|
||||
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
Reference in New Issue
Block a user