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

Commit 00630913 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/board-samsung-2' of... 

Merge branch 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards

From Kukjin Kim:
This is for Samsung board updates just for s3c64xx

* 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
  ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0d5c2e21 f4fe3881

arch/arm/mach-s3c64xx/mach-crag6410.c

+18 −2
Original line number Diff line number Diff line
@@ -287,16 +287,21 @@ static struct platform_device littlemill_device = { 
	.id		= -1,

};



static struct platform_device bells_wm5102_device = {

static struct platform_device bells_wm2200_device = {

	.name		= "bells",

	.id		= 0,

};



static struct platform_device bells_wm5110_device = {

static struct platform_device bells_wm5102_device = {

	.name		= "bells",

	.id		= 1,

};



static struct platform_device bells_wm5110_device = {

	.name		= "bells",

	.id		= 2,

};



static struct regulator_consumer_supply wallvdd_consumers[] = {

	REGULATOR_SUPPLY("SPKVDD", "1-001a"),

	REGULATOR_SUPPLY("SPKVDD1", "1-001a"),
@@ -328,6 +333,16 @@ static struct regulator_consumer_supply wallvdd_consumers[] = { 
	REGULATOR_SUPPLY("DC1VDD", "1-0034"),

	REGULATOR_SUPPLY("DC2VDD", "1-0034"),

	REGULATOR_SUPPLY("DC3VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO1VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO2VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO4VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO5VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO6VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO7VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO8VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO9VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO10VDD", "1-0034"),

	REGULATOR_SUPPLY("LDO11VDD", "1-0034"),

};



static struct regulator_init_data wallvdd_data = {
@@ -376,6 +391,7 @@ static struct platform_device *crag6410_devices[] __initdata = { 
	&tobermory_device,

	&littlemill_device,

	&lowland_device,

	&bells_wm2200_device,

	&bells_wm5102_device,

	&bells_wm5110_device,

	&wallvdd_device,