ar71xx: merge AR71XX_IRQ_CPU_{PCI,WMAC} into AR71XX_IRQ_CPU_IP2

[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 7f61c1440353578033c807506bff3203ed49b4ef..8ac5598ce3b3b015fe93e1546f18433ba5e2a463 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
@@ -79,8 +79,7 @@
 #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_CPU_IRQ_IP2     (AR71XX_CPU_IRQ_BASE + 2)
 #define AR71XX_CPU_IRQ_USB     (AR71XX_CPU_IRQ_BASE + 3)
 #define AR71XX_CPU_IRQ_GE0     (AR71XX_CPU_IRQ_BASE + 4)
 #define AR71XX_CPU_IRQ_GE1     (AR71XX_CPU_IRQ_BASE + 5)
@@ -119,42 +118,6 @@ enum ar71xx_soc_type {
 
 extern enum ar71xx_soc_type ar71xx_soc;
 
-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_DIR_825_B1, /* D-Link DIR-825 rev. B1 */
-       AR71XX_MACH_RB_411,     /* MikroTik RouterBOARD 411/411A/411AH */
-       AR71XX_MACH_RB_411U,    /* MikroTik RouterBOARD 411U */
-       AR71XX_MACH_RB_433,     /* MikroTik RouterBOARD 433/433AH */
-       AR71XX_MACH_RB_433U,    /* MikroTik RouterBOARD 433UAH */
-       AR71XX_MACH_RB_450,     /* MikroTik RouterBOARD 450 */
-       AR71XX_MACH_RB_450G,    /* MikroTik RouterBOARD 450G */
-       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_WR741ND, /* TP-LINK TL-WR741ND */
-       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_UBNT_BULLET_M, /* Ubiquiti Bullet M */
-       AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
-       AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
-       AR71XX_MACH_WNR2000,    /* NETGEAR WNR2000 */
-       AR71XX_MACH_WNDR3700,   /* NETGEAR WNDR3700 */
-       AR71XX_MACH_WP543,      /* Compex WP543 */
-       AR71XX_MACH_WRT160NL,   /* Linksys WRT160NL */
-       AR71XX_MACH_WRT400N,    /* Linksys WRT400N */
-};
-
-extern enum ar71xx_mach_type ar71xx_mach;
-
 /*
  * PLL block
  */
@@ -176,6 +139,7 @@ extern enum ar71xx_mach_type ar71xx_mach;
 #define AR71XX_ETH1_PLL_SHIFT          19
 
 #define AR724X_PLL_REG_CPU_CONFIG      0x00
+#define AR724X_PLL_REG_PCIE_CONFIG     0x18
 
 #define AR724X_PLL_DIV_SHIFT           0
 #define AR724X_PLL_DIV_MASK            0x3ff
@@ -304,6 +268,7 @@ static inline u32 ar71xx_gpio_rr(unsigned reg)
 void ar71xx_gpio_init(void) __init;
 void ar71xx_gpio_function_enable(u32 mask);
 void ar71xx_gpio_function_disable(u32 mask);
+void ar71xx_gpio_function_setup(u32 set, u32 clear);
 
 /*
  * DDR_CTRL block
@@ -382,15 +347,29 @@ void ar71xx_ddr_flush(u32 reg);
 #define AR724X_PCI_CFG_BASE    (AR71XX_PCI_MEM_BASE + 0x4000000)
 #define AR724X_PCI_CFG_SIZE    0x1000
 
+#define AR724X_PCI_REG_APP             0x00
+#define AR724X_PCI_REG_RESET           0x18
 #define AR724X_PCI_REG_INT_STATUS      0x4c
 #define AR724X_PCI_REG_INT_MASK                0x50
 
+#define AR724X_PCI_APP_LTSSM_ENABLE    BIT(0)
+
 #define AR724X_PCI_INT_DEV0            BIT(14)
 
 static inline void ar724x_pci_wr(unsigned reg, u32 val)
 {
        void __iomem *base;
 
+       base = ioremap_nocache(AR724X_PCI_CTRL_BASE, AR724X_PCI_CTRL_SIZE);
+       __raw_writel(val, base + reg);
+       (void) __raw_readl(base + reg);
+       iounmap(base);
+}
+
+static inline void ar724x_pci_wr_nf(unsigned reg, u32 val)
+{
+       void __iomem *base;
+
        base = ioremap_nocache(AR724X_PCI_CTRL_BASE, AR724X_PCI_CTRL_SIZE);
        __raw_writel(val, base + reg);
        iounmap(base);
@@ -475,6 +454,10 @@ static inline u32 ar724x_pci_rr(unsigned reg)
 #define RESET_MODULE_PCI_BUS           BIT(1)
 #define RESET_MODULE_PCI_CORE          BIT(0)
 
+#define AR724X_RESET_PCIE_PHY_SERIAL   BIT(10)
+#define AR724X_RESET_PCIE_PHY          BIT(7)
+#define AR724X_RESET_PCIE              BIT(6)
+
 #define REV_ID_MAJOR_MASK      0xf0
 #define REV_ID_MAJOR_AR71XX    0xa0
 #define REV_ID_MAJOR_AR913X    0xb0
@@ -509,6 +492,7 @@ static inline u32 ar71xx_reset_rr(unsigned reg)
 
 void ar71xx_device_stop(u32 mask);
 void ar71xx_device_start(u32 mask);
+int ar71xx_device_stopped(u32 mask);
 
 /*
  * SPI block