diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-02-17 15:09:52 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-18 04:57:56 -0500 |
commit | 78c73591a91c120c4be02dafc018fcd7ecc8688a (patch) | |
tree | 651634995ed82c70f2bd082ef0afc5162ec4b2b2 /arch/arm/mach-mx5 | |
parent | 102c91d8c60bc40e100ead62ac1e9ba05601510c (diff) |
ARM: mx5: Add watchdog support for MX53
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx5/devices-imx53.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx5/mm.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index c66be0ee40c9..8164b1dd9520 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c | |||
@@ -1336,6 +1336,8 @@ static struct clk_lookup mx53_lookups[] = { | |||
1336 | _REGISTER_CLOCK("imx53-ecspi.0", NULL, ecspi1_clk) | 1336 | _REGISTER_CLOCK("imx53-ecspi.0", NULL, ecspi1_clk) |
1337 | _REGISTER_CLOCK("imx53-ecspi.1", NULL, ecspi2_clk) | 1337 | _REGISTER_CLOCK("imx53-ecspi.1", NULL, ecspi2_clk) |
1338 | _REGISTER_CLOCK("imx53-cspi.0", NULL, cspi_clk) | 1338 | _REGISTER_CLOCK("imx53-cspi.0", NULL, cspi_clk) |
1339 | _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) | ||
1340 | _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk) | ||
1339 | }; | 1341 | }; |
1340 | 1342 | ||
1341 | static void clk_tree_init(void) | 1343 | static void clk_tree_init(void) |
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h index 8639735a117b..9251008dad1f 100644 --- a/arch/arm/mach-mx5/devices-imx53.h +++ b/arch/arm/mach-mx5/devices-imx53.h | |||
@@ -29,3 +29,7 @@ imx53_sdhci_esdhc_imx_data[] __initconst; | |||
29 | extern const struct imx_spi_imx_data imx53_ecspi_data[] __initconst; | 29 | extern const struct imx_spi_imx_data imx53_ecspi_data[] __initconst; |
30 | #define imx53_add_ecspi(id, pdata) \ | 30 | #define imx53_add_ecspi(id, pdata) \ |
31 | imx_add_spi_imx(&imx53_ecspi_data[id], pdata) | 31 | imx_add_spi_imx(&imx53_ecspi_data[id], pdata) |
32 | |||
33 | extern const struct imx_imx2_wdt_data imx53_imx2_wdt_data[] __initconst; | ||
34 | #define imx53_add_imx2_wdt(id, pdata) \ | ||
35 | imx_add_imx2_wdt(&imx53_imx2_wdt_data[id]) | ||
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index 8730cd1b94b1..ff557301b42b 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c | |||
@@ -66,7 +66,7 @@ void __init imx53_init_early(void) | |||
66 | { | 66 | { |
67 | mxc_set_cpu_type(MXC_CPU_MX53); | 67 | mxc_set_cpu_type(MXC_CPU_MX53); |
68 | mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR)); | 68 | mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR)); |
69 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG_BASE_ADDR)); | 69 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR)); |
70 | } | 70 | } |
71 | 71 | ||
72 | int imx51_register_gpios(void); | 72 | int imx51_register_gpios(void); |