From: Anton Vorontsov Date: Fri, 26 Nov 2010 17:48:35 +0000 (+0300) Subject: ARM: cns3xxx: Make cns3xxx_pwr_soft_rst_force() to actually reset blocks X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df8f4d2f3ef9ca2154f7bd531492a83c4ab4558a;p=linux-beck.git ARM: cns3xxx: Make cns3xxx_pwr_soft_rst_force() to actually reset blocks commit 6eb5d146d4535 ("ARM: cns3xxx: Use IO memory accessors everywhere") breaks cns3xxx_pwr_soft_rst_force() function, so that it doesn't write cleared bit into the register. This patch fixes the issue by adding the necessary __raw_writel(). Signed-off-by: Anton Vorontsov --- diff --git a/arch/arm/mach-cns3xxx/pm.c b/arch/arm/mach-cns3xxx/pm.c index 38e44706feab..dfccabbd9599 100644 --- a/arch/arm/mach-cns3xxx/pm.c +++ b/arch/arm/mach-cns3xxx/pm.c @@ -51,6 +51,7 @@ static void cns3xxx_pwr_soft_rst_force(unsigned int block) reg &= ~(block & PM_SOFT_RST_REG_MASK); } else { reg &= ~(block & PM_SOFT_RST_REG_MASK); + __raw_writel(reg, PM_SOFT_RST_REG); reg |= (block & PM_SOFT_RST_REG_MASK); }