Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / armada-xp-98dx3236.dtsi

diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index 654648b..38a052a 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -264,11 +264,8 @@
 &i2c0 {
        compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
        reg = <0x11000 0x100>;
-};
-
-&i2c1 {
-       compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
-       reg = <0x11100 0x100>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c0_pins>;
 };
 
 &mpic {
@@ -324,6 +321,11 @@
                               "mpp2", "mpp3";
                marvell,function = "spi0";
        };
+
+       i2c0_pins: i2c-pins-0 {
+               marvell,pins = "mpp14", "mpp15";
+               marvell,function = "i2c0";
+       };
 };
 
 &spi0 {