Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40355
b: refs/heads/master
c: 452976b
h: refs/heads/master
i:
  40353: b9df9cf
  40351: e40f844
v: v3
  • Loading branch information
Haavard Skinnemoen authored and Linus Torvalds committed Oct 26, 2006
1 parent d9a231a commit fbb4642
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d68041cc9fde550fe6b6a6de1d7a110daff3cb60
refs/heads/master: 452976b29864f9adcdd6d4ea81001aa5483592c2
4 changes: 2 additions & 2 deletions trunk/arch/avr32/mach-at32ap/hsmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@

/* Register access macros */
#define hsmc_readl(port,reg) \
readl((port)->regs + HSMC_##reg)
__raw_readl((port)->regs + HSMC_##reg)
#define hsmc_writel(port,reg,value) \
writel((value), (port)->regs + HSMC_##reg)
__raw_writel((value), (port)->regs + HSMC_##reg)

#endif /* __ASM_AVR32_HSMC_H__ */
6 changes: 4 additions & 2 deletions trunk/arch/avr32/mach-at32ap/intc.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@
#define INTC_MKBF(name, value) (((value) & ((1 << INTC_##name##_SIZE) - 1)) << INTC_##name##_OFFSET)
#define INTC_GETBF(name, value) (((value) >> INTC_##name##_OFFSET) & ((1 << INTC_##name##_SIZE) - 1))

#define intc_readl(port,reg) readl((port)->regs + INTC_##reg)
#define intc_writel(port,reg,value) writel((value), (port)->regs + INTC_##reg)
#define intc_readl(port,reg) \
__raw_readl((port)->regs + INTC_##reg)
#define intc_writel(port,reg,value) \
__raw_writel((value), (port)->regs + INTC_##reg)

#endif /* __ASM_AVR32_PERIHP_INTC_H__ */
6 changes: 4 additions & 2 deletions trunk/arch/avr32/mach-at32ap/pio.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,10 @@
#define PIO_BFINS(name,value,old) (((old) & ~(((1 << PIO_##name##_SIZE) - 1) << PIO_##name##_OFFSET)) | PIO_BF(name,value))

/* Register access macros */
#define pio_readl(port,reg) readl((port)->regs + PIO_##reg)
#define pio_writel(port,reg,value) writel((value), (port)->regs + PIO_##reg)
#define pio_readl(port,reg) \
__raw_readl((port)->regs + PIO_##reg)
#define pio_writel(port,reg,value) \
__raw_writel((value), (port)->regs + PIO_##reg)

void at32_init_pio(struct platform_device *pdev);

Expand Down
6 changes: 4 additions & 2 deletions trunk/arch/avr32/mach-at32ap/sm.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@
#define SM_BFINS(name,value,old) (((old) & ~(((1 << SM_##name##_SIZE) - 1) << SM_##name##_OFFSET)) | SM_BF(name,value))

/* Register access macros */
#define sm_readl(port,reg) readl((port)->regs + SM_##reg)
#define sm_writel(port,reg,value) writel((value), (port)->regs + SM_##reg)
#define sm_readl(port,reg) \
__raw_readl((port)->regs + SM_##reg)
#define sm_writel(port,reg,value) \
__raw_writel((value), (port)->regs + SM_##reg)

#endif /* __ASM_AVR32_SM_H__ */

0 comments on commit fbb4642

Please sign in to comment.