Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e76b1b2 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge tag 'marvell-openblocks-i2c-sata-for-3.8' of... 

Merge tag 'marvell-openblocks-i2c-sata-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell SATA and I2C enabling for OpenBlocks AX3-4
parents 32d6448a 9bfd143e

arch/arm/boot/dts/armada-370-xp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -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";

		};

	};

};

arch/arm/boot/dts/armada-xp-db.dts

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
			clock-frequency = <250000000>;

			status = "okay";

		};



		sata@d00a0000 {

			nr-ports = <2>;

			status = "okay";

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+17 −0
Original line number Diff line number Diff line
@@ -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";

		};

	};

};

arch/arm/configs/mvebu_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -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