Commit c88f7e6a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-defconfig-4.6-2' of... 

Merge tag 'samsung-defconfig-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/arm64

Merge "ARM64 defconfig changes for Exynos based boards for v4.6" from Krzysztof Kozlowski:

1. We want thermal for Exynos7 TMU unit to monitor the temperature.
2. Enable the drivers for PMIC used on Exynos7-based Espresso board.

* tag 'samsung-defconfig-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  arm64: defconfig: Enable Samsung MFD and related configs
  arm64: defconfig: Enable exynos thermal config
  ARM: multi_v7_defconfig: Remove MAX77802 RTC Kconfig symbol
  ARM: exynos_defconfig: Remove MAX77802 RTC Kconfig symbol
  rtc: max77686: Cleanup and reduce dmesg output
  rtc: Remove Maxim 77802 driver
  rtc: max77686: Properly handle regmap_irq_get_virq() error code
  rtc: max77686: Fix unsupported year message
  rtc: max77686: Add max77802 support
  rtc: max77686: Add an indirection level to access RTC registers
  rtc: max77686: Use a driver data struct instead hard-coded values
  rtc: max77686: Use usleep_range() instead of msleep()
  rtc: max77686: Use ARRAY_SIZE() instead of current array length
  rtc: max77686: Fix max77686_rtc_read_alarm() return value
  ARM: exynos_defconfig: Enable s5p-secss driver
  ARM: exynos_defconfig: Enable NEON, accelerated crypto and cpufreq stats

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 31cf19a1 6bb83718

arch/arm/configs/exynos_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -26,12 +26,14 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -193,7 +195,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX8997=y

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_MAX77802=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y
@@ -238,7 +239,12 @@ CONFIG_DEBUG_RT_MUTEXES=y 
CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=m

CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -665,7 +665,6 @@ CONFIG_RTC_DRV_MAX8907=y 
CONFIG_RTC_DRV_MAX8997=m

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_RK808=m

CONFIG_RTC_DRV_MAX77802=m

CONFIG_RTC_DRV_RS5C372=m

CONFIG_RTC_DRV_PALMAS=y

CONFIG_RTC_DRV_ST_LPC=y

arch/arm64/configs/defconfig

+6 −0
Original line number Diff line number Diff line
@@ -164,11 +164,16 @@ CONFIG_GPIO_XGENE=y 
CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SEC_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QCOM_SMD_RPM=y

CONFIG_REGULATOR_QCOM_SPMI=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -215,6 +220,7 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_EFI=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_SUN6I=y

drivers/rtc/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -335,16 +335,6 @@ config RTC_DRV_RK808 
	  This driver can also be built as a module. If so, the module

	  will be called rk808-rtc.



config RTC_DRV_MAX77802

	tristate "Maxim 77802 RTC"

	depends on MFD_MAX77686

	help

	  If you say yes here you will get support for the

	  RTC of Maxim MAX77802 PMIC.



	  This driver can also be built as a module. If so, the module

	  will be called rtc-max77802.



config RTC_DRV_RS5C372

	tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"

	help

drivers/rtc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o 
obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o

obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o

obj-$(CONFIG_RTC_DRV_MAX77686)	+= rtc-max77686.o

obj-$(CONFIG_RTC_DRV_MAX77802)	+= rtc-max77802.o

obj-$(CONFIG_RTC_DRV_MAX8907)	+= rtc-max8907.o

obj-$(CONFIG_RTC_DRV_MAX8925)	+= rtc-max8925.o

obj-$(CONFIG_RTC_DRV_MAX8997)	+= rtc-max8997.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE