tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
ARM S3C24XX: Fix compilation of PM code for S3C2416
ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry

Linus Torvalds 07058599 7f8635cc

+23 -2
unified split
+7
arch/arm/mach-s3c2412/Kconfig
··· 28 28 29 29 config S3C2412_PM 30 30 bool 31 + select S3C2412_PM_SLEEP 31 32 help 32 33 Internal config node to apply S3C2412 power management 34 + 35 + config S3C2412_PM_SLEEP 36 + bool 37 + help 38 + Internal config node to apply sleep for S3C2412 power management. 39 + Can be selected by another SoCs with similar sleep procedure. 33 40 34 41 # Note, the S3C2412 IOtiming support is in plat-s3c24xx 35 42
+2 -1
arch/arm/mach-s3c2412/Makefile
··· 14 14 obj-$(CONFIG_CPU_S3C2412) += clock.o 15 15 obj-$(CONFIG_CPU_S3C2412) += gpio.o 16 16 obj-$(CONFIG_S3C2412_DMA) += dma.o 17 - obj-$(CONFIG_S3C2412_PM) += pm.o sleep.o 17 + obj-$(CONFIG_S3C2412_PM) += pm.o 18 + obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep.o 18 19 obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o 19 20 20 21 # Machine support
+1
arch/arm/mach-s3c2416/Kconfig
··· 27 27 28 28 config S3C2416_PM 29 29 bool 30 + select S3C2412_PM_SLEEP 30 31 help 31 32 Internal config node to apply S3C2416 power management 32 33
+6
arch/arm/mach-s5pv210/mach-aquila.c
··· 378 378 static struct max8998_platform_data aquila_max8998_pdata = { 379 379 .num_regulators = ARRAY_SIZE(aquila_regulators), 380 380 .regulators = aquila_regulators, 381 + .buck1_set1 = S5PV210_GPH0(3), 382 + .buck1_set2 = S5PV210_GPH0(4), 383 + .buck2_set3 = S5PV210_GPH0(5), 384 + .buck1_max_voltage1 = 1200000, 385 + .buck1_max_voltage2 = 1200000, 386 + .buck2_max_voltage = 1200000, 381 387 }; 382 388 #endif 383 389
+6
arch/arm/mach-s5pv210/mach-goni.c
··· 518 518 static struct max8998_platform_data goni_max8998_pdata = { 519 519 .num_regulators = ARRAY_SIZE(goni_regulators), 520 520 .regulators = goni_regulators, 521 + .buck1_set1 = S5PV210_GPH0(3), 522 + .buck1_set2 = S5PV210_GPH0(4), 523 + .buck2_set3 = S5PV210_GPH0(5), 524 + .buck1_max_voltage1 = 1200000, 525 + .buck1_max_voltage2 = 1200000, 526 + .buck2_max_voltage = 1200000, 521 527 }; 522 528 #endif 523 529
+1 -1
arch/arm/plat-s3c24xx/Kconfig
··· 8 8 default y 9 9 select NO_IOPORT 10 10 select ARCH_REQUIRE_GPIOLIB 11 - select S3C_DEVICE_NAND 11 + select S3C_DEV_NAND 12 12 select S3C_GPIO_CFG_S3C24XX 13 13 help 14 14 Base platform code for any Samsung S3C24XX device