GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: x86: quark: Add an interrupt driver

Browse source 
Add a driver for interrupts on quark and move the code currently in
cpu_irq_init() into its probe() method.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2016-01-19 21:32:30 -07:00 • committed by Bin Meng
parent f8b4e45e31
commit 117bfc7fbe
4 changed files with 51 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/cpu/quark/Makefile
View file

@ -4,5 +4,5 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-y += car.o dram.o msg_port.o quark.o obj-y += car.o dram.o irq.o msg_port.o quark.o
obj-y += mrc.o mrc_util.o hte.o smc.o obj-y += mrc.o mrc_util.o hte.o smc.o

49
arch/x86/cpu/quark/irq.c Normal file
View file

@ -0,0 +1,49 @@
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
* Copyright (C) 2015 Google, Inc
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <dm.h>
#include <asm/irq.h>
#include <asm/arch/device.h>
#include <asm/arch/quark.h>
int quark_irq_router_probe(struct udevice *dev)
{
struct quark_rcba *rcba;
u32 base;
qrk_pci_read_config_dword(QUARK_LEGACY_BRIDGE, LB_RCBA, &base);
base &= ~MEM_BAR_EN;
rcba = (struct quark_rcba *)base;
/*
* Route Quark PCI device interrupt pin to PIRQ
*
* Route device#23's INTA/B/C/D to PIRQA/B/C/D
* Route device#20,21's INTA/B/C/D to PIRQE/F/G/H
*/
writew(PIRQC, &rcba->rmu_ir);
writew(PIRQA | (PIRQB << 4) | (PIRQC << 8) | (PIRQD << 12),
&rcba->d23_ir);
writew(PIRQD, &rcba->core_ir);
writew(PIRQE | (PIRQF << 4) | (PIRQG << 8) | (PIRQH << 12),
&rcba->d20d21_ir);
return irq_router_common_init(dev);
}
static const struct udevice_id quark_irq_router_ids[] = {
{ .compatible = "intel,quark-irq-router" },
{ }
};
U_BOOT_DRIVER(quark_irq_router_drv) = {
.name = "quark_intel_irq",
.id = UCLASS_IRQ,
.of_match = quark_irq_router_ids,
.probe = quark_irq_router_probe,
};

25
arch/x86/cpu/quark/quark.c
View file

@ -7,12 +7,10 @@
#include <common.h> #include <common.h>
#include <mmc.h> #include <mmc.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h>
#include <asm/mrccache.h> #include <asm/mrccache.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/pci.h> #include <asm/pci.h>
#include <asm/post.h> #include <asm/post.h>
#include <asm/processor.h>
#include <asm/arch/device.h> #include <asm/arch/device.h>
#include <asm/arch/msg_port.h> #include <asm/arch/msg_port.h>
#include <asm/arch/quark.h> #include <asm/arch/quark.h>
@ -346,29 +344,6 @@ int cpu_mmc_init(bd_t *bis)
return pci_mmc_init("Quark SDHCI", mmc_supported); return pci_mmc_init("Quark SDHCI", mmc_supported);
} }
void cpu_irq_init(void)
{
struct quark_rcba *rcba;
u32 base;
qrk_pci_read_config_dword(QUARK_LEGACY_BRIDGE, LB_RCBA, &base);
base &= ~MEM_BAR_EN;
rcba = (struct quark_rcba *)base;
/*
* Route Quark PCI device interrupt pin to PIRQ
*
* Route device#23's INTA/B/C/D to PIRQA/B/C/D
* Route device#20,21's INTA/B/C/D to PIRQE/F/G/H
*/
writew(PIRQC, &rcba->rmu_ir);
writew(PIRQA | (PIRQB << 4) | (PIRQC << 8) | (PIRQD << 12),
&rcba->d23_ir);
writew(PIRQD, &rcba->core_ir);
writew(PIRQE | (PIRQF << 4) | (PIRQG << 8) | (PIRQH << 12),
&rcba->d20d21_ir);
}
int arch_misc_init(void) int arch_misc_init(void)
{ {
#ifdef CONFIG_ENABLE_MRC_CACHE #ifdef CONFIG_ENABLE_MRC_CACHE

2
arch/x86/dts/galileo.dts
View file

@ -84,7 +84,7 @@
compatible = "intel,pch7"; compatible = "intel,pch7";
irq-router { irq-router {
compatible = "intel,irq-router"; compatible = "intel,quark-irq-router";
intel,pirq-config = "pci"; intel,pirq-config = "pci";
intel,pirq-link = <0x60 8>; intel,pirq-link = <0x60 8>;
intel,pirq-mask = <0xdef8>; intel,pirq-mask = <0xdef8>;