Add support for creating VMware vmdk images #1317

[openwrt.git] / target / linux / adm5120 / files / include / asm-mips / mach-adm5120 / adm5120_switch.h

diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h
index f96c7d5..91adc5b 100644 (file)
--- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h
+++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h
@@ -1,40 +1,29 @@
 /*
 /*

- *  $Id$
- *

  *  ADM5120 ethernet switch definitions
  *
  *  This header file defines the hardware registers of the ADM5120 SoC
  *  built-in Ethernet switch.
  *
  *  ADM5120 ethernet switch definitions
  *
  *  This header file defines the hardware registers of the ADM5120 SoC
  *  built-in Ethernet switch.
  *

- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>

  *
  *

- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.

  *
  *

- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.

  */
 
  */
 

-#ifndef _ADM5120_SWITCH_H_
-#define _ADM5120_SWITCH_H_
+#ifndef _MACH_ADM5120_SWITCH_H
+#define _MACH_ADM5120_SWITCH_H

 
 

-#define BIT(at)                (1 << (at))
-#define BITMASK(len)   ((1 << (len))-1)
+#ifndef BIT
+#  define BIT(at)      (1 << (at))
+#endif
+#define BITMASK(len)   (BIT(len)-1)

 
 #define SW_READ_REG(r)         __raw_readl( \
 
 #define SW_READ_REG(r)         __raw_readl( \

-       (void __iomem *)KSEG1ADDR(ADM5120_SWITCH_BASE) + SWITCH_REG_ ## r)
+       (void __iomem *)KSEG1ADDR(ADM5120_SWITCH_BASE) + r)

 #define SW_WRITE_REG(r, v)     __raw_writel((v), \
 #define SW_WRITE_REG(r, v)     __raw_writel((v), \

-       (void __iomem *)KSEG1ADDR(ADM5120_SWITCH_BASE) + SWITCH_REG_ ## r)
+       (void __iomem *)KSEG1ADDR(ADM5120_SWITCH_BASE) + r)

 
 /* Switch register offsets */
 #define SWITCH_REG_CODE                0x0000
 
 /* Switch register offsets */
 #define SWITCH_REG_CODE                0x0000


@@ -308,4 +297,4 @@
 #define LED1_IV_SHIFT          13      /* LED1 input value shift */
 #define LED2_IV_SHIFT          14      /* LED2 input value shift */
 
 #define LED1_IV_SHIFT          13      /* LED1 input value shift */
 #define LED2_IV_SHIFT          14      /* LED2 input value shift */
 

-#endif /* _ADM5120_SWITCH_H_ */
+#endif /* _MACH_ADM5120_SWITCH_H */