Skip to content

Commit 97c2259

Browse files
committed
platform/x86: int3472: Deal with probe ordering issues
The clk and regulator frameworks expect clk/regulator consumer-devices to have info about the consumed clks/regulators described in the device's fw_node. To work around this info missing from the ACPI tables on devices where the int3472 driver is used, the int3472 MFD-cell drivers attach info about consumers to the clks/regulators when registering these. This causes problems with the probe ordering wrt drivers for consumers of these clks/regulators. Since the lookups are only registered when the provider-driver binds, trying to get these clks/regulators before then results in a -ENOENT error for clks and a dummy regulator for regulators. All the sensor ACPI fw-nodes have a _DEP dependency on the INT3472 ACPI fw-node, so to work around these probe ordering issues the ACPI core / i2c-code does not instantiate the I2C-clients for any ACPI devices which have a _DEP dependency on an INT3472 ACPI device until all _DEP-s are met. This relies on acpi_dev_clear_dependencies() getting called by the driver for the _DEP-s when they are ready, add a acpi_dev_clear_dependencies() call to the discrete.c probe code. In the tps68470 case calling acpi_dev_clear_dependencies() is already done by the acpi_gpiochip_add() call done by the driver for the GPIO MFD cell (The GPIO cell is deliberately the last cell created to make sure the clk + regulator cells are already instantiated when this happens). However for proper probe ordering, the clk/regulator cells must not just be instantiated the must be fully ready (the clks + regulators must be registered with their subsystems). Add MODULE_SOFTDEP dependencies for the clk and regulator drivers for the instantiated MFD-cells so that these are loaded before us and so that they bind immediately when the platform-devs are instantiated. Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 19d8d6e commit 97c2259

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

drivers/platform/x86/intel/int3472/discrete.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ static int skl_int3472_discrete_probe(struct platform_device *pdev)
380380
return ret;
381381
}
382382

383+
acpi_dev_clear_dependencies(adev);
383384
return 0;
384385
}
385386

drivers/platform/x86/intel/int3472/tps68470.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
170170
return device_type;
171171
}
172172

173+
/*
174+
* No acpi_dev_clear_dependencies() here, since the acpi_gpiochip_add()
175+
* for the GPIO cell already does this.
176+
*/
177+
173178
return ret;
174179
}
175180

@@ -203,3 +208,4 @@ module_i2c_driver(int3472_tps68470);
203208
MODULE_DESCRIPTION("Intel SkyLake INT3472 ACPI TPS68470 Device Driver");
204209
MODULE_AUTHOR("Daniel Scally <[email protected]>");
205210
MODULE_LICENSE("GPL v2");
211+
MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator");

0 commit comments

Comments
 (0)