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

Commit e6a194b7 authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

ARM: S3C64XX: Add WM2200 module for Cragganmore 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 41830ee0

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

+15 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>





#include <sound/wm0010.h>

#include <sound/wm0010.h>

#include <sound/wm2200.h>

#include <sound/wm5100.h>

#include <sound/wm5100.h>

#include <sound/wm8996.h>

#include <sound/wm8996.h>

#include <sound/wm8962.h>

#include <sound/wm8962.h>
@@ -277,6 +278,18 @@ static const struct i2c_board_info wm6230_i2c_devs[] = { 
	  .platform_data = &wm9081_pdata, },

	  .platform_data = &wm9081_pdata, },

};

};





static struct wm2200_pdata wm2200_pdata = {

	.ldo_ena = S3C64XX_GPN(7),

	.gpio_defaults = {

		[2] = 0x0005,  /* GPIO3 24.576MHz output clock */

	},

};



static const struct i2c_board_info wm2200_i2c[] = {

	{ I2C_BOARD_INFO("wm2200", 0x3a),

	  .platform_data = &wm2200_pdata, },

};



static __devinitdata const struct {

static __devinitdata const struct {

	u8 id;

	u8 id;

	u8 rev;

	u8 rev;
@@ -326,6 +339,8 @@ static __devinitdata const struct { 
	{ .id = 0x3e, .rev = -1, .name = "WM5102-6271-EV1-CS127 Amrut",

	{ .id = 0x3e, .rev = -1, .name = "WM5102-6271-EV1-CS127 Amrut",

	  .spi_devs = wm5102_spi_devs,

	  .spi_devs = wm5102_spi_devs,

	  .num_spi_devs = ARRAY_SIZE(wm5102_spi_devs) },

	  .num_spi_devs = ARRAY_SIZE(wm5102_spi_devs) },

	{ .id = 0x3f, .rev = -1, .name = "WM2200-6271-CS90-M-REV1",

	  .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c) },

};

};





static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,

static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -629,6 +629,11 @@ static struct regulator_consumer_supply pvdd_1v8_consumers[] __devinitdata = { 
	REGULATOR_SUPPLY("DCVDD", "1-001a"),

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

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

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

	REGULATOR_SUPPLY("DBVDD", "spi0.0"),

	REGULATOR_SUPPLY("DBVDD", "spi0.0"),



	REGULATOR_SUPPLY("DBVDD", "1-003a"),

	REGULATOR_SUPPLY("LDOVDD", "1-003a"),

	REGULATOR_SUPPLY("CPVDD", "1-003a"),

	REGULATOR_SUPPLY("AVDD", "1-003a"),

	REGULATOR_SUPPLY("DBVDD1", "spi0.1"),

	REGULATOR_SUPPLY("DBVDD1", "spi0.1"),

	REGULATOR_SUPPLY("DBVDD2", "spi0.1"),

	REGULATOR_SUPPLY("DBVDD2", "spi0.1"),

	REGULATOR_SUPPLY("DBVDD3", "spi0.1"),

	REGULATOR_SUPPLY("DBVDD3", "spi0.1"),