[U-Boot] [PATCH 0/2] rtc, rv3029: add support for trickle charger

[U-Boot] [PATCH 0/2] rtc, rv3029: add support for trickle charger

[Heiko Schocher]

This patchseries adds trickle charger support for the
RTC RV3029 and add it to the existing digsy_mtc board
(rev5 boards only).

checkpatch says:

total: 0 errors, 0 warnings, 117 lines checked

20110328/0001-rtc-rv3029-add-trickle-charger-support.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 7 lines checked

20110328/0002-mpc52xx-digsy_mtc-add-trickle-charger-support-for-re.patch has no obvious style problems and is ready for submission.

Heiko Schocher (2):
  rtc, rv3029: add trickle charger support.
  mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.

 README                      |    2 +
 drivers/rtc/rv3029.c        |   87 +++++++++++++++++++++++++++++++++++++++++++
 include/configs/digsy_mtc.h |    1 +
 3 files changed, 90 insertions(+), 0 deletions(-)

-- 
1.7.4

[U-Boot] [PATCH 1/2] rtc, rv3029: add trickle charger support.

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 README               |    2 +
 drivers/rtc/rv3029.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/README b/README
index 21cd71b..45b32e7 100644
--- a/README
+++ b/README
@@ -743,6 +743,8 @@ The following options need to be configured:
 		CONFIG_RTC_ISL1208	- use Intersil ISL1208 RTC
 		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
 		CONFIG_SYS_RTC_DS1337_NOOSC	- Turn off the OSC output for DS1337
+		CONFIG_SYS_RV3029_TCR	- enable trickle charger on
+					  RV3029 RTC.
 
 		Note that if the RTC uses I2C, then the I2C interface
 		must also be configured. See I2C Support, below.
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 3ebc768..e012168 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -25,6 +25,12 @@
 #include <i2c.h>
 #include <rtc.h>
 
+#define RTC_RV3029_CTRL1	0x00
+#define RTC_RV3029_CTRL1_EERE	(1 << 3)
+
+#define RTC_RV3029_CTRL_STATUS	0x03
+#define RTC_RV3029_CTRLS_EEBUSY	(1 << 7)
+
 #define RTC_RV3029_CTRL_RESET	0x04
 #define RTC_RV3029_CTRL_SYS_R	(1 << 4)
 
@@ -42,6 +48,12 @@
 #define RV3029C2_REG_HR_12_24          (1 << 6)  /* 24h/12h mode */
 #define RV3029C2_REG_HR_PM             (1 << 5)  /* PM/AM bit in 12h mode */
 
+#define RTC_RV3029_EEPROM_CTRL	0x30
+#define RTC_RV3029_TRICKLE_1K	(1 << 4)
+#define RTC_RV3029_TRICKLE_5K	(1 << 5)
+#define RTC_RV3029_TRICKLE_20K	(1 << 6)
+#define RTC_RV3029_TRICKLE_80K	(1 << 7)
+
 int rtc_get( struct rtc_time *tmp )
 {
 	int	ret;
@@ -113,6 +125,41 @@ int rtc_set( struct rtc_time *tmp )
 	return 0;
 }
 
+/* sets EERE-Bit  (automatic EEPROM refresh) */
+static void set_eere_bit(int state)
+{
+	int ret;
+	unsigned char reg_ctrl1;
+
+	ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL1, 1,
+			&reg_ctrl1, 1);
+
+	if (state)
+		reg_ctrl1 |= RTC_RV3029_CTRL1_EERE;
+	else
+		reg_ctrl1 &= (~RTC_RV3029_CTRL1_EERE);
+
+	ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL1, 1,
+		&reg_ctrl1, 1);
+}
+
+/* waits until EEPROM page is no longer busy (times out after 10ms*loops) */
+static int wait_eebusy(int loops)
+{
+	int i, ret;
+	unsigned char ctrl_status;
+
+	for (i = 0; i < loops; i++) {
+		ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL_STATUS,
+			1, &ctrl_status, 1);
+
+		if ((ctrl_status & RTC_RV3029_CTRLS_EEBUSY) == 0)
+			break;
+		udelay(10000);
+	}
+	return i;
+}
+
 void rtc_reset (void)
 {
 	int	ret;
@@ -121,4 +168,44 @@ void rtc_reset (void)
 	buf[0] = RTC_RV3029_CTRL_SYS_R;
 	ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL_RESET, 1,
 			buf, 1);
+
+#if defined(CONFIG_SYS_RV3029_TCR)
+	/*
+	 * because EEPROM_CTRL register is in EEPROM page it is necessary to
+	 * disable automatic EEPROM refresh and check if EEPROM is busy
+	 * before EEPORM_CTRL register may be accessed
+	 */
+	set_eere_bit(0);
+	wait_eebusy(100);
+	/* read current trickle charger setting */
+	ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_EEPROM_CTRL,
+			1, buf, 1);
+	/* enable automatic EEPROM refresh again */
+	set_eere_bit(1);
+
+	/*
+	 * to minimize EEPROM access write trickle charger setting only if it
+	 * differs from current value
+	 */
+	if ((buf[0] & 0xF0) != CONFIG_SYS_RV3029_TCR) {
+		buf[0] = (buf[0] & 0x0F) | CONFIG_SYS_RV3029_TCR;
+		/*
+		 * write trickle charger setting (disable autom. EEPROM
+		 * refresh and wait until EEPROM is idle)
+		 */
+		set_eere_bit(0);
+		wait_eebusy(100);
+		ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR,
+				RTC_RV3029_EEPROM_CTRL, 1, buf, 1);
+		/*
+		 * it is necessary to wait 10ms before EEBUSY-Bit may be read
+		 * (this is not documented in the data sheet yet, but the
+		 * manufacturer recommends it)
+		 */
+		udelay(10000);
+		/* wait until EEPROM write access is finished */
+		wait_eebusy(100);
+		set_eere_bit(1);
+	}
+#endif
 }
-- 
1.7.4

[U-Boot] [PATCH 2/2] mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 include/configs/digsy_mtc.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index e7fd0f7..7e50a86 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -252,6 +252,7 @@
 #if defined(CONFIG_DIGSY_REV5)
 #define CONFIG_SYS_I2C_RTC_ADDR	0x56
 #define CONFIG_RTC_RV3029
+#define CONFIG_SYS_RV3029_TCR
 #else
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C_RTC_ADDR	0x68
-- 
1.7.4

[U-Boot] [Patch v2 0/2] rtc, rv3029: add support for trickle charger

[Heiko Schocher]

This patchseries adds trickle charger support for the
RTC RV3029 and add it to the existing digsy_mtc board
(rev5 boards only).

changes for v2:
- set CONFIG_SYS_RV3029_TCR to 5k Ohm

checkpatch says:

total: 0 errors, 0 warnings, 117 lines checked

20110328_2/0001-rtc-rv3029-add-trickle-charger-support.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 8 lines checked

20110328_2/0002-mpc52xx-digsy_mtc-add-trickle-charger-support-for-re.patch has no obvious style problems and is ready for submission.

Heiko Schocher (2):
  rtc, rv3029: add trickle charger support.
  mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.

 README                      |    2 +
 drivers/rtc/rv3029.c        |   87 +++++++++++++++++++++++++++++++++++++++++++
 include/configs/digsy_mtc.h |    2 +
 3 files changed, 91 insertions(+), 0 deletions(-)

-- 
1.7.4

[U-Boot] [Patch v2 1/2] rtc, rv3029: add trickle charger support.

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 README               |    2 +
 drivers/rtc/rv3029.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/README b/README
index 21cd71b..45b32e7 100644
--- a/README
+++ b/README
@@ -743,6 +743,8 @@ The following options need to be configured:
 		CONFIG_RTC_ISL1208	- use Intersil ISL1208 RTC
 		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
 		CONFIG_SYS_RTC_DS1337_NOOSC	- Turn off the OSC output for DS1337
+		CONFIG_SYS_RV3029_TCR	- enable trickle charger on
+					  RV3029 RTC.
 
 		Note that if the RTC uses I2C, then the I2C interface
 		must also be configured. See I2C Support, below.
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 3ebc768..e012168 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -25,6 +25,12 @@
 #include <i2c.h>
 #include <rtc.h>
 
+#define RTC_RV3029_CTRL1	0x00
+#define RTC_RV3029_CTRL1_EERE	(1 << 3)
+
+#define RTC_RV3029_CTRL_STATUS	0x03
+#define RTC_RV3029_CTRLS_EEBUSY	(1 << 7)
+
 #define RTC_RV3029_CTRL_RESET	0x04
 #define RTC_RV3029_CTRL_SYS_R	(1 << 4)
 
@@ -42,6 +48,12 @@
 #define RV3029C2_REG_HR_12_24          (1 << 6)  /* 24h/12h mode */
 #define RV3029C2_REG_HR_PM             (1 << 5)  /* PM/AM bit in 12h mode */
 
+#define RTC_RV3029_EEPROM_CTRL	0x30
+#define RTC_RV3029_TRICKLE_1K	(1 << 4)
+#define RTC_RV3029_TRICKLE_5K	(1 << 5)
+#define RTC_RV3029_TRICKLE_20K	(1 << 6)
+#define RTC_RV3029_TRICKLE_80K	(1 << 7)
+
 int rtc_get( struct rtc_time *tmp )
 {
 	int	ret;
@@ -113,6 +125,41 @@ int rtc_set( struct rtc_time *tmp )
 	return 0;
 }
 
+/* sets EERE-Bit  (automatic EEPROM refresh) */
+static void set_eere_bit(int state)
+{
+	int ret;
+	unsigned char reg_ctrl1;
+
+	ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL1, 1,
+			&reg_ctrl1, 1);
+
+	if (state)
+		reg_ctrl1 |= RTC_RV3029_CTRL1_EERE;
+	else
+		reg_ctrl1 &= (~RTC_RV3029_CTRL1_EERE);
+
+	ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL1, 1,
+		&reg_ctrl1, 1);
+}
+
+/* waits until EEPROM page is no longer busy (times out after 10ms*loops) */
+static int wait_eebusy(int loops)
+{
+	int i, ret;
+	unsigned char ctrl_status;
+
+	for (i = 0; i < loops; i++) {
+		ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL_STATUS,
+			1, &ctrl_status, 1);
+
+		if ((ctrl_status & RTC_RV3029_CTRLS_EEBUSY) == 0)
+			break;
+		udelay(10000);
+	}
+	return i;
+}
+
 void rtc_reset (void)
 {
 	int	ret;
@@ -121,4 +168,44 @@ void rtc_reset (void)
 	buf[0] = RTC_RV3029_CTRL_SYS_R;
 	ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CTRL_RESET, 1,
 			buf, 1);
+
+#if defined(CONFIG_SYS_RV3029_TCR)
+	/*
+	 * because EEPROM_CTRL register is in EEPROM page it is necessary to
+	 * disable automatic EEPROM refresh and check if EEPROM is busy
+	 * before EEPORM_CTRL register may be accessed
+	 */
+	set_eere_bit(0);
+	wait_eebusy(100);
+	/* read current trickle charger setting */
+	ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_EEPROM_CTRL,
+			1, buf, 1);
+	/* enable automatic EEPROM refresh again */
+	set_eere_bit(1);
+
+	/*
+	 * to minimize EEPROM access write trickle charger setting only if it
+	 * differs from current value
+	 */
+	if ((buf[0] & 0xF0) != CONFIG_SYS_RV3029_TCR) {
+		buf[0] = (buf[0] & 0x0F) | CONFIG_SYS_RV3029_TCR;
+		/*
+		 * write trickle charger setting (disable autom. EEPROM
+		 * refresh and wait until EEPROM is idle)
+		 */
+		set_eere_bit(0);
+		wait_eebusy(100);
+		ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR,
+				RTC_RV3029_EEPROM_CTRL, 1, buf, 1);
+		/*
+		 * it is necessary to wait 10ms before EEBUSY-Bit may be read
+		 * (this is not documented in the data sheet yet, but the
+		 * manufacturer recommends it)
+		 */
+		udelay(10000);
+		/* wait until EEPROM write access is finished */
+		wait_eebusy(100);
+		set_eere_bit(1);
+	}
+#endif
 }
-- 
1.7.4

[U-Boot] [Patch v2 1/2] rtc, rv3029: add trickle charger support.

[Wolfgang Denk]

Dear Heiko Schocher,

In message <1301297063-4072-2-git-send-email-hs@denx.de> you wrote:
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>  README               |    2 +
>  drivers/rtc/rv3029.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 89 insertions(+), 0 deletions(-)

Applied,t hanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
        Ordnung ist die Lust der Vernunft,
        aber Unordnung die Wonne der Phantasie         - Paul Claudel

[U-Boot] [Patch v2 2/2] mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>

---
changes for v2:
- set CONFIG_SYS_RV3029_TCR to 5k Ohm

 include/configs/digsy_mtc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index e7fd0f7..f1613c7 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -252,6 +252,8 @@
 #if defined(CONFIG_DIGSY_REV5)
 #define CONFIG_SYS_I2C_RTC_ADDR	0x56
 #define CONFIG_RTC_RV3029
+/* Enable 5k Ohm trickle charge resistor */
+#define CONFIG_SYS_RV3029_TCR	0x20
 #else
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C_RTC_ADDR	0x68
-- 
1.7.4

[U-Boot] [Patch v2 2/2] mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.

[Wolfgang Denk]

Dear Heiko Schocher,

In message <1301297063-4072-3-git-send-email-hs@denx.de> you wrote:
> Signed-off-by: Heiko Schocher <hs@denx.de>
> 
> ---
> changes for v2:
> - set CONFIG_SYS_RV3029_TCR to 5k Ohm
> 
>  include/configs/digsy_mtc.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I used to be indecisive, now I'm not sure.

[U-Boot] [Patch v2 0/2] rtc, rv3029: add support for trickle charger

[Detlev Zundel]

Hallo Heiko,

> This patchseries adds trickle charger support for the
> RTC RV3029 and add it to the existing digsy_mtc board
> (rev5 boards only).
>
> changes for v2:
> - set CONFIG_SYS_RV3029_TCR to 5k Ohm
>
> checkpatch says:
>
> total: 0 errors, 0 warnings, 117 lines checked
>
> 20110328_2/0001-rtc-rv3029-add-trickle-charger-support.patch has no obvious style problems and is ready for submission.
> total: 0 errors, 0 warnings, 8 lines checked
>
> 20110328_2/0002-mpc52xx-digsy_mtc-add-trickle-charger-support-for-re.patch has no obvious style problems and is ready for submission.
>
> Heiko Schocher (2):
>   rtc, rv3029: add trickle charger support.
>   mpc52xx, digsy_mtc: add trickle charger support for rev5 boards.
>
>  README                      |    2 +
>  drivers/rtc/rv3029.c        |   87 +++++++++++++++++++++++++++++++++++++++++++
>  include/configs/digsy_mtc.h |    2 +
>  3 files changed, 91 insertions(+), 0 deletions(-)

Looks good, so

Acked-by: Detlev Zundel <dzu@denx.de>

Cheers
  Detlev

-- 
It's like manually inflatable airbags -- people will never
think to use it in time to actually get any help from it.
             -- Miles Bader in <20030607122005.GA1086@gnu.org>
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de