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

Commit d91e1694 authored by Ladislav Michl's avatar Ladislav Michl Committed by Linus Torvalds
Browse files

[PATCH] I2C: ds1337 - fix 12/24 hour mode bug 



DS1339 manual, page 6, chapter Date and time operation:
  The DS1339 can be run in either 12-hour or 24-hour mode. Bit 6 of the
  hours register is defined as the 12-hour or 24-hour mode-select bit.
  When high, the 12-hour mode is selected.

Patch below makes ds1337 driver work as documented in manual.

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cb14c3a1

drivers/i2c/chips/ds1337.c

+3 −3
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt) 
	buf[0] = 0;		/* reg offset */

	buf[1] = BIN2BCD(dt->tm_sec);

	buf[2] = BIN2BCD(dt->tm_min);

	buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);

	buf[3] = BIN2BCD(dt->tm_hour);

	buf[4] = BIN2BCD(dt->tm_wday) + 1;

	buf[5] = BIN2BCD(dt->tm_mday);

	buf[6] = BIN2BCD(dt->tm_mon) + 1;
@@ -344,9 +344,9 @@ static void ds1337_init_client(struct i2c_client *client) 


	/* Ensure that device is set in 24-hour mode */

	val = i2c_smbus_read_byte_data(client, DS1337_REG_HOUR);

	if ((val >= 0) && (val & (1 << 6)) == 0)

	if ((val >= 0) && (val & (1 << 6)))

		i2c_smbus_write_byte_data(client, DS1337_REG_HOUR,

					  val | (1 << 6));

					  val & 0x3f);

}



static int ds1337_detach_client(struct i2c_client *client)