Skip to content

Commit

Permalink
* use 'unsigned long' as address supplied to au_write[bwl]()
Browse files Browse the repository at this point in the history 
* remove two already unused and commented structures
* added an ULL suffix to several address constants that use bits 35-32

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Pete Popov authored and Ralf Baechle committed Oct 29, 2005
1 parent 9447cbf commit 7de8d23
Showing 1 changed file with 32 additions and 95 deletions.
127 changes: 32 additions & 95 deletions include/asm-mips/mach-au1x00/au1000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,34 +60,34 @@ void static inline au_sync_delay(int ms)
mdelay(ms);
}

void static inline au_writeb(u8 val, int reg)
void static inline au_writeb(u8 val, unsigned long reg)
{
*(volatile u8 *)(reg) = val;
}

void static inline au_writew(u16 val, int reg)
void static inline au_writew(u16 val, unsigned long reg)
{
*(volatile u16 *)(reg) = val;
}

void static inline au_writel(u32 val, int reg)
void static inline au_writel(u32 val, unsigned long reg)
{
*(volatile u32 *)(reg) = val;
}

static inline u8 au_readb(unsigned long port)
static inline u8 au_readb(unsigned long reg)
{
return (*(volatile u8 *)port);
return (*(volatile u8 *)reg);
}

static inline u16 au_readw(unsigned long port)
static inline u16 au_readw(unsigned long reg)
{
return (*(volatile u16 *)port);
return (*(volatile u16 *)reg);
}

static inline u32 au_readl(unsigned long port)
static inline u32 au_readl(unsigned long reg)
{
return (*(volatile u32 *)port);
return (*(volatile u32 *)reg);
}

/* These next three functions should be a generic part of the MIPS
Expand Down Expand Up @@ -181,26 +181,6 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define MEM_SDSLEEP (0x0030)
#define MEM_SDSMCKE (0x0034)

#ifndef ASSEMBLER
/*typedef volatile struct
{
uint32 sdmode0;
uint32 sdmode1;
uint32 sdmode2;
uint32 sdaddr0;
uint32 sdaddr1;
uint32 sdaddr2;
uint32 sdrefcfg;
uint32 sdautoref;
uint32 sdwrmd0;
uint32 sdwrmd1;
uint32 sdwrmd2;
uint32 sdsleep;
uint32 sdsmcke;
} AU1X00_SDRAM;*/
#endif

/*
* MEM_SDMODE register content definitions
*/
Expand Down Expand Up @@ -286,49 +266,6 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define MEM_SDSREF (0x08D0)
#define MEM_SDSLEEP MEM_SDSREF

#ifndef ASSEMBLER
/*typedef volatile struct
{
uint32 sdmode0;
uint32 reserved0;
uint32 sdmode1;
uint32 reserved1;
uint32 sdmode2;
uint32 reserved2[3];
uint32 sdaddr0;
uint32 reserved3;
uint32 sdaddr1;
uint32 reserved4;
uint32 sdaddr2;
uint32 reserved5[3];
uint32 sdconfiga;
uint32 reserved6;
uint32 sdconfigb;
uint32 reserved7;
uint32 sdstat;
uint32 reserved8;
uint32 sderraddr;
uint32 reserved9;
uint32 sdstride0;
uint32 reserved10;
uint32 sdstride1;
uint32 reserved11;
uint32 sdstride2;
uint32 reserved12[3];
uint32 sdwrmd0;
uint32 reserved13;
uint32 sdwrmd1;
uint32 reserved14;
uint32 sdwrmd2;
uint32 reserved15[11];
uint32 sdprecmd;
uint32 reserved16;
uint32 sdautoref;
uint32 reserved17;
uint32 sdsref;
} AU1550_SDRAM;*/
#endif
#endif

/*
Expand Down Expand Up @@ -365,9 +302,9 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define SSI0_PHYS_ADDR 0x11600000
#define SSI1_PHYS_ADDR 0x11680000
#define SYS_PHYS_ADDR 0x11900000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000ULL
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000ULL
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000ULL
#endif

/********************************************************************/
Expand Down Expand Up @@ -399,13 +336,13 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define UART3_PHYS_ADDR 0x11400000
#define GPIO2_PHYS_ADDR 0x11700000
#define SYS_PHYS_ADDR 0x11900000
#define PCI_MEM_PHYS_ADDR 0x400000000
#define PCI_IO_PHYS_ADDR 0x500000000
#define PCI_CONFIG0_PHYS_ADDR 0x600000000
#define PCI_CONFIG1_PHYS_ADDR 0x680000000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000
#define PCI_MEM_PHYS_ADDR 0x400000000ULL
#define PCI_IO_PHYS_ADDR 0x500000000ULL
#define PCI_CONFIG0_PHYS_ADDR 0x600000000ULL
#define PCI_CONFIG1_PHYS_ADDR 0x680000000ULL
#define PCMCIA_IO_PHYS_ADDR 0xF00000000ULL
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000ULL
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000ULL
#endif

/********************************************************************/
Expand Down Expand Up @@ -442,9 +379,9 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define GPIO2_PHYS_ADDR 0x11700000
#define SYS_PHYS_ADDR 0x11900000
#define LCD_PHYS_ADDR 0x15000000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000ULL
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000ULL
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000ULL
#endif

/***********************************************************************/
Expand Down Expand Up @@ -473,13 +410,13 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define PSC1_PHYS_ADDR 0x11B00000
#define PSC2_PHYS_ADDR 0x10A00000
#define PSC3_PHYS_ADDR 0x10B00000
#define PCI_MEM_PHYS_ADDR 0x400000000
#define PCI_IO_PHYS_ADDR 0x500000000
#define PCI_CONFIG0_PHYS_ADDR 0x600000000
#define PCI_CONFIG1_PHYS_ADDR 0x680000000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000
#define PCI_MEM_PHYS_ADDR 0x400000000ULL
#define PCI_IO_PHYS_ADDR 0x500000000ULL
#define PCI_CONFIG0_PHYS_ADDR 0x600000000ULL
#define PCI_CONFIG1_PHYS_ADDR 0x680000000ULL
#define PCMCIA_IO_PHYS_ADDR 0xF00000000ULL
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000ULL
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000ULL
#endif

/***********************************************************************/
Expand All @@ -500,15 +437,15 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
#define DDMA_PHYS_ADDR 0x14002000
#define PSC0_PHYS_ADDR 0x11A00000
#define PSC1_PHYS_ADDR 0x11B00000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000
#define SD0_PHYS_ADDR 0x10600000
#define SD1_PHYS_ADDR 0x10680000
#define LCD_PHYS_ADDR 0x15000000
#define SWCNT_PHYS_ADDR 0x1110010C
#define MAEFE_PHYS_ADDR 0x14012000
#define MAEBE_PHYS_ADDR 0x14010000
#define PCMCIA_IO_PHYS_ADDR 0xF00000000ULL
#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000ULL
#define PCMCIA_MEM_PHYS_ADDR 0xF80000000ULL
#endif


Expand Down

0 comments on commit 7de8d23

Please sign in to comment.