diff options
| author | Matteo Facchinetti <matteo.facchinetti@sirius-es.it> | 2013-06-10 10:13:52 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-06-24 21:36:49 +0200 |
| commit | 0875a88e8569c2ca306f321018238bd1a3d7fd86 (patch) | |
| tree | 1839dcc50869a9570bf14cf0b6e41be526f0b3e2 /arch | |
| parent | a4f4124cf308275b4a2219d1e332dfc01d8bd6b7 (diff) | |
| download | linux-stable-0875a88e8569c2ca306f321018238bd1a3d7fd86.tar.gz linux-stable-0875a88e8569c2ca306f321018238bd1a3d7fd86.tar.bz2 linux-stable-0875a88e8569c2ca306f321018238bd1a3d7fd86.zip | |
powerpc/mpc512x: add MPC5125 reset module support for system restart
Only part of MPC5125 reset module is like as MPC5121.
In detail, RCWH register doesn't contain informations about:
- PCI arbiter
- NAND flash page size
- NAND flash port size
For this reason, in device tree, this module has a different name then
MPC5121 reset module but use the same "struct mpc512x_reset_module"
register definition and the same restart procedure.
Signed-off-by: Matteo Facchinetti <engineering@sirius-es.it>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc512x.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc512x_shared.c | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h index fdb4303246a0..cc97f022d028 100644 --- a/arch/powerpc/platforms/512x/mpc512x.h +++ b/arch/powerpc/platforms/512x/mpc512x.h @@ -17,6 +17,7 @@ extern void __init mpc512x_init(void); extern void __init mpc512x_setup_arch(void); extern int __init mpc5121_clk_init(void); extern const char *mpc512x_select_psc_compat(void); +extern const char *mpc512x_select_reset_compat(void); extern void mpc512x_restart(char *cmd); #endif /* __MPC512X_H__ */ diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c index a8b5110eb298..a82a41b4fd91 100644 --- a/arch/powerpc/platforms/512x/mpc512x_shared.c +++ b/arch/powerpc/platforms/512x/mpc512x_shared.c @@ -35,8 +35,10 @@ static struct mpc512x_reset_module __iomem *reset_module_base; static void __init mpc512x_restart_init(void) { struct device_node *np; + const char *reset_compat; - np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-reset"); + reset_compat = mpc512x_select_reset_compat(); + np = of_find_compatible_node(NULL, NULL, reset_compat); if (!np) return; @@ -355,6 +357,17 @@ const char *mpc512x_select_psc_compat(void) return NULL; } +const char *mpc512x_select_reset_compat(void) +{ + if (of_machine_is_compatible("fsl,mpc5121")) + return "fsl,mpc5121-reset"; + + if (of_machine_is_compatible("fsl,mpc5125")) + return "fsl,mpc5125-reset"; + + return NULL; +} + static unsigned int __init get_fifo_size(struct device_node *np, char *prop_name) { |