Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 104807
b: refs/heads/master
c: 7e1cc9c
h: refs/heads/master
i:
  104805: e6b4a3d
  104803: 89d13c1
  104799: 14587ce
v: v3
  • Loading branch information
Andy Fleming authored and Kumar Gala committed Jul 16, 2008
1 parent 7eb09ce commit db2ef3d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4cd7e1cbd43bb67927af2b8b4e0ffd43fd5ed6b4
refs/heads/master: 7e1cc9c55a2a4af62f30fade62fb612a243def39
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/sysdev/qe_lib/qe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static phys_addr_t qebase = -1;
phys_addr_t get_qe_base(void)
{
struct device_node *qe;
unsigned int size;
int size;
const u32 *prop;

if (qebase != -1)
Expand Down Expand Up @@ -158,7 +158,7 @@ static unsigned int brg_clk = 0;
unsigned int qe_get_brg_clk(void)
{
struct device_node *qe;
unsigned int size;
int size;
const u32 *prop;

if (brg_clk)
Expand Down Expand Up @@ -305,7 +305,7 @@ EXPORT_SYMBOL(qe_put_snum);

static int qe_sdma_init(void)
{
struct sdma *sdma = &qe_immr->sdma;
struct sdma __iomem *sdma = &qe_immr->sdma;
unsigned long sdma_buf_offset;

if (!sdma)
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/sysdev/qe_lib/ucc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
return 0;
}

static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
static void get_cmxucr_reg(unsigned int ucc_num, __be32 __iomem **cmxucr,
unsigned int *reg_num, unsigned int *shift)
{
unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
Expand All @@ -100,7 +100,7 @@ static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,

int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
{
__be32 *cmxucr;
__be32 __iomem *cmxucr;
unsigned int reg_num;
unsigned int shift;

Expand All @@ -121,7 +121,7 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
enum comm_dir mode)
{
__be32 *cmxucr;
__be32 __iomem *cmxucr;
unsigned int reg_num;
unsigned int shift;
u32 clock_bits = 0;
Expand Down
16 changes: 8 additions & 8 deletions trunk/arch/powerpc/sysdev/qe_lib/ucc_fast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->uccs, uccf->uf_regs->uccs);
&uccf->uf_regs->uccs, in_8(&uccf->uf_regs->uccs));
printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n",
Expand All @@ -68,7 +68,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->guemr, uccf->uf_regs->guemr);
&uccf->uf_regs->guemr, in_8(&uccf->uf_regs->guemr));
}
EXPORT_SYMBOL(ucc_fast_dump_regs);

Expand Down Expand Up @@ -96,7 +96,7 @@ EXPORT_SYMBOL(ucc_fast_transmit_on_demand);

void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
{
struct ucc_fast *uf_regs;
struct ucc_fast __iomem *uf_regs;
u32 gumr;

uf_regs = uccf->uf_regs;
Expand All @@ -117,7 +117,7 @@ EXPORT_SYMBOL(ucc_fast_enable);

void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
{
struct ucc_fast *uf_regs;
struct ucc_fast __iomem *uf_regs;
u32 gumr;

uf_regs = uccf->uf_regs;
Expand All @@ -139,7 +139,7 @@ EXPORT_SYMBOL(ucc_fast_disable);
int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret)
{
struct ucc_fast_private *uccf;
struct ucc_fast *uf_regs;
struct ucc_fast __iomem *uf_regs;
u32 gumr;
int ret;

Expand Down Expand Up @@ -216,10 +216,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
uccf->stopped_tx = 0;
uccf->stopped_rx = 0;
uf_regs = uccf->uf_regs;
uccf->p_ucce = (u32 *) & (uf_regs->ucce);
uccf->p_uccm = (u32 *) & (uf_regs->uccm);
uccf->p_ucce = &uf_regs->ucce;
uccf->p_uccm = &uf_regs->uccm;
#ifdef CONFIG_UGETH_TX_ON_DEMAND
uccf->p_utodr = (u16 *) & (uf_regs->utodr);
uccf->p_utodr = &uf_regs->utodr;
#endif
#ifdef STATISTICS
uccf->tx_frames = 0;
Expand Down
8 changes: 4 additions & 4 deletions trunk/include/asm-powerpc/ucc_fast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ struct ucc_fast_info {

struct ucc_fast_private {
struct ucc_fast_info *uf_info;
struct ucc_fast *uf_regs; /* a pointer to memory map of UCC regs. */
u32 *p_ucce; /* a pointer to the event register in memory. */
u32 *p_uccm; /* a pointer to the mask register in memory. */
struct ucc_fast __iomem *uf_regs; /* a pointer to the UCC regs. */
u32 __iomem *p_ucce; /* a pointer to the event register in memory. */
u32 __iomem *p_uccm; /* a pointer to the mask register in memory. */
#ifdef CONFIG_UGETH_TX_ON_DEMAND
u16 *p_utodr; /* pointer to the transmit on demand register */
u16 __iomem *p_utodr; /* pointer to the transmit on demand register */
#endif
int enabled_tx; /* Whether channel is enabled for Tx (ENT) */
int enabled_rx; /* Whether channel is enabled for Rx (ENR) */
Expand Down

0 comments on commit db2ef3d

Please sign in to comment.