|
@@ -81,10 +81,11 @@ int lpc_open_pmio_window(uint base, uint size)
|
|
|
|
|
|
lgir_reg_num = find_unused_pmio_window();
|
|
|
if (lgir_reg_num < 0) {
|
|
|
- log_err("LPC: Cannot open IO window: %lx size %lx\n",
|
|
|
- bridge_base, size - bridged_size);
|
|
|
- log_err("No more IO windows\n");
|
|
|
-
|
|
|
+ if (spl_phase() > PHASE_TPL) {
|
|
|
+ log_err("LPC: Cannot open IO window: %lx size %lx\n",
|
|
|
+ bridge_base, size - bridged_size);
|
|
|
+ log_err("No more IO windows\n");
|
|
|
+ }
|
|
|
return -ENOSPC;
|
|
|
}
|
|
|
lgir_reg_offset = LPC_GENERIC_IO_RANGE(lgir_reg_num);
|
|
@@ -127,15 +128,17 @@ struct acpi_ops apl_lpc_acpi_ops = {
|
|
|
.inject_dsdt = southbridge_inject_dsdt,
|
|
|
};
|
|
|
|
|
|
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
|
static const struct udevice_id apl_lpc_ids[] = {
|
|
|
{ .compatible = "intel,apl-lpc" },
|
|
|
{ }
|
|
|
};
|
|
|
+#endif
|
|
|
|
|
|
/* All pads are LPC already configured by the hostbridge, so no probing here */
|
|
|
U_BOOT_DRIVER(intel_apl_lpc) = {
|
|
|
.name = "intel_apl_lpc",
|
|
|
.id = UCLASS_LPC,
|
|
|
- .of_match = apl_lpc_ids,
|
|
|
+ .of_match = of_match_ptr(apl_lpc_ids),
|
|
|
ACPI_OPS_PTR(&apl_lpc_acpi_ops)
|
|
|
};
|