Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae87fe2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Eric Miao
Browse files

[ARM] pxa/viper: fix timeout usage for I2C 



The timeout value is in jiffies, so it should be using HZ, not a plain
number. Assume with HZ=100 '100' means 1s here and adapt accordingly.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMarc Zyngier <maz@misterjones.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Paul Shen <paul.shen@marvell.com>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 299ed078

arch/arm/mach-pxa/viper.c

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/pm.h>

#include <linux/sched.h>

#include <linux/gpio.h>

#include <linux/jiffies.h>

#include <linux/i2c-gpio.h>

#include <linux/serial_8250.h>

#include <linux/smc91x.h>
@@ -454,7 +455,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = { 
	.sda_pin = VIPER_RTC_I2C_SDA_GPIO,

	.scl_pin = VIPER_RTC_I2C_SCL_GPIO,

	.udelay  = 10,

	.timeout = 100,

	.timeout = HZ,

};



static struct platform_device i2c_bus_device = {
@@ -779,7 +780,7 @@ static void __init viper_tpm_init(void) 
		.sda_pin = VIPER_TPM_I2C_SDA_GPIO,

		.scl_pin = VIPER_TPM_I2C_SCL_GPIO,

		.udelay  = 10,

		.timeout = 100,

		.timeout = HZ,

	};

	char *errstr;