From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 382C2B7D49 for ; Wed, 10 Feb 2010 10:24:12 +1100 (EST) Date: Wed, 10 Feb 2010 00:24:06 +0100 From: Wolfram Sang To: Anatolij Gustschin Subject: Re: [PATCH v3 02/11] powerpc/mpc5121: Add machine restart support Message-ID: <20100209232406.GA21807@pengutronix.de> References: <1265377377-29327-1-git-send-email-agust@denx.de> <1265377377-29327-3-git-send-email-agust@denx.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WIyZ46R2i8wDzkSu" In-Reply-To: <1265377377-29327-3-git-send-email-agust@denx.de> Cc: linuxppc-dev@ozlabs.org, wd@denx.de, dzu@denx.de, Piotr Ziecik List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri, Feb 05, 2010 at 02:42:48PM +0100, Anatolij Gustschin wrote: > Add reset module registers representation and > machine restart callback for mpc5121 platform. >=20 Two comments: > Signed-off-by: Piotr Ziecik > Signed-off-by: Wolfgang Denk > Signed-off-by: Anatolij Gustschin > Cc: Grant Likely > Cc: John Rigby > --- > Changes since v2: > - call mpc512x_restart_init() explicitely from platform > init code >=20 > Changes since v1: > - use 'struct mpc512x_reset_module *' type for 'reset_module_base' > - remove empty line > - remove leftover colon and use pr_err() instead of printk. >=20 > arch/powerpc/include/asm/mpc5xxx.h | 14 +++++++++- > arch/powerpc/platforms/512x/mpc5121_ads.c | 1 + > arch/powerpc/platforms/512x/mpc5121_generic.c | 1 + > arch/powerpc/platforms/512x/mpc512x.h | 1 + > arch/powerpc/platforms/512x/mpc512x_shared.c | 34 +++++++++++++++++++= ++++++ > 5 files changed, 50 insertions(+), 1 deletions(-) >=20 > diff --git a/arch/powerpc/include/asm/mpc5xxx.h b/arch/powerpc/include/as= m/mpc5xxx.h > index 5ce9c5f..0004986 100644 > --- a/arch/powerpc/include/asm/mpc5xxx.h > +++ b/arch/powerpc/include/asm/mpc5xxx.h > @@ -18,5 +18,17 @@ > =20 > extern unsigned long mpc5xxx_get_bus_frequency(struct device_node *node); > =20 > -#endif /* __ASM_POWERPC_MPC5xxx_H__ */ > +/* MPC512x Reset module registers */ > +struct mpc512x_reset_module { > + u32 rcwlr; /* Reset Configuration Word Low Register */ > + u32 rcwhr; /* Reset Configuration Word High Register */ > + u32 reserved1; > + u32 reserved2; > + u32 rsr; /* Reset Status Register */ > + u32 rmr; /* Reset Mode Register */ > + u32 rpr; /* Reset Protection Register */ > + u32 rcr; /* Reset Control Register */ > + u32 rcer; /* Reset Control Enable Register */ > +}; > =20 > +#endif /* __ASM_POWERPC_MPC5xxx_H__ */ > diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/pla= tforms/512x/mpc5121_ads.c > index 0f8f2e9..ee6ae12 100644 > --- a/arch/powerpc/platforms/512x/mpc5121_ads.c > +++ b/arch/powerpc/platforms/512x/mpc5121_ads.c > @@ -68,4 +68,5 @@ define_machine(mpc5121_ads) { > .init_IRQ =3D mpc5121_ads_init_IRQ, > .get_irq =3D ipic_get_irq, > .calibrate_decr =3D generic_calibrate_decr, > + .restart =3D mpc512x_restart, > }; > diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc= /platforms/512x/mpc5121_generic.c > index 9b8c9b0..a6c0e3a 100644 > --- a/arch/powerpc/platforms/512x/mpc5121_generic.c > +++ b/arch/powerpc/platforms/512x/mpc5121_generic.c > @@ -55,4 +55,5 @@ define_machine(mpc5121_generic) { > .init_IRQ =3D mpc512x_init_IRQ, > .get_irq =3D ipic_get_irq, > .calibrate_decr =3D generic_calibrate_decr, > + .restart =3D mpc512x_restart, > }; > diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platfor= ms/512x/mpc512x.h > index ac3da1a..b2daca0 100644 > --- a/arch/powerpc/platforms/512x/mpc512x.h > +++ b/arch/powerpc/platforms/512x/mpc512x.h > @@ -15,4 +15,5 @@ extern void __init mpc512x_init_IRQ(void); > extern void __init mpc512x_init(void); > extern int __init mpc5121_clk_init(void); > void __init mpc512x_declare_of_platform_devices(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 b683165..ac0400e 100644 > --- a/arch/powerpc/platforms/512x/mpc512x_shared.c > +++ b/arch/powerpc/platforms/512x/mpc512x_shared.c > @@ -21,9 +21,42 @@ > #include > #include > #include > +#include > =20 > #include "mpc512x.h" > =20 > +static struct mpc512x_reset_module __iomem *reset_module_base; > + > +static int __init mpc512x_restart_init(void) > +{ > + struct device_node *np; > + > + np =3D of_find_compatible_node(NULL, NULL, "fsl,mpc5121-reset"); > + if (!np) > + return -1; > + > + reset_module_base =3D of_iomap(np, 0); > + of_node_put(np); > + > + return 0; > +} > + > +void mpc512x_restart(char *cmd) > +{ > + struct mpc512x_reset_module *rm =3D reset_module_base; Why not using reset_module_base directly? > + > + if (rm) { > + /* Enable software reset "RSTE" */ > + out_be32(&rm->rpr, 0x52535445); > + /* Set software hard reset */ > + out_be32(&rm->rcr, 0x2); > + } else { > + pr_err("Restart module not mapped.\n"); > + } > + for (;;) > + ; > +} > + > void __init mpc512x_init_IRQ(void) > { > struct device_node *np; > @@ -62,4 +95,5 @@ void __init mpc512x_init(void) > { > mpc512x_declare_of_platform_devices(); > mpc5121_clk_init(); > + mpc512x_restart_init(); If the return value is not checked here, you could as well make the function void. (Not much one could do in the error-case, too.) > } > --=20 Regards, Wolfram --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --WIyZ46R2i8wDzkSu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAktx7pYACgkQD27XaX1/VRtA3ACgr2wF/ZxAJ7MIP9gmGs90taJ1 LLwAnA4UYpFDNRiDNiYWtmjcLFZTxvL/ =JqWB -----END PGP SIGNATURE----- --WIyZ46R2i8wDzkSu--