| From 3f03fb38ecb55e4ce37b076dea35621e38cfc8e7 Mon Sep 17 00:00:00 2001 |
| From: Andrey Smirnov <andrew.smirnov@gmail.com> |
| Date: Thu, 3 Oct 2019 18:45:48 -0700 |
| Subject: [PATCH] ARM: dts: am3874-iceboard: Fix 'i2c-mux-idle-disconnect' |
| usage |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 647c8977e111c0a62c93a489ebc4b045c833fdb4 upstream. |
| |
| According to |
| Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt, |
| i2c-mux-idle-disconnect is a property of a parent node since it |
| pertains to the mux/switch as a whole, so move it there and drop all |
| of the concurrences in child nodes. |
| |
| Fixes: d031773169df ("ARM: dts: Adds device tree file for McGill's IceBoard, based on TI AM3874") |
| Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> |
| Cc: Benoît Cousson <bcousson@baylibre.com> |
| Cc: Tony Lindgren <tony@atomide.com> |
| Cc: Graeme Smecher <gsmecher@threespeedlogic.com> |
| Cc: linux-omap@vger.kernel.org |
| Cc: devicetree@vger.kernel.org |
| Cc: linux-kernel@vger.kernel.org |
| Tested-by: Graeme Smecher <gsmecher@threespeedlogic.com> |
| Signed-off-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm/boot/dts/am3874-iceboard.dts b/arch/arm/boot/dts/am3874-iceboard.dts |
| index 883fb85135d4..1b4b2b0500e4 100644 |
| --- a/arch/arm/boot/dts/am3874-iceboard.dts |
| +++ b/arch/arm/boot/dts/am3874-iceboard.dts |
| @@ -111,13 +111,13 @@ |
| reg = <0x70>; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| + i2c-mux-idle-disconnect; |
| |
| i2c@0 { |
| /* FMC A */ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <0>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@1 { |
| @@ -125,7 +125,6 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <1>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@2 { |
| @@ -133,7 +132,6 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <2>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@3 { |
| @@ -141,7 +139,6 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <3>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@4 { |
| @@ -149,14 +146,12 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <4>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@5 { |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <5>; |
| - i2c-mux-idle-disconnect; |
| |
| ina230@40 { compatible = "ti,ina230"; reg = <0x40>; shunt-resistor = <5000>; }; |
| ina230@41 { compatible = "ti,ina230"; reg = <0x41>; shunt-resistor = <5000>; }; |
| @@ -182,14 +177,12 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <6>; |
| - i2c-mux-idle-disconnect; |
| }; |
| |
| i2c@7 { |
| #address-cells = <1>; |
| #size-cells = <0>; |
| reg = <7>; |
| - i2c-mux-idle-disconnect; |
| |
| u41: pca9575@20 { |
| compatible = "nxp,pca9575"; |
| -- |
| 2.7.4 |
| |
