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

Commit cc1c1b5d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-4.1-2' of git://git.infradead.org/linux-mvebu into fixes 

Merge "mvebu fixes for 4.1 (part 2)" from Gregory CLEMENT:

Fix the main PLL frequency on Armada 375, 38x and 39x SoCs
Add clock-names to CuBox Si5351 clk generator
Add dts entries in the MAINTAINERS file

* tag 'mvebu-fixes-4.1-2' of git://git.infradead.org/linux-mvebu:
  MAINTAINERS: Add dts entries for some of the Marvell SoCs
  ARM: dove: Add clock-names to CuBox Si5351 clk generator
  ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs
parents e8f98457 31c17ac9

MAINTAINERS

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

M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained

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:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

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

S:	Maintained

F:	arch/arm/mach-mvebu/

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/rtc-armada38x.c

F:	drivers/rtc/rtc-armada38x.c

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

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







ARM/Marvell Berlin SoC support

ARM/Marvell Berlin SoC support

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

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

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

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

S:	Maintained

S:	Maintained

F:	arch/arm/mach-berlin/

F:	arch/arm/mach-berlin/

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







ARM/Marvell Dove/MV78xx0/Orion SOC support

ARM/Marvell Dove/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>

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

F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/

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

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

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

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

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

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

		mainpll: mainpll {

			compatible = "fixed-clock";

			compatible = "fixed-clock";

			#clock-cells = <0>;

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

		};

		/* 25 MHz reference crystal */

		/* 25 MHz reference crystal */

		refclk: oscillator {

		refclk: oscillator {

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

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

		mainpll: mainpll {

			compatible = "fixed-clock";

			compatible = "fixed-clock";

			#clock-cells = <0>;

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

		};





		/* 25 MHz reference crystal */

		/* 25 MHz reference crystal */

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

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

		mainpll: mainpll {

			compatible = "fixed-clock";

			compatible = "fixed-clock";

			#clock-cells = <0>;

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

		};

	};

	};

};
 
};

arch/arm/boot/dts/dove-cubox.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ 




		/* connect xtal input to 25MHz reference */

		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clocks = <&ref25>;

		clock-names = "xtal";





		/* connect xtal input as source of pll0 and pll1 */

		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;

		silabs,pll-source = <0 0>, <1 0>;