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

Commit 72275b4c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu into next/drivers 

Merge "mvebu drivers change for 4.2" from Gregory CLEMENT:

mvebu-mbus: add mv_mbus_dram_info_nooverlap() needed for the new
Marvell crypto driver

* tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: add mv_mbus_dram_info_nooverlap()

Based on the earlier bug fixes branch, which contains six other
patches already merged into 4.1.
parents 9ff3d178 bfa1ce5f

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Armada 370 and Armada XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>
@@ -1202,12 +1202,17 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/rtc-armada38x.c

F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*





ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-berlin/

F:	arch/arm/boot/dts/berlin*





ARM/Marvell Dove/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>
@@ -1220,6 +1225,9 @@ F: arch/arm/mach-dove/ 
F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/

F:	arch/arm/boot/dts/dove*

F:	arch/arm/boot/dts/orion5x*





ARM/Orion SoC/Technologic Systems TS-78xx platform support

M:	Alexander Clouter <alex@digriz.org.uk>

arch/arm/boot/dts/armada-375.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

		/* 25 MHz reference crystal */

		refclk: oscillator {

arch/arm/boot/dts/armada-38x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};



		/* 25 MHz reference crystal */

arch/arm/boot/dts/armada-39x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

	};

};

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ 


		internal-regs {



			rtc@10300 {

				/* No crystal connected to the internal RTC */

				status = "disabled";

			};



			/* J10: VCC, NC, RX, NC, TX, GND  */

			serial@12000 {

				status = "okay";