Commit 9bb29b6b927bcd79cf185ee67bcebfe630f0dea1
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "A very small set of fixes for 3.19, as everyone was out. The clocksource patch was something I missed for the merge window after the change that broke arm64 was merged through arm-soc. The other two patches are a fix for an undetected merge problem in mvebu and a defconfig change to make some exynos boards work with the normal multi_v7_defconfig" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: Add USB_EHCI_EXYNOS to multi_v7_defconfig ARM: mvebu: Fix pinctrl configuration for Armada 370 DB clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64
Showing 3 changed files Side-by-side Diff
arch/arm/boot/dts/armada-370-db.dts
| ... | ... | @@ -203,28 +203,4 @@ |
| 203 | 203 | compatible = "linux,spdif-dir"; |
| 204 | 204 | }; |
| 205 | 205 | }; |
| 206 | - | |
| 207 | -&pinctrl { | |
| 208 | - /* | |
| 209 | - * These pins might be muxed as I2S by | |
| 210 | - * the bootloader, but it conflicts | |
| 211 | - * with the real I2S pins that are | |
| 212 | - * muxed using i2s_pins. We must mux | |
| 213 | - * those pins to a function other than | |
| 214 | - * I2S. | |
| 215 | - */ | |
| 216 | - pinctrl-0 = <&hog_pins1 &hog_pins2>; | |
| 217 | - pinctrl-names = "default"; | |
| 218 | - | |
| 219 | - hog_pins1: hog-pins1 { | |
| 220 | - marvell,pins = "mpp6", "mpp8", "mpp10", | |
| 221 | - "mpp12", "mpp13"; | |
| 222 | - marvell,function = "gpio"; | |
| 223 | - }; | |
| 224 | - | |
| 225 | - hog_pins2: hog-pins2 { | |
| 226 | - marvell,pins = "mpp5", "mpp7", "mpp9"; | |
| 227 | - marvell,function = "gpo"; | |
| 228 | - }; | |
| 229 | -}; |
arch/arm/configs/multi_v7_defconfig
drivers/clocksource/arm_arch_timer.c
| ... | ... | @@ -462,7 +462,7 @@ |
| 462 | 462 | |
| 463 | 463 | /* Register the CP15 based counter if we have one */ |
| 464 | 464 | if (type & ARCH_CP15_TIMER) { |
| 465 | - if (arch_timer_use_virtual) | |
| 465 | + if (IS_ENABLED(CONFIG_ARM64) || arch_timer_use_virtual) | |
| 466 | 466 | arch_timer_read_counter = arch_counter_get_cntvct; |
| 467 | 467 | else |
| 468 | 468 | arch_timer_read_counter = arch_counter_get_cntpct; |