aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/z2.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-05-31 16:51:52 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-06-18 15:07:35 +0800
commit8499ded85927ca84a246a6502018087e19b7df2c (patch)
treecc62e11928ccab74a5185c7728cb6e828b21fcc9 /arch/arm/mach-pxa/z2.c
parent[ARM] pxa/z2: Add battery support into Zipit Z2 (diff)
downloadlinux-dev-8499ded85927ca84a246a6502018087e19b7df2c.tar.xz
linux-dev-8499ded85927ca84a246a6502018087e19b7df2c.zip
[ARM] pxa/z2: Register WM8750
This patch registers the WM8750 codec on a proper place on the ZipitZ2 machine after the WM8750 driver was converted to new API. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/z2.c')
-rw-r--r--arch/arm/mach-pxa/z2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index 1452c71805c1..967e8cb8d6fc 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -473,7 +473,10 @@ static struct i2c_board_info __initdata z2_i2c_board_info[] = {
{
I2C_BOARD_INFO("aer915", 0x55),
.platform_data = &batt_chip_info,
- }
+ }, {
+ I2C_BOARD_INFO("wm8750", 0x1b),
+ },
+
};
static void __init z2_i2c_init(void)