diff options
| author | Olof Johansson <olof@lixom.net> | 2018-11-30 14:49:03 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-30 14:49:03 -0500 |
| commit | 9f60337147f02793f4ce009a99bbd4387b7de794 (patch) | |
| tree | 06a1ae243fcb934e4ab4a27a051a52929c7bccf0 | |
| parent | 63415a3c38ddd952608a0bc9afd856f5fcdb6edb (diff) | |
| parent | 4ab7ca092c3c7ac8b16aa28eba723a8868f82f14 (diff) | |
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>
| -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 @@ | |||
| 314 | 0x1 0x0 0x60000000 0x10000000 | 314 | 0x1 0x0 0x60000000 0x10000000 |
| 315 | 0x2 0x0 0x70000000 0x10000000 | 315 | 0x2 0x0 0x70000000 0x10000000 |
| 316 | 0x3 0x0 0x80000000 0x10000000>; | 316 | 0x3 0x0 0x80000000 0x10000000>; |
| 317 | clocks = <&mck>; | 317 | clocks = <&h32ck>; |
| 318 | status = "disabled"; | 318 | status = "disabled"; |
| 319 | 319 | ||
| 320 | nand_controller: nand-controller { | 320 | nand_controller: nand-controller { |