Merge remote-tracking branch 'access_once/linux-next'

[karo-tx-linux.git] / Documentation / acpi / enumeration.txt

diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt
index b731b292e8128e30439ae54c1f0f328b56e79b72..a91ec5af52df28cf3ff3c2ae03b163272caae0e6 100644 (file)
--- a/Documentation/acpi/enumeration.txt
+++ b/Documentation/acpi/enumeration.txt
@@ -347,13 +347,18 @@ For the first case, the MFD drivers do not need to do anything. The
 resulting child platform device will have its ACPI_COMPANION() set to point
 to the parent device.
 
-If the ACPI namespace has a device that we can match using an ACPI id,
-the id should be set like:
+If the ACPI namespace has a device that we can match using an ACPI id or ACPI
+adr, the cell should be set like:
+
+       static struct mfd_cell_acpi_match my_subdevice_cell_acpi_match = {
+               .pnpid = "XYZ0001",
+               .adr = 0,
+       };
 
        static struct mfd_cell my_subdevice_cell = {
                .name = "my_subdevice",
                /* set the resources relative to the parent */
-               .acpi_pnpid = "XYZ0001",
+               .acpi_match = &my_subdevice_cell_acpi_match,
        };
 
 The ACPI id "XYZ0001" is then used to lookup an ACPI device directly under