Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / drivers / pinctrl / intel / pinctrl.c

diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index 5bf5d8b0e24abb4c4094828155f8b5543f8c1bc5..ba8206350eaef7202e343034641a1b9625a700bd 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -19,6 +19,8 @@
 #include <common.h>
 #include <dm.h>
 #include <irq.h>
+#include <log.h>
+#include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
 #include <asm-generic/gpio.h>
@@ -28,6 +30,7 @@
 #include <asm/itss.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/err.h>
 
 #define GPIO_DW_SIZE(x)                        (sizeof(u32) * (x))
 #define PAD_CFG_OFFSET(x, dw_num)      ((x) + GPIO_DW_SIZE(dw_num))
@@ -613,7 +616,7 @@ int intel_pinctrl_ofdata_to_platdata(struct udevice *dev,
                log_err("Cannot find community for pid %d\n", pplat->pid);
                return -EDOM;
        }
-       ret = uclass_first_device_err(UCLASS_IRQ, &priv->itss);
+       ret = irq_first_device_type(X86_IRQT_ITSS, &priv->itss);
        if (ret)
                return log_msg_ret("Cannot find ITSS", ret);
        priv->comm = comm;