iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: ath79: separate common PCI code

Browse Source 
The 'pcibios_map_irq' and 'pcibios_plat_dev_init'
are common functions and only instance one of them
can be present in a single kernel.

Currently these functions can be built only if the
CONFIG_SOC_AR724X option is selected. However the
ath79 platform contain support for the AR71XX SoCs,.
The AR71XX SoCs have a differnet PCI controller,
and those will require a different code.

Move the common PCI code into a separeate file in
order to be able to use that with other SoCs as
well.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: René Bolldorf <xsecute@googlemail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3485/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Gabor Juhos 2012-03-14 10:29:21 +01:00 committed by Ralf Baechle
parent 97bf7a1900
commit e2dbdc436b
3 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/ath79/Makefile
View File

@ -11,6 +11,7 @@
obj-y := prom.o setup.o irq.o common.o clock.o gpio.o obj-y := prom.o setup.o irq.o common.o clock.o gpio.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_PCI) += pci.o
# #
# Devices # Devices

46
arch/mips/ath79/pci.c Normal file
View File

@ -0,0 +1,46 @@
/*
* Atheros AR71XX/AR724X specific PCI setup code
*
* Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#include <linux/pci.h>
#include <asm/mach-ath79/pci-ath724x.h>
static struct ath724x_pci_data *pci_data;
static int pci_data_size;
void ath724x_pci_add_data(struct ath724x_pci_data *data, int size)
{
pci_data = data;
pci_data_size = size;
}
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
{
unsigned int devfn = dev->devfn;
int irq = -1;
if (devfn > pci_data_size - 1)
return irq;
irq = pci_data[devfn].irq;
return irq;
}
int pcibios_plat_dev_init(struct pci_dev *dev)
{
unsigned int devfn = dev->devfn;
if (devfn > pci_data_size - 1)
return PCIBIOS_DEVICE_NOT_FOUND;
dev->dev.platform_data = pci_data[devfn].pdata;
return PCIBIOS_SUCCESSFUL;
}

34
arch/mips/pci/pci-ath724x.c
View File

@ -9,7 +9,6 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/mach-ath79/pci-ath724x.h>
#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys)) #define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys))
#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val)) #define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))
@ -19,8 +18,6 @@
#define ATH724X_PCI_MEM_SIZE 0x08000000 #define ATH724X_PCI_MEM_SIZE 0x08000000
static DEFINE_SPINLOCK(ath724x_pci_lock); static DEFINE_SPINLOCK(ath724x_pci_lock);
static struct ath724x_pci_data *pci_data;
static int pci_data_size;
static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where, static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
int size, uint32_t *value) int size, uint32_t *value)
@ -133,37 +130,6 @@ static struct pci_controller ath724x_pci_controller = {
.mem_resource = &ath724x_mem_resource, .mem_resource = &ath724x_mem_resource,
}; };
void ath724x_pci_add_data(struct ath724x_pci_data *data, int size)
{
pci_data = data;
pci_data_size = size;
}
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
{
unsigned int devfn = dev->devfn;
int irq = -1;
if (devfn > pci_data_size - 1)
return irq;
irq = pci_data[devfn].irq;
return irq;
}
int pcibios_plat_dev_init(struct pci_dev *dev)
{
unsigned int devfn = dev->devfn;
if (devfn > pci_data_size - 1)
return PCIBIOS_DEVICE_NOT_FOUND;
dev->dev.platform_data = pci_data[devfn].pdata;
return PCIBIOS_SUCCESSFUL;
}
static int __init ath724x_pcibios_init(void) static int __init ath724x_pcibios_init(void)
{ {
register_pci_controller(&ath724x_pci_controller); register_pci_controller(&ath724x_pci_controller);