aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-21 13:32:54 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 20:10:19 -0400
commit600a1dfae24746ccd8b1617742ef7b98099f83b8 (patch)
tree67eeaa58816681ed37257499bbfce23dd8db5844 /arch/arm/mach-s3c24xx
parentb44ce3b0f9c3883e7c537793b808feee9a2a00fb (diff)
parent9f3ba4567e8d11de89673afea174d206ca9446f6 (diff)
Merge branch 'randconfig-fixes' into next/fixes-non-critical
This is the first batch of a much longer series of bug fixes found during randconfig testing. This part are all the simple patches that are applicable for the arm-soc tree, while most other fixes will likely go through other maintainers. * randconfig-fixes: (50 commits) 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 ARM: s3c24xx: osiris dvs needs tps65010 ARM: s3c24xx: fix gta02 build error ARM: s3c24xx: MINI2440 needs I2C for EEPROM_AT24 ARM: integrator: only select pl01x if TTY is enabled ARM: realview: fix sparsemem build ARM: footbridge: make screen_info setup conditional ARM: footbridge: fix build with PCI disabled ARM: footbridge: don't build floppy code for addin mode ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig4
-rw-r--r--arch/arm/mach-s3c24xx/mach-gta02.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index d876431d64c0..f2727f2cc661 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -537,7 +537,7 @@ config MACH_AT2440EVB
537 537
538config MACH_MINI2440 538config MACH_MINI2440
539 bool "MINI2440 development board" 539 bool "MINI2440 development board"
540 select EEPROM_AT24 540 select EEPROM_AT24 if I2C
541 select LEDS_CLASS 541 select LEDS_CLASS
542 select LEDS_TRIGGERS 542 select LEDS_TRIGGERS
543 select LEDS_TRIGGER_BACKLIGHT 543 select LEDS_TRIGGER_BACKLIGHT
@@ -573,7 +573,7 @@ config MACH_OSIRIS
573config MACH_OSIRIS_DVS 573config MACH_OSIRIS_DVS
574 tristate "Simtec IM2440D20 (OSIRIS) Dynamic Voltage Scaling driver" 574 tristate "Simtec IM2440D20 (OSIRIS) Dynamic Voltage Scaling driver"
575 depends on MACH_OSIRIS 575 depends on MACH_OSIRIS
576 select TPS65010 576 depends on TPS65010
577 help 577 help
578 Say Y/M here if you want to have dynamic voltage scaling support 578 Say Y/M here if you want to have dynamic voltage scaling support
579 on the Simtec IM2440D20 (OSIRIS) module via the TPS65011. 579 on the Simtec IM2440D20 (OSIRIS) module via the TPS65011.
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index d9170e9f8ccd..ee7bb2905a99 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -196,7 +196,7 @@ static void gta02_charger_worker(struct work_struct *work)
196 * If the PCF50633 ADC is disabled we fallback to a 196 * If the PCF50633 ADC is disabled we fallback to a
197 * 100mA limit for safety. 197 * 100mA limit for safety.
198 */ 198 */
199 pcf50633_mbc_usb_curlim_set(pcf, 100); 199 pcf50633_mbc_usb_curlim_set(gta02_pcf, 100);
200#endif 200#endif
201} 201}
202 202