From 9e3f473492353852d07ce359c10540c6f1fbd14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sat, 19 Jun 2010 03:51:57 +0000 Subject: [PATCH] FS#11417 by Joe Balough: fix audio/tuner on philips hdd6330 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26952 a1c6a512-1295-4272-9138-f99709370657 --- docs/CREDITS | 1 + firmware/drivers/audio/wm8731.c | 2 +- firmware/drivers/tuner/tea5767.c | 2 +- firmware/target/arm/wmcodec-pp.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/CREDITS b/docs/CREDITS index b6491f2998..7fe0301cd4 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -548,6 +548,7 @@ Aaron Rothbaum Nejc Lotric Hinrik Örn Sigurðsson Stephen Carroll +Joe Balough The libmad team The wavpack team diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index 41c6757525..71050454f3 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c @@ -201,7 +201,7 @@ void audiohw_postinit(void) #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) /* We need to enable bit 4 of GPIOL for output for sound on H10 */ GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x10); -#elif defined(PHILIPS_HDD1630) +#elif defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) GPO32_ENABLE |= 0x2; GPO32_VAL &= ~0x2; #endif diff --git a/firmware/drivers/tuner/tea5767.c b/firmware/drivers/tuner/tea5767.c index 7c6d5b59ef..5888e00781 100644 --- a/firmware/drivers/tuner/tea5767.c +++ b/firmware/drivers/tuner/tea5767.c @@ -28,7 +28,7 @@ #include "fmradio.h" #include "fmradio_i2c.h" /* physical interface driver */ -#if defined(PHILIPS_HDD1630) || defined(ONDA_VX747) || defined(ONDA_VX777) +#if defined(PHILIPS_HDD1630) || defined(ONDA_VX747) || defined(ONDA_VX777) || defined(PHILIPS_HDD6330) #define I2C_ADR 0x60 #else #define I2C_ADR 0xC0 diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/wmcodec-pp.c index e6fbf47f0d..839fd90676 100644 --- a/firmware/target/arm/wmcodec-pp.c +++ b/firmware/target/arm/wmcodec-pp.c @@ -33,7 +33,7 @@ #include "wmcodec.h" #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || \ - defined(MROBE_100) || defined(PHILIPS_HDD1630) || \ + defined(MROBE_100) || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) || \ defined(PBELL_VIBE500) /* The H10's audio codec uses an I2C address of 0x1b */ #define I2C_AUDIO_ADDRESS 0x1b