Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / tegra30-cardhu.dtsi

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 9104224124eeaac83bcedbd0e2fb7bcb3887d631..0cf0848a82d88964ddd0ed72fca19aa5c6cb135a 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -28,7 +28,7 @@
        compatible = "nvidia,cardhu", "nvidia,tegra30";
 
        aliases {
-               rtc0 = "/i2c@7000d000/tps6586x@34";
+               rtc0 = "/i2c@7000d000/tps65911@2d";
                rtc1 = "/rtc@7000e000";
        };
 
@@ -187,6 +187,13 @@
                        interrupt-parent = <&gpio>;
                        interrupts = <TEGRA_GPIO(L, 0) IRQ_TYPE_LEVEL_HIGH>;
                };
+
+               i2cmux@70 {
+                       compatible = "nxp,pca9546";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x70>;
+               };
        };
 
        i2c@7000c700 {