Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d66602 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-4.7' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 15b7cc78 8a6f71cc

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-samsung/devs.c

+1 −1
Original line number Diff line number Diff line
@@ -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