diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9_rst.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9_rst.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91sam9_rst.c b/arch/arm/mach-at91/at91sam9_rst.c index a61a26936f..d2c008e343 100644 --- a/arch/arm/mach-at91/at91sam9_rst.c +++ b/arch/arm/mach-at91/at91sam9_rst.c @@ -9,7 +9,8 @@ #include <restart.h> #include <linux/bitfield.h> #include <linux/clk.h> -#include <mach/at91_rstc.h> +#include <mach/at91/at91_rstc.h> +#include <mach/at91/at91sam9260.h> #include <reset_source.h> struct at91sam9x_rst { @@ -25,7 +26,7 @@ static int reasons[] = { RESET_EXT, /* USER NRST pin detected low */ }; -static void at91sam9x_set_reset_reason(struct device_d *dev, +static void at91sam9x_set_reset_reason(struct device *dev, void __iomem *base) { enum reset_src_type type = RESET_UKWN; @@ -56,7 +57,17 @@ static void __noreturn at91sam9x_restart_soc(struct restart_handler *rst) hang(); } -static int at91sam9x_rst_probe(struct device_d *dev) +void __noreturn at91sam9_reset(void __iomem *sdram, void __iomem *rstc_cr); + +static void __noreturn at91sam9260_restart_soc(struct restart_handler *rst) +{ + struct at91sam9x_rst *priv = container_of(rst, struct at91sam9x_rst, restart); + + at91sam9_reset(IOMEM(AT91SAM9260_BASE_SDRAMC), + IOMEM(priv->base + AT91_RSTC_CR)); +} + +static int at91sam9x_rst_probe(struct device *dev) { struct at91sam9x_rst *priv; struct resource *iores; @@ -83,18 +94,20 @@ static int at91sam9x_rst_probe(struct device_d *dev) at91sam9x_set_reset_reason(dev, priv->base); priv->restart.name = "at91sam9x-rst"; - priv->restart.restart = at91sam9x_restart_soc; + priv->restart.restart = device_get_match_data(dev); return restart_handler_register(&priv->restart); } static const __maybe_unused struct of_device_id at91sam9x_rst_dt_ids[] = { - { .compatible = "atmel,at91sam9g45-rstc", }, - { .compatible = "atmel,sama5d3-rstc", }, + { .compatible = "atmel,at91sam9260-rstc", at91sam9260_restart_soc }, + { .compatible = "atmel,at91sam9g45-rstc", at91sam9x_restart_soc }, + { .compatible = "atmel,sama5d3-rstc", at91sam9x_restart_soc }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, at91sam9x_rst_dt_ids); -static struct driver_d at91sam9x_rst_driver = { +static struct driver at91sam9x_rst_driver = { .name = "at91sam9x-rst", .of_compatible = DRV_OF_COMPAT(at91sam9x_rst_dt_ids), .probe = at91sam9x_rst_probe, |