From fcfdc67ff2b104355683f7264a6559a0cc360646 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 18 Feb 2010 20:31:43 +0000 Subject: [ARM] pxa/zeus: Add support for onboard max6369 watchdog Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao --- arch/arm/mach-pxa/include/mach/zeus.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-pxa/include/mach/zeus.h') diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h index c387046d2f2..89e4fb58e5f 100644 --- a/arch/arm/mach-pxa/include/mach/zeus.h +++ b/arch/arm/mach-pxa/include/mach/zeus.h @@ -68,7 +68,6 @@ #define ZEUS_CPLD_VERSION (ZEUS_CPLD + 0x0000) #define ZEUS_CPLD_ISA_IRQ (ZEUS_CPLD + 0x1000) #define ZEUS_CPLD_CONTROL (ZEUS_CPLD + 0x2000) -#define ZEUS_CPLD_EXTWDOG (ZEUS_CPLD + 0x3000) /* CPLD register bits */ #define ZEUS_CPLD_CONTROL_CF_RST 0x01 -- cgit v1.2.3 From 438a22fe26c3fdeb422d92072523d5b35d849dc3 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 18 Feb 2010 20:33:02 +0000 Subject: [ARM] pxa/zeus: Add support for mcp2515 CAN bus Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao --- arch/arm/mach-pxa/include/mach/zeus.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-pxa/include/mach/zeus.h') diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h index 89e4fb58e5f..6e119976003 100644 --- a/arch/arm/mach-pxa/include/mach/zeus.h +++ b/arch/arm/mach-pxa/include/mach/zeus.h @@ -58,6 +58,8 @@ #define ZEUS_EXT1_GPIO(x) (ZEUS_EXT1_GPIO_BASE + (x)) #define ZEUS_USER_GPIO(x) (ZEUS_USER_GPIO_BASE + (x)) +#define ZEUS_CAN_SHDN_GPIO ZEUS_EXT1_GPIO(2) + /* * CPLD registers: * Only 4 registers, but spreaded over a 32MB address space. -- cgit v1.2.3