diff options
| author | Olof Johansson <olof@lixom.net> | 2016-10-17 13:44:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-10-17 13:44:03 -0700 |
| commit | 5c85b8722c839b214857ea0627401b82aa2bcf72 (patch) | |
| tree | 3f5dfecafd22ee064a9cc8654edd7a876471b893 /arch/arm64/boot | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| parent | 51227bf52008bd4c4c50da4b749bbc6e7bbbca52 (diff) | |
| download | blackbird-op-linux-5c85b8722c839b214857ea0627401b82aa2bcf72.tar.gz blackbird-op-linux-5c85b8722c839b214857ea0627401b82aa2bcf72.zip | |
Merge tag 'mvebu-fixes-4.8-3' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.8 (part 3)
- Select corediv clk for all mvebu v7 SoC
- Fix clocksource for CP110 master SPI0 for Armada 7K/8K
* tag 'mvebu-fixes-4.8-3' of git://git.infradead.org/linux-mvebu:
arm64: dts: marvell: fix clocksource for CP110 master SPI0
ARM: mvebu: Select corediv clk for all mvebu v7 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index e5e3ed678b6f..602e2c2e9a4d 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -131,7 +131,7 @@ #address-cells = <0x1>; #size-cells = <0x0>; cell-index = <1>; - clocks = <&cpm_syscon0 0 3>; + clocks = <&cpm_syscon0 1 21>; status = "disabled"; }; |
