diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 16:44:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 16:44:27 -0400 |
| commit | 9f800363bb0ea459e15bef0928a72c88d374e489 (patch) | |
| tree | 13a6b4165d3e2ba18e88e5103437f74e84e0838d | |
| parent | 2d1eb87ae1e6f3999e77989fd2f831b134270787 (diff) | |
| parent | cb46a256a78225817945cd52068d61d5126c236e (diff) | |
Merge tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
"Lots of isolated bug fixes that were not found to be important enough
to be submitted before the merge window or backported into stable
kernels.
The vast majority of these came out of Arnd's randconfig testing and
just prevents running into build-time bugs in configurations that we
do not care about in practice"
* tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
ARM: at91: fix a typo
ARM: moxart: fix CPU selection
ARM: tegra: fix board DT pinmux setup
ARM: nspire: Fix compiler warning
IXP4xx: Fix DMA masks.
Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
IXP4xx: Fix Goramo Multilink GPIO conversion.
Revert "ARM: ixp4xx: fix gpio rework"
ARM: tegra: make debug_ll code build for ARMv6
ARM: sunxi: fix build for THUMB2_KERNEL
ARM: exynos: add missing include of linux/module.h
ARM: exynos: fix l2x0 saved regs handling
ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
ARM: samsung: select ATAGS where necessary
ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
ARM: samsung: allow serial driver to be disabled
ARM: s5pv210: enable IDE support in MACH_TORBRECK
ARM: s5p64x0: fix building with only one soc type
ARM: s3c64xx: select power domains only when used
ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
...
80 files changed, 347 insertions, 270 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f728ac2b298a..ebb6c6f30c56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -824,7 +824,7 @@ ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE | |||
| 824 | M: Alexander Shiyan <shc_work@mail.ru> | 824 | M: Alexander Shiyan <shc_work@mail.ru> |
| 825 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 825 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 826 | S: Odd Fixes | 826 | S: Odd Fixes |
| 827 | F: arch/arm/mach-clps711x/ | 827 | N: clps711x |
| 828 | 828 | ||
| 829 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE | 829 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE |
| 830 | M: Hartley Sweeten <hsweeten@visionengravers.com> | 830 | M: Hartley Sweeten <hsweeten@visionengravers.com> |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6b4ac5de6dec..79bea0b34d1f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -423,6 +423,7 @@ config ARCH_EFM32 | |||
| 423 | bool "Energy Micro efm32" | 423 | bool "Energy Micro efm32" |
| 424 | depends on !MMU | 424 | depends on !MMU |
| 425 | select ARCH_REQUIRE_GPIOLIB | 425 | select ARCH_REQUIRE_GPIOLIB |
| 426 | select AUTO_ZRELADDR | ||
| 426 | select ARM_NVIC | 427 | select ARM_NVIC |
| 427 | # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged, | 428 | # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged, |
| 428 | # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO | 429 | # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO |
| @@ -698,6 +699,7 @@ config ARCH_RPC | |||
| 698 | select ARCH_MAY_HAVE_PC_FDC | 699 | select ARCH_MAY_HAVE_PC_FDC |
| 699 | select ARCH_SPARSEMEM_ENABLE | 700 | select ARCH_SPARSEMEM_ENABLE |
| 700 | select ARCH_USES_GETTIMEOFFSET | 701 | select ARCH_USES_GETTIMEOFFSET |
| 702 | select CPU_SA110 | ||
| 701 | select FIQ | 703 | select FIQ |
| 702 | select HAVE_IDE | 704 | select HAVE_IDE |
| 703 | select HAVE_PATA_PLATFORM | 705 | select HAVE_PATA_PLATFORM |
| @@ -732,6 +734,7 @@ config ARCH_S3C24XX | |||
| 732 | bool "Samsung S3C24XX SoCs" | 734 | bool "Samsung S3C24XX SoCs" |
| 733 | select ARCH_HAS_CPUFREQ | 735 | select ARCH_HAS_CPUFREQ |
| 734 | select ARCH_REQUIRE_GPIOLIB | 736 | select ARCH_REQUIRE_GPIOLIB |
| 737 | select ATAGS | ||
| 735 | select CLKDEV_LOOKUP | 738 | select CLKDEV_LOOKUP |
| 736 | select CLKSRC_SAMSUNG_PWM | 739 | select CLKSRC_SAMSUNG_PWM |
| 737 | select GENERIC_CLOCKEVENTS | 740 | select GENERIC_CLOCKEVENTS |
| @@ -754,6 +757,7 @@ config ARCH_S3C64XX | |||
| 754 | select ARCH_REQUIRE_GPIOLIB | 757 | select ARCH_REQUIRE_GPIOLIB |
| 755 | select ARM_AMBA | 758 | select ARM_AMBA |
| 756 | select ARM_VIC | 759 | select ARM_VIC |
| 760 | select ATAGS | ||
| 757 | select CLKDEV_LOOKUP | 761 | select CLKDEV_LOOKUP |
| 758 | select CLKSRC_SAMSUNG_PWM | 762 | select CLKSRC_SAMSUNG_PWM |
| 759 | select COMMON_CLK | 763 | select COMMON_CLK |
| @@ -765,7 +769,7 @@ config ARCH_S3C64XX | |||
| 765 | select HAVE_TCM | 769 | select HAVE_TCM |
| 766 | select NO_IOPORT | 770 | select NO_IOPORT |
| 767 | select PLAT_SAMSUNG | 771 | select PLAT_SAMSUNG |
| 768 | select PM_GENERIC_DOMAINS | 772 | select PM_GENERIC_DOMAINS if PM |
