Skip to contentSkip to conversation

arm: socfpga: enable rtc support for the socrates board

PATCH New Simon Goldschmidt 1 participant 5 messages Mar 28, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover arm: socfpga: enable rtc support for the socrates board

This series contains fixes and config changes to enable the 'date' command talking to the rtc on the socrates board.

It contains fixes to the designware i2c driver, enables DM support for the rtc used on the socrates board, adds a missing pull-up and changes the defconfig to enable rtc support by default.

This patch applies to socfpga-next.

Changes in v3:
- pick up missing reviewed-by from v1
- pick up missing reviewed-by from v1
- pick up missing reviewed-by from v1
- pick up missing reviewed-by from v1

Changes in v2:
- m41t82: reset HT bit during probe

Simon Goldschmidt (4):
i2c: designware: fix reset handling on socfpga gen5
rtc: m41t62: add compatible for m41t82
arm: socfpga: socrates: make rtc work
configs: socfpga: socrates: enable rtc support

 board/ebv/socrates/qts/iocsr_config.h |  2 +-
 configs/socfpga_socrates_defconfig    |  2 ++
 drivers/i2c/designware_i2c.c          | 20 ++++++++++++++------
 drivers/rtc/m41t62.c                  | 11 +++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)
Signature · 1 line
2.19.1
#1 lore raw

PATCH v3 1/4 i2c: designware: fix reset handling on socfpga gen5

Using this driver on socfpga gen5 with DM_I2C enabled leads to a data abort as the 'i2c' reset property cannot be found (the gen5 dtsi does not provide reset-names).

The actual bug was to check 'if (&priv->reset_ctl)', which is never false.

While at it, convert the driver to use 'reset_get_bulk' instead of looking at a specific named reset and also make it release the reset on driver remove before starting the OS.

Fixes 622597dee4f6 ("i2c: designware: add reset ctrl to driver")

---

Changes in v3:
- pick up missing reviewed-by from v1

Changes in v2: None

 drivers/i2c/designware_i2c.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/i2c/designware_i2c.c +14 -6
index 63e40823f1..9ccc2411a6 100644
@@ -34,7 +34,7 @@ static struct dw_scl_sda_cfg byt_config = {
 struct dw_i2c {
 	struct i2c_regs *regs;
 	struct dw_scl_sda_cfg *scl_sda_cfg;
-	struct reset_ctl reset_ctl;
+	struct reset_ctl_bulk resets;
 };
 
 #ifdef CONFIG_SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED
@@ -562,16 +562,22 @@ static int designware_i2c_probe(struct udevice *bus)
 		priv->regs = (struct i2c_regs *)devfdt_get_addr_ptr(bus);
 	}
 
-	ret = reset_get_by_name(bus, "i2c", &priv->reset_ctl);
+	ret = reset_get_bulk(bus, &priv->resets);
 	if (ret)
-		pr_info("reset_get_by_name() failed: %d\n", ret);
-
-	if (&priv->reset_ctl)
-		reset_deassert(&priv->reset_ctl);
+		dev_warn(bus, "Can't get reset: %d\n", ret);
+	else
+		reset_deassert_bulk(&priv->resets);
 
 	return __dw_i2c_init(priv->regs, 0, 0);
 }
 
+static int designware_i2c_remove(struct udevice *dev)
+{
+	struct dw_i2c *priv = dev_get_priv(dev);
+
+	return reset_release_bulk(&priv->resets);
+}
+
 static int designware_i2c_bind(struct udevice *dev)
 {
 	static int num_cards;
@@ -613,6 +619,8 @@ U_BOOT_DRIVER(i2c_designware) = {
 	.bind	= designware_i2c_bind,
 	.probe	= designware_i2c_probe,
 	.priv_auto_alloc_size = sizeof(struct dw_i2c),
+	.remove = designware_i2c_remove,
+	.flags = DM_FLAG_OS_PREPARE,
 	.ops	= &designware_i2c_ops,
 };
 
Signature · 1 line
2.19.1
#2 lore raw

PATCH v3 2/4 rtc: m41t62: add compatible for m41t82

In reply to Simon Goldschmidt

This adds a compatible string for m41t82. This ensures that this driver can be used for m41t82 in DM mode, too (asit was usable for this model in non-DM mode before).

In addition, the HT bit has to be reset during probe, since the m41t82 chip sets it when entering battery standby mode.

This patch ensures this driver works on socfpga_socrates.

---

Changes in v3:
- pick up missing reviewed-by from v1

Changes in v2:
- m41t82: reset HT bit during probe

 drivers/rtc/m41t62.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/rtc/m41t62.c +11 -0
index 2ee7e00b02..6161b76712 100644
@@ -155,6 +155,15 @@ static int m41t62_rtc_reset(struct udevice *dev)
 	return ret;
 }
 
+/*
+ * Make sure HT bit is cleared. This bit is set on entering battery backup
+ * mode, so do this before the first read access.
+ */
+static int m41t62_rtc_probe(struct udevice *dev)
+{
+	return m41t62_rtc_reset(dev);
+}
+
 static const struct rtc_ops m41t62_rtc_ops = {
 	.get = m41t62_rtc_get,
 	.set = m41t62_rtc_set,
@@ -163,6 +172,7 @@ static const struct rtc_ops m41t62_rtc_ops = {
 
 static const struct udevice_id m41t62_rtc_ids[] = {
 	{ .compatible = "st,m41t62" },
+	{ .compatible = "st,m41t82" },
 	{ .compatible = "microcrystal,rv4162" },
 	{ }
 };
@@ -172,6 +182,7 @@ U_BOOT_DRIVER(rtc_m41t62) = {
 	.id	= UCLASS_RTC,
 	.of_match = m41t62_rtc_ids,
 	.ops	= &m41t62_rtc_ops,
+	.probe  = &m41t62_rtc_probe,
 };
 
 #else /* NON DM RTC code - will be removed */
Signature · 1 line
2.19.1
#3 lore raw

PATCH v3 3/4 arm: socfpga: socrates: make rtc work

In reply to Simon Goldschmidt

This patch makes the on-board RTC work on the socfpga_socrates board. This rtc is present on the board, but it does not work (fails with a timeout).

This patch adds a weak pull-up on the I2C0-SCL pin connected to the m41t82 RTC on this board. While the SDA line has a pull-up on the pcb, the pull-up on the SCL line seems to be missing. To work around this, enable the weak-pull-up feature on this pin.

After applying this patch, the rtc timeout is gone and the 'date' command can access the rtc chip.

---

Changes in v3:
- pick up missing reviewed-by from v1

Changes in v2: None

 board/ebv/socrates/qts/iocsr_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/ebv/socrates/qts/iocsr_config.h +1 -1
index 011fa2bac3..18b9c6ce4d 100644
@@ -108,7 +108,7 @@ const unsigned long iocsr_scan_chain2_table[] = {
 	0x00018004,
 	0x06001209,
 	0x00004000,
-	0x20002412,
+	0x20042412,
 	0x00904800,
 	0x00000030,
 	0x80000000,
Signature · 1 line
2.19.1
#4 lore raw

PATCH v3 4/4 configs: socfpga: socrates: enable rtc support

In reply to Simon Goldschmidt

This enables DM_RTC and RTC_M41T62 to enable support for the rtc on the socrates board.

---

Changes in v3:
- pick up missing reviewed-by from v1

Changes in v2: None

 configs/socfpga_socrates_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/socfpga_socrates_defconfig +2 -0
index 45fd78a15c..242d938f9c 100644
@@ -61,6 +61,8 @@ CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_M41T62=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
Signature · 1 line
2.19.1