Merge branch 'master' of git://git.lpclinux.com/linux-2.6.34-lpc32xx
authorKevin Wells <wellsk40@gmail.com>
Thu, 7 Apr 2011 18:24:17 +0000 (11:24 -0700)
committerKevin Wells <wellsk40@gmail.com>
Thu, 7 Apr 2011 18:24:17 +0000 (11:24 -0700)
arch/arm/vfp/vfpmodule.c
drivers/i2c/busses/i2c-pnx.c

index 315a540..9bbdec6 100644 (file)
@@ -398,8 +398,12 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
 
 static int vfp_pm_resume(struct sys_device *dev)
 {
+       unsigned int cpu_arch = cpu_architecture();
+
        /* ensure we have access to the vfp */
-       vfp_enable(NULL);
+       if (cpu_arch >= CPU_ARCH_ARMv6) {
+               vfp_enable(NULL);
+       }
 
        /* and disable it to ensure the next usage restores the state */
        fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
index 5c8899e..d7e792f 100644 (file)
@@ -912,7 +912,7 @@ static int i2c_pnx_smbus_xfer(struct i2c_adapter *adapter,
                iowrite32(ioread32(I2C_REG_CTL(smbus)) | mcntrl_reset,
                          I2C_REG_CTL(smbus));
        }
-       
+
        clk_disable(smbus->clk);
 
        return err;
@@ -1045,7 +1045,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
               alg_data->adapter.name, i2c_pnx->base, i2c_pnx->irq);
 
        /* Disable clock until needed */
-       clk_enable(alg_data->clk);
+       clk_disable(alg_data->clk);
 
        return 0;