Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / marvell / armada-8040-db.dts

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 9f4f939..d6e9c01 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -27,6 +27,8 @@
                ethernet1 = &cp0_eth2;
                ethernet2 = &cp1_eth0;
                ethernet3 = &cp1_eth1;
+               i2c1 = &cp0_i2c0;
+               i2c2 = &cp1_i2c0;
        };
 
        cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {
@@ -72,11 +74,6 @@
        };
 };
 
-&i2c0 {
-       status = "okay";
-       clock-frequency = <100000>;
-};
-
 &spi0 {
        status = "okay";