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

Commit 07058599 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

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
parents 7f8635cc cb186886

arch/arm/mach-s3c2412/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -28,9 +28,16 @@ config S3C2412_DMA 


config S3C2412_PM

	bool

	select S3C2412_PM_SLEEP

	help

	  Internal config node to apply S3C2412 power management



config S3C2412_PM_SLEEP

	bool

	help

	  Internal config node to apply sleep for S3C2412 power management.

	  Can be selected by another SoCs with similar sleep procedure.



# Note, the S3C2412 IOtiming support is in plat-s3c24xx



config S3C2412_CPUFREQ

arch/arm/mach-s3c2412/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ obj-$(CONFIG_CPU_S3C2412) += irq.o 
obj-$(CONFIG_CPU_S3C2412)	+= clock.o

obj-$(CONFIG_CPU_S3C2412)	+= gpio.o

obj-$(CONFIG_S3C2412_DMA)	+= dma.o

obj-$(CONFIG_S3C2412_PM)	+= pm.o sleep.o

obj-$(CONFIG_S3C2412_PM)	+= pm.o

obj-$(CONFIG_S3C2412_PM_SLEEP)	+= sleep.o

obj-$(CONFIG_S3C2412_CPUFREQ)	+= cpu-freq.o



# Machine support

arch/arm/mach-s3c2416/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config S3C2416_DMA 


config S3C2416_PM

	bool

	select S3C2412_PM_SLEEP

	help

	  Internal config node to apply S3C2416 power management

arch/arm/mach-s5pv210/mach-aquila.c

+6 −0
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ static struct max8998_regulator_data aquila_regulators[] = { 
static struct max8998_platform_data aquila_max8998_pdata = {

	.num_regulators	= ARRAY_SIZE(aquila_regulators),

	.regulators	= aquila_regulators,

	.buck1_set1	= S5PV210_GPH0(3),

	.buck1_set2	= S5PV210_GPH0(4),

	.buck2_set3	= S5PV210_GPH0(5),

	.buck1_max_voltage1 = 1200000,

	.buck1_max_voltage2 = 1200000,

	.buck2_max_voltage = 1200000,

};

#endif

arch/arm/mach-s5pv210/mach-goni.c

+6 −0
Original line number Diff line number Diff line
@@ -518,6 +518,12 @@ static struct max8998_regulator_data goni_regulators[] = { 
static struct max8998_platform_data goni_max8998_pdata = {

	.num_regulators	= ARRAY_SIZE(goni_regulators),

	.regulators	= goni_regulators,

	.buck1_set1	= S5PV210_GPH0(3),

	.buck1_set2	= S5PV210_GPH0(4),

	.buck2_set3	= S5PV210_GPH0(5),

	.buck1_max_voltage1 = 1200000,

	.buck1_max_voltage2 = 1200000,

	.buck2_max_voltage = 1200000,

};

#endif