Skip to content

Commit bda3df1

Browse files
raagjadavrafaeljw
authored andcommitted
ACPI: LPSS: drop BayTrail and Lynxpoint pinctrl HIDs
Platform devices are now created by ACPI core on device enumeration on acpi_bus_scan() -> acpi_bus_attach() path after commit 4845934 ("ACPI / scan: use platform bus type by default for _HID enumeration"). No need to create them from LPSS unless we explicitly need to set acpi_lpss_pm_domain for them. Signed-off-by: Raag Jadav <[email protected]> Reviewed-by: Mika Westerberg <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 8a749fd commit bda3df1

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

drivers/acpi/acpi_lpss.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,13 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
368368
{ "INT33C4", LPSS_ADDR(lpt_uart_dev_desc) },
369369
{ "INT33C5", LPSS_ADDR(lpt_uart_dev_desc) },
370370
{ "INT33C6", LPSS_ADDR(lpt_sdio_dev_desc) },
371-
{ "INT33C7", },
372371

373372
/* BayTrail LPSS devices */
374373
{ "80860F09", LPSS_ADDR(byt_pwm_dev_desc) },
375374
{ "80860F0A", LPSS_ADDR(byt_uart_dev_desc) },
376375
{ "80860F0E", LPSS_ADDR(byt_spi_dev_desc) },
377376
{ "80860F14", LPSS_ADDR(byt_sdio_dev_desc) },
378377
{ "80860F41", LPSS_ADDR(byt_i2c_dev_desc) },
379-
{ "INT33B2", },
380-
{ "INT33FC", },
381378

382379
/* Braswell LPSS devices */
383380
{ "80862286", LPSS_ADDR(lpss_dma_desc) },
@@ -396,7 +393,6 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
396393
{ "INT3434", LPSS_ADDR(lpt_uart_dev_desc) },
397394
{ "INT3435", LPSS_ADDR(lpt_uart_dev_desc) },
398395
{ "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) },
399-
{ "INT3437", },
400396

401397
/* Wildcat Point LPSS devices */
402398
{ "INT3438", LPSS_ADDR(lpt_spi_dev_desc) },
@@ -657,10 +653,9 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
657653
int ret;
658654

659655
dev_desc = (const struct lpss_device_desc *)id->driver_data;
660-
if (!dev_desc) {
661-
pdev = acpi_create_platform_device(adev, NULL);
662-
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
663-
}
656+
if (!dev_desc)
657+
return -EINVAL;
658+
664659
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
665660
if (!pdata)
666661
return -ENOMEM;

0 commit comments

Comments
 (0)