Commit 2770b8b1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'acpi-platform'

* acpi-platform:
  ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips
parents a392f7d4 8ce62f85
...@@ -267,12 +267,14 @@ static int acpi_lpss_create_device(struct acpi_device *adev, ...@@ -267,12 +267,14 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
struct lpss_private_data *pdata; struct lpss_private_data *pdata;
struct resource_list_entry *rentry; struct resource_list_entry *rentry;
struct list_head resource_list; struct list_head resource_list;
struct platform_device *pdev;
int ret; int ret;
dev_desc = (struct lpss_device_desc *)id->driver_data; dev_desc = (struct lpss_device_desc *)id->driver_data;
if (!dev_desc) if (!dev_desc) {
return acpi_create_platform_device(adev, id); pdev = acpi_create_platform_device(adev);
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
}
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
...@@ -322,10 +324,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev, ...@@ -322,10 +324,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
dev_desc->setup(pdata); dev_desc->setup(pdata);
adev->driver_data = pdata; adev->driver_data = pdata;
ret = acpi_create_platform_device(adev, id); pdev = acpi_create_platform_device(adev);
if (ret > 0) if (!IS_ERR_OR_NULL(pdev)) {
return ret; device_enable_async_suspend(&pdev->dev);
return 1;
}
ret = PTR_ERR(pdev);
adev->driver_data = NULL; adev->driver_data = NULL;
err_out: err_out:
......
...@@ -31,6 +31,10 @@ static const struct acpi_device_id acpi_platform_device_ids[] = { ...@@ -31,6 +31,10 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
{ "PNP0D40" }, { "PNP0D40" },
{ "VPC2004" }, { "VPC2004" },
{ "BCM4752" }, { "BCM4752" },
{ "LNV4752" },
{ "BCM2E1A" },
{ "BCM2E39" },
{ "BCM2E3D" },
/* Intel Smart Sound Technology */ /* Intel Smart Sound Technology */
{ "INT33C8" }, { "INT33C8" },
...@@ -42,7 +46,6 @@ static const struct acpi_device_id acpi_platform_device_ids[] = { ...@@ -42,7 +46,6 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
/** /**
* acpi_create_platform_device - Create platform device for ACPI device node * acpi_create_platform_device - Create platform device for ACPI device node
* @adev: ACPI device node to create a platform device for. * @adev: ACPI device node to create a platform device for.
* @id: ACPI device ID used to match @adev.
* *
* Check if the given @adev can be represented as a platform device and, if * Check if the given @adev can be represented as a platform device and, if
* that's the case, create and register a platform device, populate its common * that's the case, create and register a platform device, populate its common
...@@ -50,8 +53,7 @@ static const struct acpi_device_id acpi_platform_device_ids[] = { ...@@ -50,8 +53,7 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
* *
* Name of the platform device will be the same as @adev's. * Name of the platform device will be the same as @adev's.
*/ */
int acpi_create_platform_device(struct acpi_device *adev, struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
const struct acpi_device_id *id)
{ {
struct platform_device *pdev = NULL; struct platform_device *pdev = NULL;
struct acpi_device *acpi_parent; struct acpi_device *acpi_parent;
...@@ -63,19 +65,19 @@ int acpi_create_platform_device(struct acpi_device *adev, ...@@ -63,19 +65,19 @@ int acpi_create_platform_device(struct acpi_device *adev,
/* If the ACPI node already has a physical device attached, skip it. */ /* If the ACPI node already has a physical device attached, skip it. */
if (adev->physical_node_count) if (adev->physical_node_count)
return 0; return NULL;
INIT_LIST_HEAD(&resource_list); INIT_LIST_HEAD(&resource_list);
count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
if (count < 0) { if (count < 0) {
return 0; return NULL;
} else if (count > 0) { } else if (count > 0) {
resources = kmalloc(count * sizeof(struct resource), resources = kmalloc(count * sizeof(struct resource),
GFP_KERNEL); GFP_KERNEL);
if (!resources) { if (!resources) {
dev_err(&adev->dev, "No memory for resources\n"); dev_err(&adev->dev, "No memory for resources\n");
acpi_dev_free_resource_list(&resource_list); acpi_dev_free_resource_list(&resource_list);
return -ENOMEM; return ERR_PTR(-ENOMEM);
} }
count = 0; count = 0;
list_for_each_entry(rentry, &resource_list, node) list_for_each_entry(rentry, &resource_list, node)
...@@ -112,22 +114,27 @@ int acpi_create_platform_device(struct acpi_device *adev, ...@@ -112,22 +114,27 @@ int acpi_create_platform_device(struct acpi_device *adev,
pdevinfo.num_res = count; pdevinfo.num_res = count;
pdevinfo.acpi_node.companion = adev; pdevinfo.acpi_node.companion = adev;
pdev = platform_device_register_full(&pdevinfo); pdev = platform_device_register_full(&pdevinfo);
if (IS_ERR(pdev)) { if (IS_ERR(pdev))
dev_err(&adev->dev, "platform device creation failed: %ld\n", dev_err(&adev->dev, "platform device creation failed: %ld\n",
PTR_ERR(pdev)); PTR_ERR(pdev));
pdev = NULL; else
} else {
dev_dbg(&adev->dev, "created platform device %s\n", dev_dbg(&adev->dev, "created platform device %s\n",
dev_name(&pdev->dev)); dev_name(&pdev->dev));
}
kfree(resources); kfree(resources);
return pdev;
}
static int acpi_platform_attach(struct acpi_device *adev,
const struct acpi_device_id *id)
{
acpi_create_platform_device(adev);
return 1; return 1;
} }
static struct acpi_scan_handler platform_handler = { static struct acpi_scan_handler platform_handler = {
.ids = acpi_platform_device_ids, .ids = acpi_platform_device_ids,
.attach = acpi_create_platform_device, .attach = acpi_platform_attach,
}; };
void __init acpi_platform_init(void) void __init acpi_platform_init(void)
......
...@@ -180,8 +180,7 @@ static inline void suspend_nvs_restore(void) {} ...@@ -180,8 +180,7 @@ static inline void suspend_nvs_restore(void) {}
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct platform_device; struct platform_device;
int acpi_create_platform_device(struct acpi_device *adev, struct platform_device *acpi_create_platform_device(struct acpi_device *adev);
const struct acpi_device_id *id);
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
Video Video
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment