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

Commit be76871e 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 late/board

* 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: Hook up carrier class modules on Cragganmore
  ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
parents 36be5051 ea070cd2

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

+8 −1
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ static const struct i2c_board_info wm1277_devs[] = { 
	},

};



static const struct i2c_board_info wm6230_i2c_devs[] = {

	{ I2C_BOARD_INFO("wm9081", 0x6c),

	  .platform_data = &wm9081_pdata, },

};



static __devinitdata const struct {

	u8 id;

	const char *name;
@@ -195,7 +200,9 @@ static __devinitdata const struct { 
	{ .id = 0x03, .name = "1252-EV1 Glenlivet" },

	{ .id = 0x11, .name = "6249-EV2 Glenfarclas", },

	{ .id = 0x14, .name = "6271-EV1 Lochnagar" },

	{ .id = 0x15, .name = "XXXX-EV1 Bells" },

	{ .id = 0x15, .name = "6320-EV1 Bells",

	  .i2c_devs = wm6230_i2c_devs,

	  .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },

	{ .id = 0x21, .name = "1275-EV1 Mortlach" },

	{ .id = 0x25, .name = "1274-EV1 Glencadam" },

	{ .id = 0x31, .name = "1253-EV1 Tomatin",

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

+1 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = { 
	  .irq = S3C_EINT(0),

	  .platform_data = &glenfarclas_pmic_pdata },



	{ I2C_BOARD_INFO("wlf-gf-module", 0x22) },

	{ I2C_BOARD_INFO("wlf-gf-module", 0x24) },

	{ I2C_BOARD_INFO("wlf-gf-module", 0x25) },

	{ I2C_BOARD_INFO("wlf-gf-module", 0x26) },