| Message ID | 1351448275-23509-1-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
[Cc Tony] On 28.10.2012 19:17, Daniel Mack wrote: > This patch adds the ability to reboot am33xx-based systems. Sorry, I lacked to investigate on the attribution here. According to "git blame" of a BSP kernel I got these lines from, the original author is Afzal Mohammed. Afzal, are you planning to resubmit this for mainline? My version can of course be disposed then. Thanks, Daniel > Signed-off-by: Daniel Mack <zonque@gmail.com> > --- > arch/arm/mach-omap2/board-generic.c | 1 + > arch/arm/mach-omap2/prcm.c | 6 ++++++ > 2 files changed, 7 insertions(+) > > diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c > index 601ecdf..6a69ceb 100644 > --- a/arch/arm/mach-omap2/board-generic.c > +++ b/arch/arm/mach-omap2/board-generic.c > @@ -114,6 +114,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") > .init_machine = omap_generic_init, > .timer = &omap3_am33xx_timer, > .dt_compat = am33xx_boards_compat, > + .restart = omap_prcm_restart, > MACHINE_END > #endif > > diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c > index 0f51e03..8a3068a 100644 > --- a/arch/arm/mach-omap2/prcm.c > +++ b/arch/arm/mach-omap2/prcm.c > @@ -32,6 +32,7 @@ > #include "clock2xxx.h" > #include "cm2xxx_3xxx.h" > #include "prm2xxx_3xxx.h" > +#include "prm33xx.h" > #include "prm44xx.h" > #include "prminst44xx.h" > #include "cminst44xx.h" > @@ -72,6 +73,11 @@ void omap_prcm_restart(char mode, const char *cmd) > omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0)); > } else if (cpu_is_omap44xx()) { > omap4_prminst_global_warm_sw_reset(); /* never returns */ > + } else if (soc_is_am33xx()) { > + prcm_offs = AM33XX_PRM_DEVICE_MOD; > + omap2_prm_set_mod_reg_bits(OMAP4430_RST_GLOBAL_COLD_SW_MASK, > + prcm_offs, > + AM33XX_PRM_RSTCTRL_OFFSET); > } else { > WARN_ON(1); > } >
On Mon, Oct 29, 2012 at 00:49:19, Daniel Mack wrote: > [Cc Tony] > > On 28.10.2012 19:17, Daniel Mack wrote: > > This patch adds the ability to reboot am33xx-based systems. > > Sorry, I lacked to investigate on the attribution here. According to > "git blame" of a BSP kernel I got these lines from, the original author > is Afzal Mohammed. > > Afzal, are you planning to resubmit this for mainline? My version can of > course be disposed then. > This should be on top of Paul's recent changes [1] to save him some rework headache. Regards, Vaibhav [1] http://marc.info/?l=linux-omap&m=135120744528680&w=2
Hi Daniel, On Monday 29 October 2012 12:49 AM, Daniel Mack wrote: > Afzal, are you planning to resubmit this for mainline? My version can of > course be disposed then. I am not planning to submit it as of now, and Vaibhav H has a better suggestion on this, you may co-ordinate with him. Regards Afzal
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 601ecdf..6a69ceb 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -114,6 +114,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") .init_machine = omap_generic_init, .timer = &omap3_am33xx_timer, .dt_compat = am33xx_boards_compat, + .restart = omap_prcm_restart, MACHINE_END #endif diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 0f51e03..8a3068a 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -32,6 +32,7 @@ #include "clock2xxx.h" #include "cm2xxx_3xxx.h" #include "prm2xxx_3xxx.h" +#include "prm33xx.h" #include "prm44xx.h" #include "prminst44xx.h" #include "cminst44xx.h" @@ -72,6 +73,11 @@ void omap_prcm_restart(char mode, const char *cmd) omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0)); } else if (cpu_is_omap44xx()) { omap4_prminst_global_warm_sw_reset(); /* never returns */ + } else if (soc_is_am33xx()) { + prcm_offs = AM33XX_PRM_DEVICE_MOD; + omap2_prm_set_mod_reg_bits(OMAP4430_RST_GLOBAL_COLD_SW_MASK, + prcm_offs, + AM33XX_PRM_RSTCTRL_OFFSET); } else { WARN_ON(1); }
This patch adds the ability to reboot am33xx-based systems. Signed-off-by: Daniel Mack <zonque@gmail.com> --- arch/arm/mach-omap2/board-generic.c | 1 + arch/arm/mach-omap2/prcm.c | 6 ++++++ 2 files changed, 7 insertions(+)