forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
5 changed files
with
13 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1193,7 +1193,7 @@ ARM/MAGICIAN MACHINE SUPPORT | |
M: Philipp Zabel <[email protected]> | ||
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 <[email protected]> | ||
M: Andrew Lunn <[email protected]> | ||
M: Gregory Clement <[email protected]> | ||
|
@@ -1202,12 +1202,17 @@ L: [email protected] (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 <[email protected]> | ||
L: [email protected] (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 <[email protected]> | ||
|
@@ -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 <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters