4 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 9f43d0efe5d9..cb09d0882c3d 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -107,6 +107,28 @@
                                clocks = <&gateclk 3>;
                                status = "disabled";
                };
+                i2c0: i2c@d0011000 {
+                        compatible = "marvell,mv64xxx-i2c";
+                        reg = <0xd0011000 0x20>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupts = <31>;
+                        timeout-ms = <1000>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
+                i2c1: i2c@d0011100 {
+                        compatible = "marvell,mv64xxx-i2c";
+                        reg = <0xd0011100 0x20>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupts = <32>;
+                        timeout-ms = <1000>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
        };
 };
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index c06c93ceba22..8e53b25b5508 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -46,6 +46,7 @@
                        clock-frequency = <250000000>;
                        status = "okay";
                };
                sata@d00a0000 {
                        nr-ports = <2>;
                        status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 638fb68d47b2..b42652fd3d8c 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -104,5 +104,22 @@
                        phy = <&phy3>;
                        phy-mode = "sgmii";
                };
+                i2c@d0011000 {
+                        status = "okay";
+                        clock-frequency = <400000>;
+                };
+                i2c@d0011100 {
+                        status = "okay";
+                        clock-frequency = <400000>;
+                        s35390a: s35390a@30 {
+                                compatible = "s35390a";
+                                reg = <0x30>;
+                        };
+                };
+                sata@d00a0000 {
+                        nr-ports = <2>;
+                        status = "okay";
+                };
        };
 };
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 6008f12c1990..a702fb345c01 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -34,9 +34,13 @@ CONFIG_MARVELL_PHY=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_I2C=y
+CONFIG_I2C_MV64XXX=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_USB_SUPPORT is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_S35390A=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
 # CONFIG_IOMMU_SUPPORT is not set

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 9f43d0efe5d9..cb09d0882c3d 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -107,6 +107,28 @@
107	clocks = <&gateclk 3>;	107	clocks = <&gateclk 3>;
108	status = "disabled";	108	status = "disabled";
109	};	109	};
		110
		111	i2c0: i2c@d0011000 {
		112	compatible = "marvell,mv64xxx-i2c";
		113	reg = <0xd0011000 0x20>;
		114	#address-cells = <1>;
		115	#size-cells = <0>;
		116	interrupts = <31>;
		117	timeout-ms = <1000>;
		118	clocks = <&coreclk 0>;
		119	status = "disabled";
		120	};
		121
		122	i2c1: i2c@d0011100 {
		123	compatible = "marvell,mv64xxx-i2c";
		124	reg = <0xd0011100 0x20>;
		125	#address-cells = <1>;
		126	#size-cells = <0>;
		127	interrupts = <32>;
		128	timeout-ms = <1000>;
		129	clocks = <&coreclk 0>;
		130	status = "disabled";
		131	};
110	};	132	};
111	};	133	};
112		134


diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index c06c93ceba22..8e53b25b5508 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -46,6 +46,7 @@
46	clock-frequency = <250000000>;	46	clock-frequency = <250000000>;
47	status = "okay";	47	status = "okay";
48	};	48	};
		49
49	sata@d00a0000 {	50	sata@d00a0000 {
50	nr-ports = <2>;	51	nr-ports = <2>;
51	status = "okay";	52	status = "okay";


diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 638fb68d47b2..b42652fd3d8c 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -104,5 +104,22 @@
104	phy = <&phy3>;	104	phy = <&phy3>;
105	phy-mode = "sgmii";	105	phy-mode = "sgmii";
106	};	106	};
		107	i2c@d0011000 {
		108	status = "okay";
		109	clock-frequency = <400000>;
		110	};
		111	i2c@d0011100 {
		112	status = "okay";
		113	clock-frequency = <400000>;
		114
		115	s35390a: s35390a@30 {
		116	compatible = "s35390a";
		117	reg = <0x30>;
		118	};
		119	};
		120	sata@d00a0000 {
		121	nr-ports = <2>;
		122	status = "okay";
		123	};
107	};	124	};
108	};	125	};


diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 6008f12c1990..a702fb345c01 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig
@@ -34,9 +34,13 @@ CONFIG_MARVELL_PHY=y
34	CONFIG_SERIAL_8250=y	34	CONFIG_SERIAL_8250=y
35	CONFIG_SERIAL_8250_CONSOLE=y	35	CONFIG_SERIAL_8250_CONSOLE=y
36	CONFIG_SERIAL_OF_PLATFORM=y	36	CONFIG_SERIAL_OF_PLATFORM=y
		37	CONFIG_I2C=y
		38	CONFIG_I2C_MV64XXX=y
37	CONFIG_GPIOLIB=y	39	CONFIG_GPIOLIB=y
38	CONFIG_GPIO_SYSFS=y	40	CONFIG_GPIO_SYSFS=y
39	# CONFIG_USB_SUPPORT is not set	41	# CONFIG_USB_SUPPORT is not set
		42	CONFIG_RTC_CLASS=y
		43	CONFIG_RTC_DRV_S35390A=y
40	CONFIG_DMADEVICES=y	44	CONFIG_DMADEVICES=y
41	CONFIG_MV_XOR=y	45	CONFIG_MV_XOR=y
42	# CONFIG_IOMMU_SUPPORT is not set	46	# CONFIG_IOMMU_SUPPORT is not set