diff --git a/arch/x86/soc/atom/soc.h b/arch/x86/soc/atom/soc.h index d211d244121..341a9d860ab 100644 --- a/arch/x86/soc/atom/soc.h +++ b/arch/x86/soc/atom/soc.h @@ -29,17 +29,53 @@ */ #define UART_NS16550_ACCESS_IOPORT -#define UART_NS16550_PORT_0_BASE_ADDR 0x03F8 -#define UART_NS16550_PORT_0_IRQ 4 -#define UART_NS16550_PORT_0_CLK_FREQ 1843200 +#define UART_NS16550_PORT_0_BASE_ADDR 0x03F8 +#define UART_NS16550_PORT_0_IRQ 4 +#define UART_NS16550_PORT_0_CLK_FREQ 1843200 -#define UART_NS16550_PORT_1_BASE_ADDR 0x02F8 -#define UART_NS16550_PORT_1_IRQ 3 -#define UART_NS16550_PORT_1_CLK_FREQ 1843200 +#define UART_NS16550_PORT_1_BASE_ADDR 0x02F8 +#define UART_NS16550_PORT_1_IRQ 3 +#define UART_NS16550_PORT_1_CLK_FREQ 1843200 #ifdef CONFIG_IOAPIC #include -#define UART_IRQ_FLAGS (IOAPIC_EDGE | IOAPIC_HIGH) +#define UART_IRQ_FLAGS (IOAPIC_EDGE | IOAPIC_HIGH) #endif /* CONFIG_IOAPIC */ + +/* PCI definitions */ +/* FIXME: The values below copied from generic ia32 soc, we need to get the + * correct numbers for Atom and the minnowboard + * + * This is added now to get basic enumartion of devices and verify that PCI + * driver is functional. + */ +#define PCI_BUS_NUMBERS 1 + +#define PCI_CTRL_ADDR_REG 0xCF8 +#define PCI_CTRL_DATA_REG 0xCFC + +#define PCI_INTA 1 +#define PCI_INTB 2 +#define PCI_INTC 3 +#define PCI_INTD 4 + +/** + * + * @brief Convert PCI interrupt PIN to IRQ + * + * @return IRQ number, -1 if the result is incorrect + * + */ + +static inline int pci_pin2irq(int bus, int dev, int pin) +{ + ARG_UNUSED(bus); + + if ((pin < PCI_INTA) || (pin > PCI_INTD)) { + return -1; + } + return 10 + (((pin + dev - 1) >> 1) & 1); +} + #endif /* __SOC_H_ */