From b2f0c022c33901adb79298b99ea3f4a57c8ffb95 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 18 Sep 2012 10:05:31 +0200 Subject: [PATCH] --- yaml --- r: 323007 b: refs/heads/master c: 42a3f891caee0d9baa60a6964e41a28b9c657407 h: refs/heads/master i: 323005: 9190ffde14b75f61f9f63960e0a9480b36162b0d 323003: 2d414173dab6904ea254d080f327864ec68d94cb 322999: 19723dcd2c00d0e20412e749b6d7bd8b5f0806a6 322991: 6eba44b2dd29dd31091a6ed77804ef3eb5fff92d 322975: 9bf55d65b3c32f8c49220be2b111f09820c54852 322943: 2fd84590e7090678a53de9fda42cc7434eefd9d6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/clk-imx25.c | 2 +- trunk/arch/arm/plat-mxc/include/mach/mx25.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 50f15d8a4bb6..68088d5b8bf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35495173e1df621dff0e9a244accbe32cd28a98f +refs/heads/master: 42a3f891caee0d9baa60a6964e41a28b9c657407 diff --git a/trunk/arch/arm/mach-imx/clk-imx25.c b/trunk/arch/arm/mach-imx/clk-imx25.c index 4431a62fff5b..d20d4795f4ea 100644 --- a/trunk/arch/arm/mach-imx/clk-imx25.c +++ b/trunk/arch/arm/mach-imx/clk-imx25.c @@ -241,6 +241,6 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[sdma_ahb], "ahb", "imx35-sdma"); clk_register_clkdev(clk[iim_ipg], "iim", NULL); - mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54); + mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), MX25_INT_GPT1); return 0; } diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx25.h b/trunk/arch/arm/plat-mxc/include/mach/mx25.h index 627d94f1b010..ec466400a200 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/mx25.h +++ b/trunk/arch/arm/plat-mxc/include/mach/mx25.h @@ -98,6 +98,7 @@ #define MX25_INT_UART1 (NR_IRQS_LEGACY + 45) #define MX25_INT_GPIO2 (NR_IRQS_LEGACY + 51) #define MX25_INT_GPIO1 (NR_IRQS_LEGACY + 52) +#define MX25_INT_GPT1 (NR_IRQS_LEGACY + 54) #define MX25_INT_FEC (NR_IRQS_LEGACY + 57) #define MX25_DMA_REQ_SSI2_RX1 22