Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[firefly-linux-kernel-4.4.55.git] / include / asm-arm / arch-ep93xx / ep93xx-regs.h

diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/include/asm-arm/arch-ep93xx/ep93xx-regs.h
index 71cea0b5841bcf975e34d9a37ff9551ff84c0051..625c6f0abc030c50b5fab0f1014dae6deaeebd3b 100644 (file)
--- a/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+++ b/include/asm-arm/arch-ep93xx/ep93xx-regs.h
@@ -27,6 +27,7 @@
 #define EP93XX_DMA_BASE                        (EP93XX_AHB_VIRT_BASE + 0x00000000)
 
 #define EP93XX_ETHERNET_BASE           (EP93XX_AHB_VIRT_BASE + 0x00010000)
+#define EP93XX_ETHERNET_PHYS_BASE      (EP93XX_AHB_PHYS_BASE + 0x00010000)
 
 #define EP93XX_USB_BASE                        (EP93XX_AHB_VIRT_BASE + 0x00020000)
 #define EP93XX_USB_PHYS_BASE           (EP93XX_AHB_PHYS_BASE + 0x00020000)
@@ -72,6 +73,11 @@
 
 #define EP93XX_GPIO_BASE               (EP93XX_APB_VIRT_BASE + 0x00040000)
 #define EP93XX_GPIO_REG(x)             (EP93XX_GPIO_BASE + (x))
+#define EP93XX_GPIO_F_INT_TYPE1                EP93XX_GPIO_REG(0x4c)
+#define EP93XX_GPIO_F_INT_TYPE2                EP93XX_GPIO_REG(0x50)
+#define EP93XX_GPIO_F_INT_ACK          EP93XX_GPIO_REG(0x54)
+#define EP93XX_GPIO_F_INT_ENABLE       EP93XX_GPIO_REG(0x58)
+#define EP93XX_GPIO_F_INT_STATUS       EP93XX_GPIO_REG(0x5c)
 #define EP93XX_GPIO_A_INT_TYPE1                EP93XX_GPIO_REG(0x90)
 #define EP93XX_GPIO_A_INT_TYPE2                EP93XX_GPIO_REG(0x94)
 #define EP93XX_GPIO_A_INT_ACK          EP93XX_GPIO_REG(0x98)
@@ -115,6 +121,8 @@
 #define EP93XX_SYSCON_CLOCK_USH_EN     0x10000000
 #define EP93XX_SYSCON_HALT             EP93XX_SYSCON_REG(0x08)
 #define EP93XX_SYSCON_STANDBY          EP93XX_SYSCON_REG(0x0c)
+#define EP93XX_SYSCON_CLOCK_SET1       EP93XX_SYSCON_REG(0x20)
+#define EP93XX_SYSCON_CLOCK_SET2       EP93XX_SYSCON_REG(0x24)
 #define EP93XX_SYSCON_DEVICE_CONFIG    EP93XX_SYSCON_REG(0x80)
 #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE      0x00800000
 #define EP93XX_SYSCON_SWLOCK           EP93XX_SYSCON_REG(0xc0)