diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-11-30 11:49:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-30 11:49:03 -0800 |
| commit | 9f60337147f02793f4ce009a99bbd4387b7de794 (patch) | |
| tree | 06a1ae243fcb934e4ab4a27a051a52929c7bccf0 /arch/arm | |
| parent | Merge tag 'arm-soc/for-4.20/maintainers-part2' of https://github.com/Broadcom/stblinux into fixes (diff) | |
| parent | ARM: dts: at91: sama5d2: use the divided clock for SMC (diff) | |
| download | linux-dev-9f60337147f02793f4ce009a99bbd4387b7de794.tar.xz linux-dev-9f60337147f02793f4ce009a99bbd4387b7de794.zip | |
Merge tag 'at91-4.20-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into fixes
AT91 fixes for 4.20
- Fix the SMC parent clock
* tag 'at91-4.20-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: sama5d2: use the divided clock for SMC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/sama5d2.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index 843052f14f1c..dd0dda6ed44b 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -314,7 +314,7 @@ 0x1 0x0 0x60000000 0x10000000 0x2 0x0 0x70000000 0x10000000 0x3 0x0 0x80000000 0x10000000>; - clocks = <&mck>; + clocks = <&h32ck>; status = "disabled"; nand_controller: nand-controller { |