#define AR71XX_MISC_IRQ_BASE 8
#define AR71XX_MISC_IRQ_COUNT 8
#define AR71XX_GPIO_IRQ_BASE 16
-#define AR71XX_GPIO_IRQ_COUNT 16
-#define AR71XX_PCI_IRQ_BASE 32
-#define AR71XX_PCI_IRQ_COUNT 4
+#define AR71XX_GPIO_IRQ_COUNT 32
+#define AR71XX_PCI_IRQ_BASE 48
+#define AR71XX_PCI_IRQ_COUNT 8
#define AR71XX_CPU_IRQ_PCI (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_WMAC (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_PCI_IRQ_DEV0 (AR71XX_PCI_IRQ_BASE + 0)
#define AR71XX_PCI_IRQ_DEV1 (AR71XX_PCI_IRQ_BASE + 1)
#define AR71XX_PCI_IRQ_DEV2 (AR71XX_PCI_IRQ_BASE + 2)
-#define AR71XX_PCI_IRQ_CORE (AR71XX_PCI_IRQ_BASE + 3)
+#define AR71XX_PCI_IRQ_CORE (AR71XX_PCI_IRQ_BASE + 4)
extern u32 ar71xx_ahb_freq;
extern u32 ar71xx_cpu_freq;
AR71XX_SOC_AR7130,
AR71XX_SOC_AR7141,
AR71XX_SOC_AR7161,
+ AR71XX_SOC_AR7240,
AR71XX_SOC_AR9130,
AR71XX_SOC_AR9132
};
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 */
-#define AR71XX_MACH_WRT400N 19 /* Linksys WRT400N */
+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
#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;
#define RESET_MODULE_PCI_BUS BIT(1)
#define RESET_MODULE_PCI_CORE BIT(0)
-#define REV_ID_MASK 0xff
-#define REV_ID_CHIP_MASK 0xf3
-#define REV_ID_CHIP_AR7130 0xa0
-#define REV_ID_CHIP_AR7141 0xa1
-#define REV_ID_CHIP_AR7161 0xa2
-#define REV_ID_CHIP_AR9130 0xb0
-#define REV_ID_CHIP_AR9132 0xb1
+#define REV_ID_MAJOR_MASK 0xf0
+#define REV_ID_MAJOR_AR71XX 0xa0
+#define REV_ID_MAJOR_AR913X 0xb0
+#define REV_ID_MAJOR_AR724X 0xc0
-#define REV_ID_REVISION_MASK 0x3
-#define REV_ID_REVISION_SHIFT 2
+#define AR71XX_REV_ID_MINOR_MASK 0x3
+#define AR71XX_REV_ID_MINOR_AR7130 0x0
+#define AR71XX_REV_ID_MINOR_AR7141 0x1
+#define AR71XX_REV_ID_MINOR_AR7161 0x2
+#define AR71XX_REV_ID_REVISION_MASK 0x3
+#define AR71XX_REV_ID_REVISION_SHIFT 2
+
+#define AR91XX_REV_ID_MINOR_MASK 0x3
+#define AR91XX_REV_ID_MINOR_AR9130 0x0
+#define AR91XX_REV_ID_MINOR_AR9132 0x1
+#define AR91XX_REV_ID_REVISION_MASK 0x3
+#define AR91XX_REV_ID_REVISION_SHIFT 2
+
+#define AR724X_REV_ID_REVISION_MASK 0x3
extern void __iomem *ar71xx_reset_base;
#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
*/