Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5587a0df authored by Mika Westerberg's avatar Mika Westerberg Committed by Sasha Levin
Browse files

mfd: lpc_ich: Assign subdevice ids automatically 



[ Upstream commit 1abf25a25b86dcfe28d243a5af71bd1c9d6de1ef ]

Using -1 as platform device id means that the platform driver core will not
assign any id to the device (the device name will not have id at all). This
results problems on systems that have multiple PCHs (Platform Controller
HUBs) because all of them also include their own copy of LPC device.

All the subsequent device creations will fail because there already exists
platform device with the same name.

Fix this by passing PLATFORM_DEVID_AUTO as platform device id. This makes
the platform device core to allocate new ids automatically.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 5c672235

drivers/mfd/lpc_ich.c

+4 −4
Original line number Diff line number Diff line
@@ -934,8 +934,8 @@ gpe0_done: 
	lpc_ich_enable_gpio_space(dev);



	lpc_ich_finalize_cell(dev, &lpc_ich_cells[LPC_GPIO]);

	ret = mfd_add_devices(&dev->dev, -1, &lpc_ich_cells[LPC_GPIO],

			      1, NULL, 0, NULL);

	ret = mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,

			      &lpc_ich_cells[LPC_GPIO], 1, NULL, 0, NULL);



gpio_done:

	if (acpi_conflict)
@@ -1008,8 +1008,8 @@ static int lpc_ich_init_wdt(struct pci_dev *dev) 
	}



	lpc_ich_finalize_cell(dev, &lpc_ich_cells[LPC_WDT]);

	ret = mfd_add_devices(&dev->dev, -1, &lpc_ich_cells[LPC_WDT],

			      1, NULL, 0, NULL);

	ret = mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,

			      &lpc_ich_cells[LPC_WDT], 1, NULL, 0, NULL);



wdt_done:

	return ret;