arm: mach-orion5x: use plus instead of or for address definitions

Browse source

Since we are going to use IOMEM() to define many base virtual
addresses, we can no longer use binary or to define the individual
register addresses ("binary or" arithmetic on pointers is not
allowed). Instead, use the more conventional plus operator to do so.

The binary or operators were actually not useful because the low-order
bits of the base address were always zero, so the usage of the binary
or operators was effectively identical to a plus operator.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

...

This commit is contained in:

Thomas Petazzoni 2012-09-11 14:27:17 +02:00 • committed by Jason Cooper

parent 5ae9f5dbb3

commit 2332656aec

3 changed files with 37 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

arch/arm/mach-orion5x/include/mach/bridge-regs.h

View file

52

arch/arm/mach-orion5x/include/mach/orion5x.h

View file

2

arch/arm/mach-orion5x/pci.c

View file