Commit 5dc11049 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-non-critical-4.6' of... 

Merge tag 'samsung-fixes-non-critical-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/fixes-non-critical

Fixes from Arnd for harmless warnings for Exynos and S3C platforms.

* tag 'samsung-fixes-non-critical-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: EXYNOS: select THERMAL_OF
  ARM: s3c64xx: mark regulator init data as unused
  ARM: s3c24xx: fix unused gta02_configure_pmu_for_charger warning
  ARM: s3c24xx: allow selecting S3C2440_XTAL_16934400 for s3c2442
  ARM: s3c24xx: don't select EEPROM_AT24

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 388f7b1d dc7eb9d5

arch/arm/configs/mini2440_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ CONFIG_I2C=y 
CONFIG_I2C_CHARDEV=y

CONFIG_I2C_S3C2410=y

CONFIG_I2C_SIMTEC=y

CONFIG_EEPROM_AT24=y

CONFIG_SPI=y

CONFIG_SPI_S3C24XX=y

CONFIG_SPI_SPIDEV=y

arch/arm/configs/s3c2410_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ CONFIG_HW_RANDOM=y 
CONFIG_I2C_CHARDEV=m

CONFIG_I2C_S3C2410=y

CONFIG_I2C_SIMTEC=y

CONFIG_EEPROM_AT24=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=m

CONFIG_SPI_S3C24XX=m

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ menuconfig ARCH_EXYNOS 
	select S5P_DEV_MFC

	select SRAM

	select THERMAL

	select THERMAL_OF

	select MFD_SYSCON

	select CLKSRC_EXYNOS_MCT

	select POWER_RESET

arch/arm/mach-s3c24xx/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ config MACH_S3C2416_DT 


endif	# CPU_S3C2416



if CPU_S3C2440

if CPU_S3C2440 || CPU_S3C2442



config S3C2440_XTAL_12000000

	bool
@@ -432,6 +432,9 @@ config S3C2440_PLL_16934400 
	default y if S3C24XX_PLL

	help

	  PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.

endif



if CPU_S3C2440



comment "S3C2440 Boards"
@@ -460,7 +463,6 @@ config MACH_AT2440EVB 


config MACH_MINI2440

	bool "MINI2440 development board"

	select EEPROM_AT24 if I2C

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select LEDS_TRIGGER_BACKLIGHT

arch/arm/mach-s3c24xx/mach-gta02.c

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = { 
#define ADC_NOM_CHG_DETECT_1A 6

#define ADC_NOM_CHG_DETECT_USB 43



#ifdef CONFIG_PCF50633_ADC

static void

gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res)

{
@@ -174,6 +175,7 @@ gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res) 


	pcf50633_mbc_usb_curlim_set(pcf, ma);

}

#endif



static struct delayed_work gta02_charger_work;

static int gta02_usb_vbus_draw;

CRA Git | Maintained and supported by SUSTech CRA and CCSE