projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
arch
/
x86
/
cpu
/
i386
/
interrupt.c
diff --git
a/arch/x86/cpu/i386/interrupt.c
b/arch/x86/cpu/i386/interrupt.c
index
70edbe0
..
e67a116
100644
(file)
--- a/
arch/x86/cpu/i386/interrupt.c
+++ b/
arch/x86/cpu/i386/interrupt.c
@@
-15,6
+15,7
@@
#include <efi_loader.h>
#include <hang.h>
#include <init.h>
#include <efi_loader.h>
#include <hang.h>
#include <init.h>
+#include <irq.h>
#include <irq_func.h>
#include <asm/control_regs.h>
#include <asm/i8259.h>
#include <irq_func.h>
#include <asm/control_regs.h>
#include <asm/i8259.h>
@@
-263,8
+264,11
@@
int interrupt_init(void)
struct udevice *dev;
int ret;
struct udevice *dev;
int ret;
+ if (!ll_boot_init())
+ return 0;
+
/* Try to set up the interrupt router, but don't require one */
/* Try to set up the interrupt router, but don't require one */
- ret =
uclass_first_device_err(UCLASS_IRQ
, &dev);
+ ret =
irq_first_device_type(X86_IRQT_BASE
, &dev);
if (ret && ret != -ENODEV)
return ret;
if (ret && ret != -ENODEV)
return ret;
@@
-294,8
+298,7
@@
int interrupt_init(void)
* TODO(sjg@chromium.org): But we don't handle these correctly when
* booted from EFI.
*/
* TODO(sjg@chromium.org): But we don't handle these correctly when
* booted from EFI.
*/
- if (ll_boot_init())
- enable_interrupts();
+ enable_interrupts();
#endif
return 0;
#endif
return 0;