aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorapatard@mandriva.com <apatard@mandriva.com>2010-05-31 07:49:13 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-31 08:16:37 -0400
commit492e2bf141478e2c1ce3abfda381f73d1f2108f5 (patch)
treeffe839118d5d204355ac73c31acec4edd62e301c /arch/arm/mach-kirkwood
parent49106c729053b3c7c963a988aeaf00aa2424a7aa (diff)
openrd-client: initialise audio
This patch is reponsible for enabling audio on the openrd client board Signed-off-by: Arnaud Patard <apatard@mandriva.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/openrd-setup.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index ad3f1ec33796..e36067ad3aca 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -15,6 +15,7 @@
15#include <linux/mtd/partitions.h> 15#include <linux/mtd/partitions.h>
16#include <linux/ata_platform.h> 16#include <linux/ata_platform.h>
17#include <linux/mv643xx_eth.h> 17#include <linux/mv643xx_eth.h>
18#include <linux/i2c.h>
18#include <asm/mach-types.h> 19#include <asm/mach-types.h>
19#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
20#include <mach/kirkwood.h> 21#include <mach/kirkwood.h>
@@ -60,6 +61,12 @@ static unsigned int openrd_mpp_config[] __initdata = {
60 0 61 0
61}; 62};
62 63
64static struct i2c_board_info i2c_board_info[] __initdata = {
65 {
66 I2C_BOARD_INFO("cs42l51", 0x4a),
67 },
68};
69
63static void __init openrd_init(void) 70static void __init openrd_init(void)
64{ 71{
65 /* 72 /*
@@ -80,6 +87,12 @@ static void __init openrd_init(void)
80 kirkwood_sdio_init(&openrd_mvsdio_data); 87 kirkwood_sdio_init(&openrd_mvsdio_data);
81 88
82 kirkwood_i2c_init(); 89 kirkwood_i2c_init();
90
91 if (machine_is_openrd_client()) {
92 i2c_register_board_info(0, i2c_board_info,
93 ARRAY_SIZE(i2c_board_info));
94 kirkwood_audio_init();
95 }
83} 96}
84 97
85static int __init openrd_pci_init(void) 98static int __init openrd_pci_init(void)