Commit 4954da8b authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge tag 'marvell-sata-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge 

Marvell Armada 370/XP support for 3.8
parents ae24db86 3d82daaa

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -34,5 +34,9 @@ serial@d0012000 { 
			clock-frequency = <200000000>;

			clock-frequency = <200000000>;

			status = "okay";

			status = "okay";

		};

		};

		sata@d00a0000 {

			nr-ports = <2>;

			status = "okay";

		};

	};

	};

};
 
};

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,16 @@ addr-decoding@d0020000 { 
			compatible = "marvell,armada-addr-decoding-controller";

			compatible = "marvell,armada-addr-decoding-controller";

			reg = <0xd0020000 0x258>;

			reg = <0xd0020000 0x258>;

		};

		};



		sata@d00a0000 {

			compatible = "marvell,orion-sata";

			reg = <0xd00a0000 0x2400>;

			interrupts = <55>;

			clocks = <&gateclk 15>, <&gateclk 30>;

			clock-names = "0", "1";

			status = "disabled";

		};



	};

	};

};

};

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -46,5 +46,9 @@ serial@d0012300 { 
			clock-frequency = <250000000>;

			clock-frequency = <250000000>;

			status = "okay";

			status = "okay";

		};

		};

		sata@d00a0000 {

			nr-ports = <2>;

			status = "okay";

		};

	};

	};

};
 
};

arch/arm/configs/multi_v7_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_VFP=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NEON=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_ATA=y

CONFIG_SATA_HIGHBANK=y

CONFIG_SATA_HIGHBANK=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_SMSC911X=y

CONFIG_SMSC911X=y

arch/arm/configs/mvebu_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,9 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_VFP=y

CONFIG_VFP=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_MV=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_OF_PLATFORM=y