[PATCH 06/23] ARM: zii-common: Find switch watchdog via DT

[Andrey Smirnov <andrew.smirnov@xxxxxxxxx>]

Use of_find_i2c_device_by_node() in swith reset code in order to be
able to support other devices that have this MCU on a different I2C
busses.

Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
---
 arch/arm/boards/zii-common/switch-cmd.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boards/zii-common/switch-cmd.c b/arch/arm/boards/zii-common/switch-cmd.c
index 5e39d8fc6..02802ff86 100644
--- a/arch/arm/boards/zii-common/switch-cmd.c
+++ b/arch/arm/boards/zii-common/switch-cmd.c
@@ -18,33 +18,40 @@
 
 static int do_rdu2_switch_reset(void)
 {
-	struct i2c_client client;
+	struct device_node *np;
+	struct i2c_client *client;
 	int ret;
 	u8 reg;
 
-	client.adapter = i2c_get_adapter(1);
-	if (!client.adapter)
+	np = of_find_compatible_node(NULL, NULL, "zii,rave-wdt");
+	if (!np) {
+		pr_err("No switch watchdog node found\n");
 		return -ENODEV;
+	}
+
+	client = of_find_i2c_device_by_node(np);
+	if (!client) {
+		pr_err("No switch watchdog I2C device found\n");
+		return -ENODEV;
+	}
 
-	/* address of the switch watchdog microcontroller */
-	client.addr = 0x38;
 	reg = 0x78;
-	/* set switch reset time to 100ms */
 
-	ret = i2c_write_reg(&client, 0x0a, &reg, 1);
+	/* set switch reset time to 100ms */
+	ret = i2c_write_reg(client, 0x0a, &reg, 1);
 	if (ret < 0) {
 		pr_err("Failed to set switch reset time\n");
 		return ret;
 	}
 	/* reset the switch */
 	reg = 0x01;
-	ret = i2c_write_reg(&client, 0x0d, &reg, 1);
+	ret = i2c_write_reg(client, 0x0d, &reg, 1);
 	if (ret < 0) {
 		pr_err("Failed to reset the switch\n");
 		return ret;
 	}
 	/* issue dummy command to work around firmware bug */
-	ret = i2c_read_reg(&client, 0x01, &reg, 1);
+	ret = i2c_read_reg(client, 0x01, &reg, 1);
 	if (ret < 0) {
 		pr_err("Failed to issue a dummy command\n");
 		return ret;
-- 
2.21.0


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox