]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: armada-38x-solidrun-microsom: move i2c0 to SOM DT
authorBaruch Siach <baruch@tkos.co.il>
Thu, 2 Jan 2020 08:23:26 +0000 (10:23 +0200)
committerGregory CLEMENT <gregory.clement@bootlin.com>
Wed, 8 Jan 2020 09:56:20 +0000 (10:56 +0100)
Move the i2c0 controller properties to the SOM .dtsi. This is
preparation for adding an i2c device at the SOM level.

Cc: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
arch/arm/boot/dts/armada-388-clearfog.dtsi
arch/arm/boot/dts/armada-388-helios4.dts
arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi

index 0d81600ca24733f1ba115c860f1c58f86d1f796d..a6edea6f50d1cdf56109a773f9b5c61635210089 100644 (file)
@@ -111,11 +111,6 @@ &eth2 {
 };
 
 &i2c0 {
-       clock-frequency = <400000>;
-       pinctrl-0 = <&i2c0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
        /*
         * PCA9655 GPIO expander, up to 1MHz clock.
         *  0-CON3 CLKREQ#
index 705adfa8c680f6172f9927dca945c717f662cf05..fb49df2a3bce7b02169dae13551dd5eb5f7befba 100644 (file)
@@ -140,11 +140,6 @@ usb3_phy: usb3-phy {
        soc {
                internal-regs {
                        i2c@11000 {
-                               clock-frequency = <400000>;
-                               pinctrl-0 = <&i2c0_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-
                                /*
                                 * PCA9655 GPIO expander, up to 1MHz clock.
                                 *  0-Board Revision bit 0 #
index 3a7f9c1ac346bf18aceb1e5529bee9d2a6529cdb..cd39312fb50d29af7224ca414101b79b15f1058a 100644 (file)
@@ -71,6 +71,13 @@ phy_dedicated: ethernet-phy@0 {
        };
 };
 
+&i2c0 {
+       clock-frequency = <400000>;
+       pinctrl-0 = <&i2c0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &pinctrl {
        microsom_phy_clk_pins: microsom-phy-clk-pins {
                marvell,pins = "mpp45";