Skip to content

Commit

Permalink
Merge tag 'mvebu-fixes-4.1-2' of git://git.infradead.org/linux-mvebu …
Browse files Browse the repository at this point in the history
…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
arndb committed May 15, 2015
2 parents e8f9845 + 31c17ac commit cc1c1b5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
10 changes: 9 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
Expand All @@ -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]>
Expand All @@ -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]>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-375.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
mainpll: mainpll {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <2000000000>;
clock-frequency = <1000000000>;
};
/* 25 MHz reference crystal */
refclk: oscillator {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-38x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
mainpll: mainpll {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <2000000000>;
clock-frequency = <1000000000>;
};

/* 25 MHz reference crystal */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-39x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
mainpll: mainpll {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <2000000000>;
clock-frequency = <1000000000>;
};
};
};
1 change: 1 addition & 0 deletions arch/arm/boot/dts/dove-cubox.dts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@

/* connect xtal input to 25MHz reference */
clocks = <&ref25>;
clock-names = "xtal";

/* connect xtal input as source of pll0 and pll1 */
silabs,pll-source = <0 0>, <1 0>;
Expand Down

0 comments on commit cc1c1b5

Please sign in to comment.