uClibc: fix ubicom32 compile error with 0.9.32

[openwrt.git] / target / linux / ramips / files / arch / mips / pci / pci-rt288x.c

diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
index 2fccd7b..475009c 100644 (file)
--- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
+++ b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
@@ -37,9 +37,6 @@
 #define RT2880_PCI_REG_SUBID           0x38
 #define RT2880_PCI_REG_ARBCTL          0x80
 
 #define RT2880_PCI_REG_SUBID           0x38
 #define RT2880_PCI_REG_ARBCTL          0x80
 

-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-

 static void __iomem *rt2880_pci_base;
 static DEFINE_SPINLOCK(rt2880_pci_lock);
 
 static void __iomem *rt2880_pci_base;
 static DEFINE_SPINLOCK(rt2880_pci_lock);
 


@@ -53,31 +50,26 @@ static void rt2880_pci_reg_write(u32 val, u32 reg)
        writel(val, rt2880_pci_base + reg);
 }
 
        writel(val, rt2880_pci_base + reg);
 }
 

-static void config_access(unsigned char access_type, struct pci_bus *bus,
-                         unsigned int devfn, unsigned char where, u32 *data)
+static inline u32 rt2880_pci_get_cfgaddr(unsigned int bus, unsigned int slot,
+                                        unsigned int func, unsigned int where)

 {
 {

-       unsigned int slot = PCI_SLOT(devfn);
-       unsigned int address;
-       u8 func = PCI_FUNC(devfn);
-
-       address = (bus->number << 16) | (slot << 11) | (func << 8) |
-                 (where & 0xfc) | 0x80000000;
-
-       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
-       if (access_type == PCI_ACCESS_WRITE)
-               rt2880_pci_reg_write(*data, RT2880_PCI_REG_CONFIG_DATA);
-       else
-               *data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
+       return ((bus << 16) | (slot << 11) | (func << 8) | (where & 0xfc) |
+               0x80000000);

 }
 
 static int rt2880_pci_config_read(struct pci_bus *bus, unsigned int devfn,
                                  int where, int size, u32 *val)
 {
        unsigned long flags;
 }
 
 static int rt2880_pci_config_read(struct pci_bus *bus, unsigned int devfn,
                                  int where, int size, u32 *val)
 {
        unsigned long flags;

-       u32 data = 0;
+       u32 address;
+       u32 data;
+
+       address = rt2880_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
+                                        PCI_FUNC(devfn), where);

 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
 
        spin_lock_irqsave(&rt2880_pci_lock, flags);

-       config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
+       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
+       data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);

        spin_unlock_irqrestore(&rt2880_pci_lock, flags);
 
        switch (size) {
        spin_unlock_irqrestore(&rt2880_pci_lock, flags);
 
        switch (size) {


@@ -99,18 +91,22 @@ static int rt2880_pci_config_write(struct pci_bus *bus, unsigned int devfn,
                                   int where, int size, u32 val)
 {
        unsigned long flags;
                                   int where, int size, u32 val)
 {
        unsigned long flags;

-       u32 data = 0;
+       u32 address;
+       u32 data;
+
+       address = rt2880_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
+                                        PCI_FUNC(devfn), where);

 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
 
        spin_lock_irqsave(&rt2880_pci_lock, flags);

+       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
+       data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);

 
        switch (size) {
        case 1:
 
        switch (size) {
        case 1:

-               config_access(PCI_ACCESS_READ, bus, devfn, where, &data);

                data = (data & ~(0xff << ((where & 3) << 3))) |
                       (val << ((where & 3) << 3));
                break;
        case 2:
                data = (data & ~(0xff << ((where & 3) << 3))) |
                       (val << ((where & 3) << 3));
                break;
        case 2:

-               config_access(PCI_ACCESS_READ, bus, devfn, where, &data);

                data = (data & ~(0xffff << ((where & 3) << 3))) |
                       (val << ((where & 3) << 3));
                break;
                data = (data & ~(0xffff << ((where & 3) << 3))) |
                       (val << ((where & 3) << 3));
                break;


@@ -119,7 +115,7 @@ static int rt2880_pci_config_write(struct pci_bus *bus, unsigned int devfn,
                break;
        }
 
                break;
        }
 

-       config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data);
+       rt2880_pci_reg_write(data, RT2880_PCI_REG_CONFIG_DATA);

        spin_unlock_irqrestore(&rt2880_pci_lock, flags);
 
        return PCIBIOS_SUCCESSFUL;
        spin_unlock_irqrestore(&rt2880_pci_lock, flags);
 
        return PCIBIOS_SUCCESSFUL;


@@ -150,31 +146,28 @@ static struct pci_controller rt2880_pci_controller = {
        .io_resource    = &rt2880_pci_mem_resource,
 };
 
        .io_resource    = &rt2880_pci_mem_resource,
 };
 

-static inline void read_config(unsigned long bus, unsigned long dev,
-                              unsigned long func, unsigned long reg,
-                              unsigned long *val)
+static inline u32 rt2880_pci_read_u32(unsigned long reg)

 {
 {

-       unsigned long address;

        unsigned long flags;
        unsigned long flags;

+       u32 address;
+       u32 ret;

 
 

-       address = (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) |
-                 0x80000000;
+       address = rt2880_pci_get_cfgaddr(0, 0, 0, reg);

 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
        rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
        rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);

-       *val = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
+       ret = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);

        spin_unlock_irqrestore(&rt2880_pci_lock, flags);
        spin_unlock_irqrestore(&rt2880_pci_lock, flags);

+
+       return ret;

 }
 
 }
 

-static inline void write_config(unsigned long bus, unsigned long dev,
-                               unsigned long func, unsigned long reg,
-                               unsigned long val)
+static inline void rt2880_pci_write_u32(unsigned long reg, u32 val)

 {
 {

-       unsigned long address;

        unsigned long flags;
        unsigned long flags;

+       u32 address;

 
 

-       address = (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) |
-                 0x80000000;
+       address = rt2880_pci_get_cfgaddr(0, 0, 0, reg);

 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
        rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
 
        spin_lock_irqsave(&rt2880_pci_lock, flags);
        rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);


@@ -185,16 +178,15 @@ static inline void write_config(unsigned long bus, unsigned long dev,
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        u16 cmd;
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        u16 cmd;

-       unsigned long val;

        int irq = -1;
 
        if (dev->bus->number != 0)
        int irq = -1;
 
        if (dev->bus->number != 0)

-               return 0;
+               return irq;

 
        switch (PCI_SLOT(dev->devfn)) {
        case 0x00:
 
        switch (PCI_SLOT(dev->devfn)) {
        case 0x00:

-               write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
-               read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);
+               rt2880_pci_write_u32(PCI_BASE_ADDRESS_0, 0x08000000);
+               (void) rt2880_pci_read_u32(PCI_BASE_ADDRESS_0);

                break;
        case 0x11:
                irq = RT288X_CPU_IRQ_PCI;
                break;
        case 0x11:
                irq = RT288X_CPU_IRQ_PCI;


@@ -220,7 +212,6 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static int __init rt2880_pci_init(void)
 {
 
 static int __init rt2880_pci_init(void)
 {

-       unsigned long val = 0;

        int i;
 
        rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
        int i;
 
        rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);


@@ -237,8 +228,9 @@ static int __init rt2880_pci_init(void)
        rt2880_pci_reg_write(0x00800001, RT2880_PCI_REG_CLASS);
        rt2880_pci_reg_write(0x28801814, RT2880_PCI_REG_SUBID);
        rt2880_pci_reg_write(0x000c0000, RT2880_PCI_REG_PCIMSK_ADDR);
        rt2880_pci_reg_write(0x00800001, RT2880_PCI_REG_CLASS);
        rt2880_pci_reg_write(0x28801814, RT2880_PCI_REG_SUBID);
        rt2880_pci_reg_write(0x000c0000, RT2880_PCI_REG_PCIMSK_ADDR);

-       write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
-       read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);
+
+       rt2880_pci_write_u32(PCI_BASE_ADDRESS_0, 0x08000000);
+       (void) rt2880_pci_read_u32(PCI_BASE_ADDRESS_0);

 
        register_pci_controller(&rt2880_pci_controller);
        return 0;
 
        register_pci_controller(&rt2880_pci_controller);
        return 0;


@@ -249,8 +241,4 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
        return 0;
 }
 
        return 0;
 }
 

-struct pci_fixup pcibios_fixups[] = {
-       {0}
-};
-

 arch_initcall(rt2880_pci_init);
 arch_initcall(rt2880_pci_init);