Skip to content

Commit

Permalink
MIPS: ath79: replace ath724x to ar724x
Browse files Browse the repository at this point in the history 
Replace the 'ath724x' to 'ar724x' in function, variable and
structure names to reflect the name of the real SoC.

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/3490/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Gabor Juhos authored and Ralf Baechle committed May 15, 2012
1 parent 692183e commit d624bd3
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions arch/mips/ath79/mach-ubnt-xm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static struct ath79_spi_platform_data ubnt_xm_spi_data = {
#ifdef CONFIG_PCI
static struct ath9k_platform_data ubnt_xm_eeprom_data;

static struct ath724x_pci_data ubnt_xm_pci_data[] = {
static struct ar724x_pci_data ubnt_xm_pci_data[] = {
{
.irq = UBNT_XM_PCI_IRQ,
.pdata = &ubnt_xm_eeprom_data,
Expand All @@ -108,7 +108,7 @@ static void __init ubnt_xm_init(void)
memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
sizeof(ubnt_xm_eeprom_data.eeprom_data));

ath724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));
ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));
#endif /* CONFIG_PCI */

ath79_register_pci();
Expand Down
6 changes: 3 additions & 3 deletions arch/mips/ath79/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#include <asm/mach-ath79/pci.h>
#include "pci.h"

static struct ath724x_pci_data *pci_data;
static struct ar724x_pci_data *pci_data;
static int pci_data_size;

void ath724x_pci_add_data(struct ath724x_pci_data *data, int size)
void ar724x_pci_add_data(struct ar724x_pci_data *data, int size)
{
pci_data = data;
pci_data_size = size;
Expand Down Expand Up @@ -50,7 +50,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
int __init ath79_register_pci(void)
{
if (soc_is_ar724x())
return ath724x_pcibios_init();
return ar724x_pcibios_init();

return -ENODEV;
}
10 changes: 5 additions & 5 deletions arch/mips/ath79/pci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
* by the Free Software Foundation.
*/

#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H
#define __ASM_MACH_ATH79_PCI_ATH724X_H
#ifndef _ATH79_PCI_H
#define _ATH79_PCI_H

struct ath724x_pci_data {
struct ar724x_pci_data {
int irq;
void *pdata;
};

void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);
void ar724x_pci_add_data(struct ar724x_pci_data *data, int size);

#ifdef CONFIG_PCI
int ath79_register_pci(void);
#else
static inline int ath79_register_pci(void) { return 0; }
#endif

#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */
#endif /* _ATH79_PCI_H */
4 changes: 2 additions & 2 deletions arch/mips/include/asm/mach-ath79/pci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#define __ASM_MACH_ATH79_PCI_H

#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X)
int ath724x_pcibios_init(void);
int ar724x_pcibios_init(void);
#else
static inline int ath724x_pcibios_init(void) { return 0; }
static inline int ar724x_pcibios_init(void) { return 0; }
#endif

#endif /* __ASM_MACH_ATH79_PCI_H */
62 changes: 31 additions & 31 deletions arch/mips/pci/pci-ar724x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys))
#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))

#define ATH724X_PCI_DEV_BASE 0x14000000
#define ATH724X_PCI_MEM_BASE 0x10000000
#define ATH724X_PCI_MEM_SIZE 0x08000000
#define AR724X_PCI_DEV_BASE 0x14000000
#define AR724X_PCI_MEM_BASE 0x10000000
#define AR724X_PCI_MEM_SIZE 0x08000000

static DEFINE_SPINLOCK(ath724x_pci_lock);
static DEFINE_SPINLOCK(ar724x_pci_lock);

static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
int size, uint32_t *value)
{
unsigned long flags, addr, tval, mask;
Expand All @@ -31,38 +31,38 @@ static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
if (where & (size - 1))
return PCIBIOS_BAD_REGISTER_NUMBER;

spin_lock_irqsave(&ath724x_pci_lock, flags);
spin_lock_irqsave(&ar724x_pci_lock, flags);

switch (size) {
case 1:
addr = where & ~3;
mask = 0xff000000 >> ((where % 4) * 8);
tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
tval = reg_read(AR724X_PCI_DEV_BASE + addr);
tval = tval & ~mask;
*value = (tval >> ((4 - (where % 4))*8));
break;
case 2:
addr = where & ~3;
mask = 0xffff0000 >> ((where % 4)*8);
tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
tval = reg_read(AR724X_PCI_DEV_BASE + addr);
tval = tval & ~mask;
*value = (tval >> ((4 - (where % 4))*8));
break;
case 4:
*value = reg_read(ATH724X_PCI_DEV_BASE + where);
*value = reg_read(AR724X_PCI_DEV_BASE + where);
break;
default:
spin_unlock_irqrestore(&ath724x_pci_lock, flags);
spin_unlock_irqrestore(&ar724x_pci_lock, flags);

return PCIBIOS_BAD_REGISTER_NUMBER;
}

spin_unlock_irqrestore(&ath724x_pci_lock, flags);
spin_unlock_irqrestore(&ar724x_pci_lock, flags);

return PCIBIOS_SUCCESSFUL;
}

static int ath724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
int size, uint32_t value)
{
unsigned long flags, tval, addr, mask;
Expand All @@ -73,67 +73,67 @@ static int ath724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
if (where & (size - 1))
return PCIBIOS_BAD_REGISTER_NUMBER;

spin_lock_irqsave(&ath724x_pci_lock, flags);
spin_lock_irqsave(&ar724x_pci_lock, flags);

switch (size) {
case 1:
addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
addr = (AR724X_PCI_DEV_BASE + where) & ~3;
mask = 0xff000000 >> ((where % 4)*8);
tval = reg_read(addr);
tval = tval & ~mask;
tval |= (value << ((4 - (where % 4))*8)) & mask;
reg_write(addr, tval);
break;
case 2:
addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
addr = (AR724X_PCI_DEV_BASE + where) & ~3;
mask = 0xffff0000 >> ((where % 4)*8);
tval = reg_read(addr);
tval = tval & ~mask;
tval |= (value << ((4 - (where % 4))*8)) & mask;
reg_write(addr, tval);
break;
case 4:
reg_write((ATH724X_PCI_DEV_BASE + where), value);
reg_write((AR724X_PCI_DEV_BASE + where), value);
break;
default:
spin_unlock_irqrestore(&ath724x_pci_lock, flags);
spin_unlock_irqrestore(&ar724x_pci_lock, flags);

return PCIBIOS_BAD_REGISTER_NUMBER;
}

spin_unlock_irqrestore(&ath724x_pci_lock, flags);
spin_unlock_irqrestore(&ar724x_pci_lock, flags);

return PCIBIOS_SUCCESSFUL;
}

static struct pci_ops ath724x_pci_ops = {
.read = ath724x_pci_read,
.write = ath724x_pci_write,
static struct pci_ops ar724x_pci_ops = {
.read = ar724x_pci_read,
.write = ar724x_pci_write,
};

static struct resource ath724x_io_resource = {
static struct resource ar724x_io_resource = {
.name = "PCI IO space",
.start = 0,
.end = 0,
.flags = IORESOURCE_IO,
};

static struct resource ath724x_mem_resource = {
static struct resource ar724x_mem_resource = {
.name = "PCI memory space",
.start = ATH724X_PCI_MEM_BASE,
.end = ATH724X_PCI_MEM_BASE + ATH724X_PCI_MEM_SIZE - 1,
.start = AR724X_PCI_MEM_BASE,
.end = AR724X_PCI_MEM_BASE + AR724X_PCI_MEM_SIZE - 1,
.flags = IORESOURCE_MEM,
};

static struct pci_controller ath724x_pci_controller = {
.pci_ops = &ath724x_pci_ops,
.io_resource = &ath724x_io_resource,
.mem_resource = &ath724x_mem_resource,
static struct pci_controller ar724x_pci_controller = {
.pci_ops = &ar724x_pci_ops,
.io_resource = &ar724x_io_resource,
.mem_resource = &ar724x_mem_resource,
};

int __init ath724x_pcibios_init(void)
int __init ar724x_pcibios_init(void)
{
register_pci_controller(&ath724x_pci_controller);
register_pci_controller(&ar724x_pci_controller);

return PCIBIOS_SUCCESSFUL;
}

0 comments on commit d624bd3

Please sign in to comment.