diff options
Diffstat (limited to 'recipes/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch')
| -rw-r--r-- | recipes/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch | 150 |
1 files changed, 150 insertions, 0 deletions
diff --git a/recipes/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch b/recipes/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch new file mode 100644 index 0000000000..8a6b5dfc91 --- /dev/null +++ b/recipes/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch @@ -0,0 +1,150 @@ +From 416e9cca1903f4a6f26c241c3393ad635015e7f6 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.(none)> +Date: Sat, 15 Dec 2007 12:24:05 -0500 +Subject: [PATCH] cmx270-pci + +--- + arch/arm/Kconfig | 8 +++++++- + arch/arm/common/it8152.c | 10 ++-------- + arch/arm/mach-pxa/cm-x270-pci.c | 18 ++++++++---------- + 3 files changed, 17 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index a7e9fea..c4de2d4 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -537,7 +537,7 @@ config ISA_DMA_API + bool + + config PCI +- bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 ++ bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE + help + Find out whether you have a PCI motherboard. PCI is the name of a + bus system, i.e. the way the CPU talks to the other stuff inside +@@ -558,6 +558,12 @@ config PCI_HOST_VIA82C505 + depends on PCI && ARCH_SHARK + default y + ++config PCI_HOST_ITE8152 ++ bool ++ depends on PCI && MACH_ARMCORE ++ default y ++ select DMABOUNCE ++ + source "drivers/pci/Kconfig" + + source "drivers/pcmcia/Kconfig" +diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c +index c03de9b..97b7dc1 100644 +--- a/arch/arm/common/it8152.c ++++ b/arch/arm/common/it8152.c +@@ -70,8 +70,6 @@ static inline void it8152_irq(int irq) + { + struct irq_desc *desc; + +- printk(KERN_DEBUG "===> %s: irq=%d\n", __FUNCTION__, irq); +- + desc = irq_desc + irq; + desc_handle_irq(irq, desc); + } +@@ -106,8 +104,6 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) + int bits_pd, bits_lp, bits_ld; + int i; + +- printk(KERN_DEBUG "=> %s: irq = %d\n", __FUNCTION__, irq); +- + while (1) { + /* Read all */ + bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); +@@ -293,8 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) + */ + int pci_set_dma_mask(struct pci_dev *dev, u64 mask) + { +- printk(KERN_DEBUG "%s: %s %llx\n", +- __FUNCTION__, dev->dev.bus_id, mask); ++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); + if (mask >= PHYS_OFFSET + SZ_64M - 1) + return 0; + +@@ -304,8 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask) + int + pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) + { +- printk(KERN_DEBUG "%s: %s %llx\n", +- __FUNCTION__, dev->dev.bus_id, mask); ++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); + if (mask >= PHYS_OFFSET + SZ_64M - 1) + return 0; + +diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c +index 878d3b9..15c4e0d 100644 +--- a/arch/arm/mach-pxa/cm-x270-pci.c ++++ b/arch/arm/mach-pxa/cm-x270-pci.c +@@ -40,7 +40,7 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, + { + unsigned int sz = SZ_64M >> PAGE_SHIFT; + +- printk(KERN_INFO "Adjusting zones for CM-x270\n"); ++ pr_info("Adjusting zones for CM-x270\n"); + + /* + * Only adjust if > 64M on current system +@@ -104,8 +104,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) + { + int irq; + +- printk(KERN_DEBUG "===> %s: %s slot=%x, pin=%x\n", __FUNCTION__, +- pci_name(dev), slot, pin); ++ dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __FUNCTION__, slot, pin); + + irq = it8152_pci_map_irq(dev, slot, pin); + if (irq) +@@ -141,14 +140,13 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) + return(0); + } + +-static struct pci_bus * __init +-cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys) ++static void cmx270_pci_preinit(void) + { +- printk(KERN_INFO "Initializing CM-X270 PCI subsystem\n"); ++ pr_info("Initializing CM-X270 PCI subsystem\n"); + + __raw_writel(0x800, IT8152_PCI_CFG_ADDR); + if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) { +- printk(KERN_INFO "PCI Bridge found.\n"); ++ pr_info("PCI Bridge found.\n"); + + /* set PCI I/O base at 0 */ + writel(0x848, IT8152_PCI_CFG_ADDR); +@@ -163,7 +161,7 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys) + /* CardBus Controller on ATXbase baseboard */ + writel(0x4000, IT8152_PCI_CFG_ADDR); + if (readl(IT8152_PCI_CFG_DATA) == 0xAC51104C) { +- printk(KERN_INFO "CardBus Bridge found.\n"); ++ pr_info("CardBus Bridge found.\n"); + + /* Configure socket 0 */ + writel(0x408C, IT8152_PCI_CFG_ADDR); +@@ -196,7 +194,6 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys) + writel(0xb0000000, IT8152_PCI_CFG_DATA); + } + } +- return it8152_pci_scan_bus(nr, sys); + } + + static struct hw_pci cmx270_pci __initdata = { +@@ -204,7 +201,8 @@ static struct hw_pci cmx270_pci __initdata = { + .map_irq = cmx270_pci_map_irq, + .nr_controllers = 1, + .setup = it8152_pci_setup, +- .scan = cmx270_pci_scan_bus, ++ .scan = it8152_pci_scan_bus, ++ .preinit = cmx270_pci_preinit, + }; + + static int __init cmx270_init_pci(void) +-- +1.5.2.5 + |