diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 20:38:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 20:38:47 -0700 |
commit | 90e6872061adb913d28e971d9ed783631e3f225a (patch) | |
tree | e2d96c6f687ffd152c9a9471bfd89516b30dfb61 /arch/arc/boot | |
parent | a0cb2b5c390151837b08e5f7bca4a6ecddbcd39c (diff) | |
parent | fdbed19697e1aa0f7cb719c11c67f2da26ea7f47 (diff) | |
download | lwn-90e6872061adb913d28e971d9ed783631e3f225a.tar.gz lwn-90e6872061adb913d28e971d9ed783631e3f225a.zip |
Merge tag 'arc-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Fixes for HSDK platform
- module build error for !LLSC config
* tag 'arc-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: unbork module link errors with !CONFIG_ARC_HAS_LLSC
ARC: [plat-hsdk] Increase SDIO CIU frequency to 50000000Hz
ARC: [plat-hsdk] select CONFIG_RESET_HSDK from Kconfig
Diffstat (limited to 'arch/arc/boot')
-rw-r--r-- | arch/arc/boot/dts/hsdk.dts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts index 8adde1b492f1..8f627c200d60 100644 --- a/arch/arc/boot/dts/hsdk.dts +++ b/arch/arc/boot/dts/hsdk.dts @@ -137,14 +137,15 @@ /* * DW sdio controller has external ciu clock divider * controlled via register in SDIO IP. Due to its - * unexpected default value (it should devide by 1 - * but it devides by 8) SDIO IP uses wrong clock and + * unexpected default value (it should divide by 1 + * but it divides by 8) SDIO IP uses wrong clock and * works unstable (see STAR 9001204800) + * We switched to the minimum possible value of the + * divisor (div-by-2) in HSDK platform code. * So add temporary fix and change clock frequency - * from 100000000 to 12500000 Hz until we fix dw sdio - * driver itself. + * to 50000000 Hz until we fix dw sdio driver itself. */ - clock-frequency = <12500000>; + clock-frequency = <50000000>; #clock-cells = <0>; }; |