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. -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEEuvA7XScYQRpenhd+kuxHeUQDJ9wFAmH6vlwUHGhkZWdvZWRl QHJlZGhhdC5jb20ACgkQkuxHeUQDJ9y3sAf+JoNPIvjcZLsrl1Xf5mk44c7Qg0BL uknI7jj3FJem65uG4PKkB0SQ2Ysd5TfH0NQaUG3oiq+YqPJUjIm2qtsyBOT/cUWP 3EcCjX8/kYBtotTU3t16ciZCKXHW9zNvxTttUQJdDLEWyRLZ8RlRBTvcATdNK9DA POA/f+Dh0PBhPFf4V5/XjylELNLAvzK+rYk2IdrGCSe6P3DOJU7M96qRHM7JQSym tfxswPRwCDNr4A/3yRnI+N1XKwEdoEpiGIY2cXqoSzIePRjzvsxby9wLSuG4wp95 2/AUj4G9biQMsUSZoyeNU4henoNtUnUn8DOYa1ZaYxXl4nh04yICrqfLLg== =njf6 -----END PGP SIGNATURE----- Merge tag 'platform-drivers-x86-serial-multi-instantiate-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-next 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:
Takashi Iwai
commit
0707541df4
|
|
@ -388,11 +388,11 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
|||
S: Maintained
|
||||
F: drivers/acpi/arm64
|
||||
|
||||
ACPI I2C MULTI INSTANTIATE DRIVER
|
||||
ACPI SERIAL MULTI INSTANTIATE DRIVER
|
||||
M: Hans de Goede <hdegoede@redhat.com>
|
||||
L: platform-driver-x86@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/platform/x86/i2c-multi-instantiate.c
|
||||
F: drivers/platform/x86/serial-multi-instantiate.c
|
||||
|
||||
ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
|
||||
M: Sudeep Holla <sudeep.holla@arm.com>
|
||||
|
|
|
|||
|
|
@ -1734,17 +1734,21 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
|||
bool is_serial_bus_slave = false;
|
||||
static const struct acpi_device_id ignore_serial_bus_ids[] = {
|
||||
/*
|
||||
* These devices have multiple I2cSerialBus resources and an i2c-client
|
||||
* must be instantiated for each, each with its own i2c_device_id.
|
||||
* Normally we only instantiate an i2c-client for the first resource,
|
||||
* using the ACPI HID as id. These special cases are handled by the
|
||||
* drivers/platform/x86/i2c-multi-instantiate.c driver, which knows
|
||||
* which i2c_device_id to use for each resource.
|
||||
* These devices have multiple SerialBus resources and a client
|
||||
* device must be instantiated for each of them, each with
|
||||
* its own device id.
|
||||
* Normally we only instantiate one client device for the first
|
||||
* resource, using the ACPI HID as id. These special cases are handled
|
||||
* by the drivers/platform/x86/serial-multi-instantiate.c driver, which
|
||||
* knows which client device id to use for each resource.
|
||||
*/
|
||||
{"BSG1160", },
|
||||
{"BSG2150", },
|
||||
{"CSC3551", },
|
||||
{"INT33FE", },
|
||||
{"INT3515", },
|
||||
/* Non-conforming _HID for Cirrus Logic already released */
|
||||
{"CLSA0100", },
|
||||
/*
|
||||
* HIDs of device with an UartSerialBusV2 resource for which userspace
|
||||
* expects a regular tty cdev to be created (instead of the in kernel
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
@ -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");
|
||||
|
|
@ -532,7 +532,7 @@ static DEFINE_MUTEX(board_lock);
|
|||
*
|
||||
* Return: a pointer to the new device, or NULL.
|
||||
*/
|
||||
static struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
|
||||
struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
|
||||
{
|
||||
struct spi_device *spi;
|
||||
|
||||
|
|
@ -557,6 +557,7 @@ static struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
|
|||
device_initialize(&spi->dev);
|
||||
return spi;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(spi_alloc_device);
|
||||
|
||||
static void spi_dev_set_name(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -652,7 +653,7 @@ static int __spi_add_device(struct spi_device *spi)
|
|||
*
|
||||
* Return: 0 on success; negative errno on failure
|
||||
*/
|
||||
static int spi_add_device(struct spi_device *spi)
|
||||
int spi_add_device(struct spi_device *spi)
|
||||
{
|
||||
struct spi_controller *ctlr = spi->controller;
|
||||
struct device *dev = ctlr->dev.parent;
|
||||
|
|
@ -673,6 +674,7 @@ static int spi_add_device(struct spi_device *spi)
|
|||
mutex_unlock(&ctlr->add_lock);
|
||||
return status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(spi_add_device);
|
||||
|
||||
static int spi_add_device_locked(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -2318,8 +2320,50 @@ struct acpi_spi_lookup {
|
|||
int irq;
|
||||
u8 bits_per_word;
|
||||
u8 chip_select;
|
||||
int n;
|
||||
int index;
|
||||
};
|
||||
|
||||
static int acpi_spi_count(struct acpi_resource *ares, void *data)
|
||||
{
|
||||
struct acpi_resource_spi_serialbus *sb;
|
||||
int *count = data;
|
||||
|
||||
if (ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)
|
||||
return 1;
|
||||
|
||||
sb = &ares->data.spi_serial_bus;
|
||||
if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_SPI)
|
||||
return 1;
|
||||
|
||||
*count = *count + 1;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* acpi_spi_count_resources - Count the number of SpiSerialBus resources
|
||||
* @adev: ACPI device
|
||||
*
|
||||
* Returns the number of SpiSerialBus resources in the ACPI-device's
|
||||
* resource-list; or a negative error code.
|
||||
*/
|
||||
int acpi_spi_count_resources(struct acpi_device *adev)
|
||||
{
|
||||
LIST_HEAD(r);
|
||||
int count = 0;
|
||||
int ret;
|
||||
|
||||
ret = acpi_dev_get_resources(adev, &r, acpi_spi_count, &count);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
acpi_dev_free_resource_list(&r);
|
||||
|
||||
return count;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_spi_count_resources);
|
||||
|
||||
static void acpi_spi_parse_apple_properties(struct acpi_device *dev,
|
||||
struct acpi_spi_lookup *lookup)
|
||||
{
|
||||
|
|
@ -2349,6 +2393,8 @@ static void acpi_spi_parse_apple_properties(struct acpi_device *dev,
|
|||
lookup->mode |= SPI_CPHA;
|
||||
}
|
||||
|
||||
static struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev);
|
||||
|
||||
static int acpi_spi_add_resource(struct acpi_resource *ares, void *data)
|
||||
{
|
||||
struct acpi_spi_lookup *lookup = data;
|
||||
|
|
@ -2362,14 +2408,35 @@ static int acpi_spi_add_resource(struct acpi_resource *ares, void *data)
|
|||
sb = &ares->data.spi_serial_bus;
|
||||
if (sb->type == ACPI_RESOURCE_SERIAL_TYPE_SPI) {
|
||||
|
||||
if (lookup->index != -1 && lookup->n++ != lookup->index)
|
||||
return 1;
|
||||
|
||||
if (lookup->index == -1 && !ctlr)
|
||||
return -ENODEV;
|
||||
|
||||
status = acpi_get_handle(NULL,
|
||||
sb->resource_source.string_ptr,
|
||||
&parent_handle);
|
||||
|
||||
if (ACPI_FAILURE(status) ||
|
||||
ACPI_HANDLE(ctlr->dev.parent) != parent_handle)
|
||||
if (ACPI_FAILURE(status))
|
||||
return -ENODEV;
|
||||
|
||||
if (ctlr) {
|
||||
if (ACPI_HANDLE(ctlr->dev.parent) != parent_handle)
|
||||
return -ENODEV;
|
||||
} else {
|
||||
struct acpi_device *adev;
|
||||
|
||||
if (acpi_bus_get_device(parent_handle, &adev))
|
||||
return -ENODEV;
|
||||
|
||||
ctlr = acpi_spi_find_controller_by_adev(adev);
|
||||
if (!ctlr)
|
||||
return -ENODEV;
|
||||
|
||||
lookup->ctlr = ctlr;
|
||||
}
|
||||
|
||||
/*
|
||||
* ACPI DeviceSelection numbering is handled by the
|
||||
* host controller driver in Windows and can vary
|
||||
|
|
@ -2408,8 +2475,25 @@ static int acpi_spi_add_resource(struct acpi_resource *ares, void *data)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static acpi_status acpi_register_spi_device(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev)
|
||||
/**
|
||||
* acpi_spi_device_alloc - Allocate a spi device, and fill it in with ACPI information
|
||||
* @ctlr: controller to which the spi device belongs
|
||||
* @adev: ACPI Device for the spi device
|
||||
* @index: Index of the spi resource inside the ACPI Node
|
||||
*
|
||||
* This should be used to allocate a new spi device from and ACPI Node.
|
||||
* The caller is responsible for calling spi_add_device to register the spi device.
|
||||
*
|
||||
* If ctlr is set to NULL, the Controller for the spi device will be looked up
|
||||
* using the resource.
|
||||
* If index is set to -1, index is not used.
|
||||
* Note: If index is -1, ctlr must be set.
|
||||
*
|
||||
* Return: a pointer to the new device, or ERR_PTR on error.
|
||||
*/
|
||||
struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev,
|
||||
int index)
|
||||
{
|
||||
acpi_handle parent_handle = NULL;
|
||||
struct list_head resource_list;
|
||||
|
|
@ -2417,12 +2501,13 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr,
|
|||
struct spi_device *spi;
|
||||
int ret;
|
||||
|
||||
if (acpi_bus_get_status(adev) || !adev->status.present ||
|
||||
acpi_device_enumerated(adev))
|
||||
return AE_OK;
|
||||
if (!ctlr && index == -1)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
lookup.ctlr = ctlr;
|
||||
lookup.irq = -1;
|
||||
lookup.index = index;
|
||||
lookup.n = 0;
|
||||
|
||||
INIT_LIST_HEAD(&resource_list);
|
||||
ret = acpi_dev_get_resources(adev, &resource_list,
|
||||
|
|
@ -2431,26 +2516,25 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr,
|
|||
|
||||
if (ret < 0)
|
||||
/* found SPI in _CRS but it points to another controller */
|
||||
return AE_OK;
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
if (!lookup.max_speed_hz &&
|
||||
ACPI_SUCCESS(acpi_get_parent(adev->handle, &parent_handle)) &&
|
||||
ACPI_HANDLE(ctlr->dev.parent) == parent_handle) {
|
||||
ACPI_HANDLE(lookup.ctlr->dev.parent) == parent_handle) {
|
||||
/* Apple does not use _CRS but nested devices for SPI slaves */
|
||||
acpi_spi_parse_apple_properties(adev, &lookup);
|
||||
}
|
||||
|
||||
if (!lookup.max_speed_hz)
|
||||
return AE_OK;
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
spi = spi_alloc_device(ctlr);
|
||||
spi = spi_alloc_device(lookup.ctlr);
|
||||
if (!spi) {
|
||||
dev_err(&ctlr->dev, "failed to allocate SPI device for %s\n",
|
||||
dev_err(&lookup.ctlr->dev, "failed to allocate SPI device for %s\n",
|
||||
dev_name(&adev->dev));
|
||||
return AE_NO_MEMORY;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
|
||||
ACPI_COMPANION_SET(&spi->dev, adev);
|
||||
spi->max_speed_hz = lookup.max_speed_hz;
|
||||
spi->mode |= lookup.mode;
|
||||
|
|
@ -2458,6 +2542,27 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr,
|
|||
spi->bits_per_word = lookup.bits_per_word;
|
||||
spi->chip_select = lookup.chip_select;
|
||||
|
||||
return spi;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_spi_device_alloc);
|
||||
|
||||
static acpi_status acpi_register_spi_device(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev)
|
||||
{
|
||||
struct spi_device *spi;
|
||||
|
||||
if (acpi_bus_get_status(adev) || !adev->status.present ||
|
||||
acpi_device_enumerated(adev))
|
||||
return AE_OK;
|
||||
|
||||
spi = acpi_spi_device_alloc(ctlr, adev, -1);
|
||||
if (IS_ERR(spi)) {
|
||||
if (PTR_ERR(spi) == -ENOMEM)
|
||||
return AE_NO_MEMORY;
|
||||
else
|
||||
return AE_OK;
|
||||
}
|
||||
|
||||
acpi_set_modalias(adev, acpi_device_hid(adev), spi->modalias,
|
||||
sizeof(spi->modalias));
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include <linux/gpio/consumer.h>
|
||||
|
||||
#include <uapi/linux/spi/spi.h>
|
||||
#include <linux/acpi.h>
|
||||
|
||||
struct dma_chan;
|
||||
struct software_node;
|
||||
|
|
@ -759,6 +760,13 @@ extern int devm_spi_register_controller(struct device *dev,
|
|||
struct spi_controller *ctlr);
|
||||
extern void spi_unregister_controller(struct spi_controller *ctlr);
|
||||
|
||||
#if IS_ENABLED(CONFIG_ACPI)
|
||||
extern struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev,
|
||||
int index);
|
||||
int acpi_spi_count_resources(struct acpi_device *adev);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SPI resource management while processing a SPI message
|
||||
*/
|
||||
|
|
@ -1452,7 +1460,19 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
|
|||
* use spi_new_device() to describe each device. You can also call
|
||||
* spi_unregister_device() to start making that device vanish, but
|
||||
* normally that would be handled by spi_unregister_controller().
|
||||
*
|
||||
* You can also use spi_alloc_device() and spi_add_device() to use a two
|
||||
* stage registration sequence for each spi_device. This gives the caller
|
||||
* some more control over the spi_device structure before it is registered,
|
||||
* but requires that caller to initialize fields that would otherwise
|
||||
* be defined using the board info.
|
||||
*/
|
||||
extern struct spi_device *
|
||||
spi_alloc_device(struct spi_controller *ctlr);
|
||||
|
||||
extern int
|
||||
spi_add_device(struct spi_device *spi);
|
||||
|
||||
extern struct spi_device *
|
||||
spi_new_device(struct spi_controller *, struct spi_board_info *);
|
||||
|
||||
|
|
|
|||
|
|
@ -6611,6 +6611,16 @@ static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup
|
|||
cs35l41_generic_fixup(cdc, action, "i2c", "CSC3551", 2);
|
||||
}
|
||||
|
||||
static void cs35l41_fixup_spi_two(struct hda_codec *codec, const struct hda_fixup *fix, int action)
|
||||
{
|
||||
cs35l41_generic_fixup(codec, action, "spi0", "CSC3551", 2);
|
||||
}
|
||||
|
||||
static void cs35l41_fixup_spi_four(struct hda_codec *codec, const struct hda_fixup *fix, int action)
|
||||
{
|
||||
cs35l41_generic_fixup(codec, action, "spi0", "CSC3551", 4);
|
||||
}
|
||||
|
||||
static void alc287_legion_16achg6_playback_hook(struct hda_pcm_stream *hinfo, struct hda_codec *cdc,
|
||||
struct snd_pcm_substream *sub, int action)
|
||||
{
|
||||
|
|
@ -6948,6 +6958,9 @@ enum {
|
|||
ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE,
|
||||
ALC287_FIXUP_LEGION_16ACHG6,
|
||||
ALC287_FIXUP_CS35L41_I2C_2,
|
||||
ALC245_FIXUP_CS35L41_SPI_2,
|
||||
ALC245_FIXUP_CS35L41_SPI_4,
|
||||
ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED,
|
||||
ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED,
|
||||
};
|
||||
|
||||
|
|
@ -8699,6 +8712,20 @@ static const struct hda_fixup alc269_fixups[] = {
|
|||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = cs35l41_fixup_i2c_two,
|
||||
},
|
||||
[ALC245_FIXUP_CS35L41_SPI_2] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = cs35l41_fixup_spi_two,
|
||||
},
|
||||
[ALC245_FIXUP_CS35L41_SPI_4] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = cs35l41_fixup_spi_four,
|
||||
},
|
||||
[ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc245_fixup_hp_gpio_led,
|
||||
.chained = true,
|
||||
.chain_id = ALC245_FIXUP_CS35L41_SPI_4,
|
||||
},
|
||||
[ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED] = {
|
||||
.type = HDA_FIXUP_VERBS,
|
||||
.v.verbs = (const struct hda_verb[]) {
|
||||
|
|
@ -8926,7 +8953,21 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|||
SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
|
||||
SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
|
||||
SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),
|
||||
SND_PCI_QUIRK(0x103c, 0x89c3, "HP", ALC285_FIXUP_HP_GPIO_LED),
|
||||
SND_PCI_QUIRK(0x103c, 0x896e, "HP EliteBook x360 830 G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8971, "HP EliteBook 830 G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8972, "HP EliteBook 840 G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8973, "HP EliteBook 860 G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8974, "HP EliteBook 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8975, "HP EliteBook x360 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8981, "HP Elite Dragonfly G3", ALC245_FIXUP_CS35L41_SPI_4),
|
||||
SND_PCI_QUIRK(0x103c, 0x898e, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x898f, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8991, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8992, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8994, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x8995, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
|
||||
SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2),
|
||||
SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
|
||||
SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
|
||||
|
|
|
|||
Loading…
Reference in New Issue