Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[mv-sheeva.git] / drivers / media / common / tuners / tuner-simple.c

diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 149d54cdf7b97a4ff92107e3afffbb1c773a1ddc..8abbcc5fcf9542f5787e7dae940441f3dc3a38df 100644 (file)
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -144,6 +144,8 @@ static inline int tuner_stereo(const int type, const int status)
        case TUNER_LG_NTSC_TAPE:
        case TUNER_TCL_MF02GIP_5N:
                return ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
+       case TUNER_PHILIPS_FM1216MK5:
+               return status | TUNER_STEREO;
        default:
                return status & TUNER_STEREO;
        }
@@ -508,6 +510,10 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
        case TUNER_TCL_MF02GIP_5N:
                buffer[3] = 0x19;
                break;
+       case TUNER_PHILIPS_FM1216MK5:
+               buffer[2] = 0x88;
+               buffer[3] = 0x09;
+               break;
        case TUNER_TNF_5335MF:
                buffer[3] = 0x11;
                break;