3 files changed, 107 insertions, 0 deletions

diff --git a/include/asm-arm/hardware/it8152.h b/include/asm-arm/hardware/it8152.h
new file mode 100644
index 000000000000..aaebb61aca48
--- /dev/null
+++ b/include/asm-arm/hardware/it8152.h
@@ -0,0 +1,99 @@
+/*
+ * linux/include/arm/hardware/it8152.h
+ *
+ * Copyright Compulab Ltd., 2006,2007
+ * Mike Rapoport <mike@compulab.co.il>
+ *
+ * ITE 8152 companion chip register definitions
+ */
+
+#ifndef __ASM_HARDWARE_IT8152_H
+#define __ASM_HARDWARE_IT8152_H
+extern unsigned long it8152_base_address;
+
+#define IT8152_IO_BASE                  (it8152_base_address + 0x03e00000)
+#define IT8152_CFGREG_BASE              (it8152_base_address + 0x03f00000)
+
+#define __REG_IT8152(x)                 (it8152_base_address + (x))
+
+#define IT8152_PCI_CFG_ADDR             __REG_IT8152(0x3f00800)
+#define IT8152_PCI_CFG_DATA             __REG_IT8152(0x3f00804)
+
+#define IT8152_INTC_LDCNIRR             __REG_IT8152(0x3f00300)
+#define IT8152_INTC_LDPNIRR             __REG_IT8152(0x3f00304)
+#define IT8152_INTC_LDCNIMR             __REG_IT8152(0x3f00308)
+#define IT8152_INTC_LDPNIMR             __REG_IT8152(0x3f0030C)
+#define IT8152_INTC_LDNITR              __REG_IT8152(0x3f00310)
+#define IT8152_INTC_LDNIAR              __REG_IT8152(0x3f00314)
+#define IT8152_INTC_LPCNIRR             __REG_IT8152(0x3f00320)
+#define IT8152_INTC_LPPNIRR             __REG_IT8152(0x3f00324)
+#define IT8152_INTC_LPCNIMR             __REG_IT8152(0x3f00328)
+#define IT8152_INTC_LPPNIMR             __REG_IT8152(0x3f0032C)
+#define IT8152_INTC_LPNITR              __REG_IT8152(0x3f00330)
+#define IT8152_INTC_LPNIAR              __REG_IT8152(0x3f00334)
+#define IT8152_INTC_PDCNIRR             __REG_IT8152(0x3f00340)
+#define IT8152_INTC_PDPNIRR             __REG_IT8152(0x3f00344)
+#define IT8152_INTC_PDCNIMR             __REG_IT8152(0x3f00348)
+#define IT8152_INTC_PDPNIMR             __REG_IT8152(0x3f0034C)
+#define IT8152_INTC_PDNITR              __REG_IT8152(0x3f00350)
+#define IT8152_INTC_PDNIAR              __REG_IT8152(0x3f00354)
+#define IT8152_INTC_INTC_TYPER          __REG_IT8152(0x3f003FC)
+
+#define IT8152_GPIO_GPDR                __REG_IT8152(0x3f00500)
+
+/*
+  Interrup contoler per register summary:
+  ---------------------------------------
+  LCDNIRR:
+  IT8152_LD_IRQ(8) PCICLK stop
+  IT8152_LD_IRQ(7) MCLK ready
+  IT8152_LD_IRQ(6) s/w
+  IT8152_LD_IRQ(5) UART
+  IT8152_LD_IRQ(4) GPIO
+  IT8152_LD_IRQ(3) TIMER 4
+  IT8152_LD_IRQ(2) TIMER 3
+  IT8152_LD_IRQ(1) TIMER 2
+  IT8152_LD_IRQ(0) TIMER 1
+
+  LPCNIRR:
+  IT8152_LP_IRQ(x) serial IRQ x
+
+  PCIDNIRR:
+  IT8152_PD_IRQ(14) PCISERR
+  IT8152_PD_IRQ(13) CPU/PCI bridge target abort (h2pTADR)
+  IT8152_PD_IRQ(12) CPU/PCI bridge master abort (h2pMADR)
+  IT8152_PD_IRQ(11) PCI INTD
+  IT8152_PD_IRQ(10) PCI INTC
+  IT8152_PD_IRQ(9)  PCI INTB
+  IT8152_PD_IRQ(8)  PCI INTA
+  IT8152_PD_IRQ(7)  serial INTD
+  IT8152_PD_IRQ(6)  serial INTC
+  IT8152_PD_IRQ(5)  serial INTB
+  IT8152_PD_IRQ(4)  serial INTA
+  IT8152_PD_IRQ(3)  serial IRQ IOCHK (IOCHKR)
+  IT8152_PD_IRQ(2)  chaining DMA (CDMAR)
+  IT8152_PD_IRQ(1)  USB (USBR)
+  IT8152_PD_IRQ(0)  Audio controller (ACR)
+ */
+/* frequently used interrupts */
+#define IT8152_PCISERR          IT8152_PD_IRQ(14)
+#define IT8152_H2PTADR          IT8152_PD_IRQ(13)
+#define IT8152_H2PMAR           IT8152_PD_IRQ(12)
+#define IT8152_PCI_INTD         IT8152_PD_IRQ(11)
+#define IT8152_PCI_INTC         IT8152_PD_IRQ(10)
+#define IT8152_PCI_INTB         IT8152_PD_IRQ(9)
+#define IT8152_PCI_INTA         IT8152_PD_IRQ(8)
+#define IT8152_CDMA_INT         IT8152_PD_IRQ(2)
+#define IT8152_USB_INT          IT8152_PD_IRQ(1)
+#define IT8152_AUDIO_INT        IT8152_PD_IRQ(0)
+
+struct pci_dev;
+struct pci_sys_data;
+
+extern void it8152_irq_demux(unsigned int irq, struct irq_desc *desc);
+extern void it8152_init_irq(void);
+extern int it8152_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
+extern int it8152_pci_setup(int nr, struct pci_sys_data *sys);
+extern struct pci_bus *it8152_pci_scan_bus(int nr, struct pci_sys_data *sys);
+
+#endif /* __ASM_HARDWARE_IT8152_H */
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index ed3f898191f4..75feb1574a69 100644
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -8,10 +8,17 @@
 
 #define pcibios_scan_all_fns(a, b)      0
 
+#ifdef CONFIG_PCI_HOST_ITE8152
+/* ITE bridge requires setting latency timer to avoid early bus access
+   termination by PIC bus mater devices
+*/
+extern void pcibios_set_master(struct pci_dev *dev);
+#else
 static inline void pcibios_set_master(struct pci_dev *dev)
 {
         /* No special bus mastering setup handling */
 }
+#endif
 
 static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3948708c42ca..2bcb02d555e8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1631,6 +1631,7 @@
 #define PCI_DEVICE_ID_ITE_8211          0x8211
 #define PCI_DEVICE_ID_ITE_8212          0x8212
 #define PCI_DEVICE_ID_ITE_8213          0x8213
+#define PCI_DEVICE_ID_ITE_8152          0x8152
 #define PCI_DEVICE_ID_ITE_8872          0x8872
 #define PCI_DEVICE_ID_ITE_IT8330G_0     0xe886