[ar71xx] use enum for the machine type

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / include / asm / mach-ar71xx / ar71xx.h

diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index 52531ce0fbfb3a62c7577d338d947631a71f5511..19033fc4958e32c5c98b3025e9830a6dd267a5ba 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -60,7 +60,7 @@
 #define AR91XX_WMAC_SIZE       0x30000
 
 #define AR71XX_MEM_SIZE_MIN    0x0200000
-#define AR71XX_MEM_SIZE_MAX    0x8000000
+#define AR71XX_MEM_SIZE_MAX    0x10000000
 
 #define AR71XX_CPU_IRQ_BASE    0
 #define AR71XX_MISC_IRQ_BASE   8
@@ -109,27 +109,32 @@ enum ar71xx_soc_type {
 
 extern enum ar71xx_soc_type ar71xx_soc;
 
-extern unsigned long ar71xx_mach_type;
-
-#define AR71XX_MACH_GENERIC    0
-#define AR71XX_MACH_WP543      1       /* Compex WP543 */
-#define AR71XX_MACH_RB_411     2       /* MikroTik RouterBOARD 411/411A/411AH */
-#define AR71XX_MACH_RB_433     3       /* MikroTik RouterBOARD 433/433AH */
-#define AR71XX_MACH_RB_450     4       /* MikroTik RouterBOARD 450 */
-#define AR71XX_MACH_RB_493     5       /* Mikrotik RouterBOARD 493/493AH */
-#define AR71XX_MACH_AW_NR580   6       /* AzureWave AW-NR580 */
-#define AR71XX_MACH_AP83       7       /* Atheros AP83 */
-#define AR71XX_MACH_TEW_632BRP 8       /* TRENDnet TEW-632BRP */
-#define AR71XX_MACH_UBNT_RS    9       /* Ubiquiti RouterStation */
-#define AR71XX_MACH_UBNT_LSX   10      /* Ubiquiti LSX */
-#define AR71XX_MACH_WNR2000    11      /* NETGEAR WNR2000 */
-#define AR71XX_MACH_PB42       12      /* Atheros PB42 */
-#define AR71XX_MACH_MZK_W300NH 13      /* Planex MZK-W300NH */
-#define AR71XX_MACH_MZK_W04NU  14      /* Planex MZK-W04NU */
-#define AR71XX_MACH_UBNT_LSSR71        15      /* Ubiquiti LS-SR71 */
-#define AR71XX_MACH_TL_WR941ND 16      /* TP-LINK TL-WR941ND */
-#define AR71XX_MACH_UBNT_RSPRO 17      /* Ubiquiti RouterStation Pro */
-#define AR71XX_MACH_AP81       18      /* Atheros AP81 */
+enum ar71xx_mach_type {
+       AR71XX_MACH_GENERIC = 0,
+       AR71XX_MACH_AP81,       /* Atheros AP81 */
+       AR71XX_MACH_AP83,       /* Atheros AP83 */
+       AR71XX_MACH_AW_NR580,   /* AzureWave AW-NR580 */
+       AR71XX_MACH_RB_411,     /* MikroTik RouterBOARD 411/411A/411AH */
+       AR71XX_MACH_RB_433,     /* MikroTik RouterBOARD 433/433AH */
+       AR71XX_MACH_RB_450,     /* MikroTik RouterBOARD 450 */
+       AR71XX_MACH_RB_493,     /* Mikrotik RouterBOARD 493/493AH */
+       AR71XX_MACH_PB42,       /* Atheros PB42 */
+       AR71XX_MACH_PB44,       /* Atheros PB44 */
+       AR71XX_MACH_MZK_W04NU,  /* Planex MZK-W04NU */
+       AR71XX_MACH_MZK_W300NH, /* Planex MZK-W300NH */
+       AR71XX_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */
+       AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
+       AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
+       AR71XX_MACH_UBNT_LSX,   /* Ubiquiti LSX */
+       AR71XX_MACH_UBNT_RS,    /* Ubiquiti RouterStation */
+       AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
+       AR71XX_MACH_WNR2000,    /* NETGEAR WNR2000 */
+       AR71XX_MACH_WP543,      /* Compex WP543 */
+       AR71XX_MACH_WRT160NL,   /* Linksys WRT160NL */
+       AR71XX_MACH_WRT400N,    /* Linksys WRT400N */
+};
+
+extern enum ar71xx_mach_type ar71xx_mach;
 
 /*
  * PLL block
@@ -211,15 +216,27 @@ static inline u32 ar71xx_usb_ctrl_rr(unsigned reg)
 #define GPIO_REG_INT_ENABLE    0x24
 #define GPIO_REG_FUNC          0x28
 
-#define GPIO_FUNC_STEREO_EN    BIT(17)
-#define GPIO_FUNC_SLIC_EN      BIT(16)
-#define GPIO_FUNC_SPI_CS2_EN   BIT(13)
-#define GPIO_FUNC_SPI_CS1_EN   BIT(12)
-#define GPIO_FUNC_UART_EN      BIT(8)
-#define GPIO_FUNC_USB_OC_EN    BIT(4)
-#define GPIO_FUNC_USB_CLK_EN   BIT(0)
+#define AR71XX_GPIO_FUNC_STEREO_EN     BIT(17)
+#define AR71XX_GPIO_FUNC_SLIC_EN       BIT(16)
+#define AR71XX_GPIO_FUNC_SPI_CS2_EN    BIT(13)
+#define AR71XX_GPIO_FUNC_SPI_CS1_EN    BIT(12)
+#define AR71XX_GPIO_FUNC_UART_EN       BIT(8)
+#define AR71XX_GPIO_FUNC_USB_OC_EN     BIT(4)
+#define AR71XX_GPIO_FUNC_USB_CLK_EN    BIT(0)
 
 #define AR71XX_GPIO_COUNT      16
+
+#define AR91XX_GPIO_FUNC_WMAC_LED_EN   BIT(22)
+#define AR91XX_GPIO_FUNC_EXP_PORT_CS_EN        BIT(21)
+#define AR91XX_GPIO_FUNC_I2S_REFCLKEN  BIT(20)
+#define AR91XX_GPIO_FUNC_I2S_MCKEN     BIT(19)
+#define AR91XX_GPIO_FUNC_I2S1_EN       BIT(18)
+#define AR91XX_GPIO_FUNC_I2S0_EN       BIT(17)
+#define AR91XX_GPIO_FUNC_SLIC_EN       BIT(16)
+#define AR91XX_GPIO_FUNC_UART_RTSCTS_EN        BIT(9)
+#define AR91XX_GPIO_FUNC_UART_EN       BIT(8)
+#define AR91XX_GPIO_FUNC_USB_CLK_EN    BIT(4)
+
 #define AR91XX_GPIO_COUNT      22
 
 extern void __iomem *ar71xx_gpio_base;
@@ -234,9 +251,9 @@ static inline u32 ar71xx_gpio_rr(unsigned reg)
        return __raw_readl(ar71xx_gpio_base + reg);
 }
 
-extern void ar71xx_gpio_init(void) __init;
-extern void ar71xx_gpio_function_enable(u32 mask);
-extern void ar71xx_gpio_function_disable(u32 mask);
+void ar71xx_gpio_init(void) __init;
+void ar71xx_gpio_function_enable(u32 mask);
+void ar71xx_gpio_function_disable(u32 mask);
 
 /*
  * DDR_CTRL block
@@ -280,7 +297,7 @@ static inline u32 ar71xx_ddr_rr(unsigned reg)
        return __raw_readl(ar71xx_ddr_base + reg);
 }
 
-extern void ar71xx_ddr_flush(u32 reg);
+void ar71xx_ddr_flush(u32 reg);
 
 /*
  * PCI block
@@ -395,8 +412,8 @@ static inline u32 ar71xx_reset_rr(unsigned reg)
        return __raw_readl(ar71xx_reset_base + reg);
 }
 
-extern void ar71xx_device_stop(u32 mask);
-extern void ar71xx_device_start(u32 mask);
+void ar71xx_device_stop(u32 mask);
+void ar71xx_device_start(u32 mask);
 
 /*
  * SPI block
@@ -419,6 +436,9 @@ extern void ar71xx_device_start(u32 mask);
 #define SPI_IOC_CS2            SPI_IOC_CS(2)
 #define SPI_IOC_CS_ALL         (SPI_IOC_CS0 | SPI_IOC_CS1 | SPI_IOC_CS2)
 
+void ar71xx_flash_acquire(void);
+void ar71xx_flash_release(void);
+
 /*
  * MII_CTRL block
  */