mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlfhYDEACgkQCwYYjhRyO9XaBwCdGJp7xh21bQtg8wX1ROmX/430 EGIAoKzEXjU3SNJL1fEghsMJLarsvVaq =D3Mt -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
5c85b8722c
2 changed files with 2 additions and 4 deletions
|
@ -23,6 +23,7 @@ config MACH_MVEBU_V7
|
||||||
select CACHE_L2X0
|
select CACHE_L2X0
|
||||||
select ARM_CPU_SUSPEND
|
select ARM_CPU_SUSPEND
|
||||||
select MACH_MVEBU_ANY
|
select MACH_MVEBU_ANY
|
||||||
|
select MVEBU_CLK_COREDIV
|
||||||
|
|
||||||
config MACH_ARMADA_370
|
config MACH_ARMADA_370
|
||||||
bool "Marvell Armada 370 boards"
|
bool "Marvell Armada 370 boards"
|
||||||
|
@ -32,7 +33,6 @@ config MACH_ARMADA_370
|
||||||
select CPU_PJ4B
|
select CPU_PJ4B
|
||||||
select MACH_MVEBU_V7
|
select MACH_MVEBU_V7
|
||||||
select PINCTRL_ARMADA_370
|
select PINCTRL_ARMADA_370
|
||||||
select MVEBU_CLK_COREDIV
|
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support boards based
|
Say 'Y' here if you want your kernel to support boards based
|
||||||
on the Marvell Armada 370 SoC with device tree.
|
on the Marvell Armada 370 SoC with device tree.
|
||||||
|
@ -50,7 +50,6 @@ config MACH_ARMADA_375
|
||||||
select HAVE_SMP
|
select HAVE_SMP
|
||||||
select MACH_MVEBU_V7
|
select MACH_MVEBU_V7
|
||||||
select PINCTRL_ARMADA_375
|
select PINCTRL_ARMADA_375
|
||||||
select MVEBU_CLK_COREDIV
|
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support boards based
|
Say 'Y' here if you want your kernel to support boards based
|
||||||
on the Marvell Armada 375 SoC with device tree.
|
on the Marvell Armada 375 SoC with device tree.
|
||||||
|
@ -68,7 +67,6 @@ config MACH_ARMADA_38X
|
||||||
select HAVE_SMP
|
select HAVE_SMP
|
||||||
select MACH_MVEBU_V7
|
select MACH_MVEBU_V7
|
||||||
select PINCTRL_ARMADA_38X
|
select PINCTRL_ARMADA_38X
|
||||||
select MVEBU_CLK_COREDIV
|
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support boards based
|
Say 'Y' here if you want your kernel to support boards based
|
||||||
on the Marvell Armada 380/385 SoC with device tree.
|
on the Marvell Armada 380/385 SoC with device tree.
|
||||||
|
|
|
@ -131,7 +131,7 @@ cpm_spi0: spi@700600 {
|
||||||
#address-cells = <0x1>;
|
#address-cells = <0x1>;
|
||||||
#size-cells = <0x0>;
|
#size-cells = <0x0>;
|
||||||
cell-index = <1>;
|
cell-index = <1>;
|
||||||
clocks = <&cpm_syscon0 0 3>;
|
clocks = <&cpm_syscon0 1 21>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue