diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 11:13:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 11:13:06 -0400 |
| commit | cc1c1b5d21899f9ceec7d5434421f97a03c7d0fa (patch) | |
| tree | b8fbadf2679010267620247083b4f49c65fb2e35 /arch | |
| parent | e8f98457587b8a11121ea0da6b6fe995a136e8fa (diff) | |
| parent | 31c17ac98fc005c0998f890094eb8fe17061e667 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-39x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dove-cubox.dts | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index c675257f2377..f076ff856d8b 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | mainpll: mainpll { | 69 | mainpll: mainpll { |
| 70 | compatible = "fixed-clock"; | 70 | compatible = "fixed-clock"; |
| 71 | #clock-cells = <0>; | 71 | #clock-cells = <0>; |
| 72 | clock-frequency = <2000000000>; | 72 | clock-frequency = <1000000000>; |
| 73 | }; | 73 | }; |
| 74 | /* 25 MHz reference crystal */ | 74 | /* 25 MHz reference crystal */ |
| 75 | refclk: oscillator { | 75 | refclk: oscillator { |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index ed2dd8ba4080..218a2acd36e5 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
| @@ -585,7 +585,7 @@ | |||
| 585 | mainpll: mainpll { | 585 | mainpll: mainpll { |
| 586 | compatible = "fixed-clock"; | 586 | compatible = "fixed-clock"; |
| 587 | #clock-cells = <0>; | 587 | #clock-cells = <0>; |
| 588 | clock-frequency = <2000000000>; | 588 | clock-frequency = <1000000000>; |
| 589 | }; | 589 | }; |
| 590 | 590 | ||
| 591 | /* 25 MHz reference crystal */ | 591 | /* 25 MHz reference crystal */ |
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index 0e85fc15ceda..ecd1318109ba 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi | |||
| @@ -502,7 +502,7 @@ | |||
| 502 | mainpll: mainpll { | 502 | mainpll: mainpll { |
| 503 | compatible = "fixed-clock"; | 503 | compatible = "fixed-clock"; |
| 504 | #clock-cells = <0>; | 504 | #clock-cells = <0>; |
| 505 | clock-frequency = <2000000000>; | 505 | clock-frequency = <1000000000>; |
| 506 | }; | 506 | }; |
| 507 | }; | 507 | }; |
| 508 | }; | 508 | }; |
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index aae7efc09b0b..e6fa251e17b9 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts | |||
| @@ -87,6 +87,7 @@ | |||
| 87 | 87 | ||
| 88 | /* connect xtal input to 25MHz reference */ | 88 | /* connect xtal input to 25MHz reference */ |
| 89 | clocks = <&ref25>; | 89 | clocks = <&ref25>; |
| 90 | clock-names = "xtal"; | ||
| 90 | 91 | ||
| 91 | /* connect xtal input as source of pll0 and pll1 */ | 92 | /* connect xtal input as source of pll0 and pll1 */ |
| 92 | silabs,pll-source = <0 0>, <1 0>; | 93 | silabs,pll-source = <0 0>, <1 0>; |