davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Two fixes for v4.7 cycle for build issues:

Browse Source 
1. Fix samsung-keypad build error if INPUT is selected as module.
    The error though depends on some uncommon build settings so it
    is not as easy to trigger.
 
 2. Get rid of 'samsung_device_dma_mask' defined but not used warning.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXS9roAAoJEME3ZuaGi4PXtOEP/RiDgd2W4lZRHoLQHOTrzVC2
 fGpSNwBPFTyemJe9+5Qm6XjqPGITn+TbiLl7QZmYu0cxympcXKVNyePiC3poP/oK
 f7yw5sfimBACba5/PvqbiqtSl4xCymBuRlhraZ4vOaRAkUPvKW8cFazudYKNLemi
 A2as/2MifWZRRUCHlaVnGVRMYZ33MZ/MWqgRTbb5ofJw54Vo9WNPgj+8dVWiM42V
 nHULYwTLAedYnlyBFQGuwcY1oJJMVdwC7SKVs2RTLYGSpBhQ9DPTMaLr2lJiSVLU
 eWbdrWRZu4+lVLbtnqmuJBNdlIFuN+cvzmqkYbCFSiJKyYbmZpksn/YF1hAOmchq
 DZwbMdaJxnoCrObDkGq6p52GjZVX0PdFgZklV34Eo577JzKO8+hLTinFSFwYkGEz
 7s2W13WyO95ldMAXoaBqI12UU5U8Blpg6YZ92c5jzS4waATxuPAcYmLnAGRabiul
 RCNrvAe6V04T5voEleCB8KVcyMVc/QeVbgpGAjwcQ0wBR+HsTUarZXMk3U6Q+u5m
 LEcgWck9nfdzaP5EEI+90xFPTfGr3xvPXgkFfcp7yx8NmNaqqSYw6kJncHBQC1LW
 eCdWNkSa5DeISR2xmaHY4g9qET+PahruoS2D5eJ4/ZiRzKYtuSe6fwKoFsJ+iQr+
 KUMP9GXMOyRo0c172e0F
 =LR9t
 -----END PGP SIGNATURE-----

Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes

Two fixes for v4.7 cycle for build issues:
1. Fix samsung-keypad build error if INPUT is selected as module.
   The error though depends on some uncommon build settings so it
   is not as easy to trigger.

2. Get rid of 'samsung_device_dma_mask' defined but not used warning.

* tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: don't select keyboard driver
  ARM: samsung: improve static dma_mask definition

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-06-03 12:15:00 -07:00
commit c3d66602e0
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/exynos_defconfig
View File

@ -82,6 +82,7 @@ CONFIG_TOUCHSCREEN_MMS114=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MAX77693_HAPTIC=y
CONFIG_INPUT_MAX8997_HAPTIC=y
CONFIG_KEYBOARD_SAMSUNG=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y

1
arch/arm/configs/multi_v7_defconfig
View File

@ -264,6 +264,7 @@ CONFIG_KEYBOARD_TEGRA=y
CONFIG_KEYBOARD_SPEAR=y
CONFIG_KEYBOARD_ST_KEYSCAN=y
CONFIG_KEYBOARD_CROS_EC=m
CONFIG_KEYBOARD_SAMSUNG=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_CYAPA=m
CONFIG_MOUSE_ELAN_I2C=y

1
arch/arm/mach-exynos/Kconfig
View File

@ -61,7 +61,6 @@ config ARCH_EXYNOS4
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
select CPU_EXYNOS4210
select GIC_NON_BANKED
select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
select MIGHT_HAVE_CACHE_L2X0
help
Samsung EXYNOS4 (Cortex-A9) SoC based systems

2
arch/arm/plat-samsung/devs.c
View File

@ -68,7 +68,7 @@
#include <linux/platform_data/asoc-s3c.h>
#include <linux/platform_data/spi-s3c64xx.h>
static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
#define samsung_device_dma_mask (*((u64[]) { DMA_BIT_MASK(32) }))
/* AC97 */
#ifdef CONFIG_CPU_S3C2440