commit 2da02f66d3e28b39eccd778f7430a265e5deb63d
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 15 10:05:08 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 15 10:05:08 2018 -0800
tree a10bcd8fce7f900b6c7a3dfea52a5e92a22a62cb
parent 8fc56d271a7b6d287641b299a4a705482c539d54
parent fd133e8d8ef3923d328f18333e20db220e23db59

Merge "ipq807x: i2c: Fix drive-strength of i2c gpios"

arch/arm/dts/ipq807x-soc.dtsi

diff --git a/arch/arm/dts/ipq807x-soc.dtsi b/arch/arm/dts/ipq807x-soc.dtsi
index f3ade04..9fbc85e 100644
--- a/arch/arm/dts/ipq807x-soc.dtsi
+++ b/arch/arm/dts/ipq807x-soc.dtsi
@@ -259,6 +259,7 @@
 				gpio = <42>;
 				func = <2>;
 				pull = <GPIO_NO_PULL>;
+				drvstr = <GPIO_8MA>;
 				oe = <GPIO_OE_ENABLE>;
 			};
 
@@ -266,6 +267,7 @@
 				gpio = <43>;
 				func = <2>;
 				pull = <GPIO_NO_PULL>;
+				drvstr = <GPIO_8MA>;
 				oe = <GPIO_OE_ENABLE>;
 			};
 

drivers/i2c/qup_i2c.c

diff --git a/drivers/i2c/qup_i2c.c b/drivers/i2c/qup_i2c.c
index 416e690..71c155e 100644
--- a/drivers/i2c/qup_i2c.c
+++ b/drivers/i2c/qup_i2c.c
@@ -111,11 +111,13 @@
  */
 void config_i2c_gpio(void)
 {
-	int gpio_node;
+	int i2c_node, gpio_node;
 
-	gpio_node = fdt_path_offset(gd->fdt_blob, "/i2c0/i2c_gpio");
-	if (gpio_node >= 0) {
-		qca_gpio_init(gpio_node);
+	i2c_node = fdt_path_offset(gd->fdt_blob, "i2c0");
+	if (i2c_node >= 0) {
+		gpio_node = fdt_subnode_offset(gd->fdt_blob, i2c_node, "i2c_gpio");
+		if (gpio_node >= 0)
+			qca_gpio_init(gpio_node);
 	}
 }