diff options
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-cards.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-cards.c | 150 |
1 files changed, 102 insertions, 48 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c index 3ca078057755..c7405766609c 100644 --- a/drivers/media/pci/saa7134/saa7134-cards.c +++ b/drivers/media/pci/saa7134/saa7134-cards.c | |||
| @@ -20,13 +20,14 @@ | |||
| 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "saa7134.h" | ||
| 24 | #include "saa7134-reg.h" | ||
| 25 | |||
| 23 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 24 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 25 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 26 | #include <linux/i2c-algo-bit.h> | 29 | #include <linux/i2c-algo-bit.h> |
| 27 | 30 | ||
| 28 | #include "saa7134-reg.h" | ||
| 29 | #include "saa7134.h" | ||
| 30 | #include "tuner-xc2028.h" | 31 | #include "tuner-xc2028.h" |
| 31 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
| 32 | #include <media/tveeprom.h> | 33 | #include <media/tveeprom.h> |
| @@ -5850,6 +5851,39 @@ struct saa7134_board saa7134_boards[] = { | |||
| 5850 | .amux = LINE1, | 5851 | .amux = LINE1, |
| 5851 | } }, | 5852 | } }, |
| 5852 | }, | 5853 | }, |
| 5854 | [SAA7134_BOARD_AVERMEDIA_505] = { | ||
| 5855 | /* much like the "studio" version but without radio | ||
| 5856 | * and another tuner (dbaryshkov@gmail.com) */ | ||
| 5857 | .name = "AverMedia AverTV/505", | ||
| 5858 | .audio_clock = 0x00187de7, | ||
| 5859 | .tuner_type = TUNER_PHILIPS_FQ1216ME, | ||
| 5860 | .radio_type = UNSET, | ||
| 5861 | .tuner_addr = ADDR_UNSET, | ||
| 5862 | .radio_addr = ADDR_UNSET, | ||
| 5863 | .tda9887_conf = TDA9887_PRESENT, | ||
| 5864 | .inputs = {{ | ||
| 5865 | .name = name_tv, | ||
| 5866 | .vmux = 1, | ||
| 5867 | .amux = LINE2, | ||
| 5868 | .tv = 1, | ||
| 5869 | }, { | ||
| 5870 | .name = name_comp1, | ||
| 5871 | .vmux = 0, | ||
| 5872 | .amux = LINE2, | ||
| 5873 | }, { | ||
| 5874 | .name = name_comp2, | ||
| 5875 | .vmux = 3, | ||
| 5876 | .amux = LINE2, | ||
| 5877 | }, { | ||
| 5878 | .name = name_svideo, | ||
| 5879 | .vmux = 8, | ||
| 5880 | .amux = LINE2, | ||
| 5881 | } }, | ||
| 5882 | .mute = { | ||
| 5883 | .name = name_mute, | ||
| 5884 | .amux = LINE1, | ||
| 5885 | }, | ||
| 5886 | }, | ||
| 5853 | 5887 | ||
| 5854 | }; | 5888 | }; |
| 5855 | 5889 | ||
| @@ -7109,6 +7143,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
| 7109 | .subdevice = 0x7007, | 7143 | .subdevice = 0x7007, |
| 7110 | .driver_data = SAA7134_BOARD_WIS_VOYAGER, | 7144 | .driver_data = SAA7134_BOARD_WIS_VOYAGER, |
| 7111 | }, { | 7145 | }, { |
| 7146 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
| 7147 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
| 7148 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
| 7149 | .subdevice = 0xa10a, | ||
| 7150 | .driver_data = SAA7134_BOARD_AVERMEDIA_505, | ||
| 7151 | }, { | ||
| 7112 | /* --- boards without eeprom + subsystem ID --- */ | 7152 | /* --- boards without eeprom + subsystem ID --- */ |
| 7113 | .vendor = PCI_VENDOR_ID_PHILIPS, | 7153 | .vendor = PCI_VENDOR_ID_PHILIPS, |
| 7114 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 7154 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
| @@ -7158,10 +7198,10 @@ MODULE_DEVICE_TABLE(pci, saa7134_pci_tbl); | |||
| 7158 | 7198 | ||
| 7159 | static void board_flyvideo(struct saa7134_dev *dev) | 7199 | static void board_flyvideo(struct saa7134_dev *dev) |
| 7160 | { | 7200 | { |
| 7161 | printk("%s: there are different flyvideo cards with different tuners\n" | 7201 | pr_warn("%s: there are different flyvideo cards with different tuners\n" |
| 7162 | "%s: out there, you might have to use the tuner=<nr> insmod\n" | 7202 | "%s: out there, you might have to use the tuner=<nr> insmod\n" |
| 7163 | "%s: option to override the default value.\n", | 7203 | "%s: option to override the default value.\n", |
| 7164 | dev->name, dev->name, dev->name); | 7204 | dev->name, dev->name, dev->name); |
| 7165 | } | 7205 | } |
| 7166 | 7206 | ||
| 7167 | static int saa7134_xc2028_callback(struct saa7134_dev *dev, | 7207 | static int saa7134_xc2028_callback(struct saa7134_dev *dev, |
| @@ -7194,7 +7234,7 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev, | |||
| 7194 | saa7134_set_gpio(dev, 20, 1); | 7234 | saa7134_set_gpio(dev, 20, 1); |
| 7195 | break; | 7235 | break; |
| 7196 | } | 7236 | } |
| 7197 | return 0; | 7237 | return 0; |
| 7198 | } | 7238 | } |
| 7199 | return -EINVAL; | 7239 | return -EINVAL; |
| 7200 | } | 7240 | } |
| @@ -7380,7 +7420,7 @@ int saa7134_tuner_callback(void *priv, int component, int command, int arg) | |||
| 7380 | return saa7134_xc5000_callback(dev, command, arg); | 7420 | return saa7134_xc5000_callback(dev, command, arg); |
| 7381 | } | 7421 | } |
| 7382 | } else { | 7422 | } else { |
| 7383 | printk(KERN_ERR "saa7134: Error - device struct undefined.\n"); | 7423 | pr_err("saa7134: Error - device struct undefined.\n"); |
| 7384 | return -EINVAL; | 7424 | return -EINVAL; |
| 7385 | } | 7425 | } |
| 7386 | return -EINVAL; | 7426 | return -EINVAL; |
| @@ -7411,12 +7451,12 @@ static void hauppauge_eeprom(struct saa7134_dev *dev, u8 *eeprom_data) | |||
| 7411 | case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */ | 7451 | case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */ |
| 7412 | break; | 7452 | break; |
| 7413 | default: | 7453 | default: |
| 7414 | printk(KERN_WARNING "%s: warning: " | 7454 | pr_warn("%s: warning: " |
| 7415 | "unknown hauppauge model #%d\n", dev->name, tv.model); | 7455 | "unknown hauppauge model #%d\n", dev->name, tv.model); |
| 7416 | break; | 7456 | break; |
| 7417 | } | 7457 | } |
| 7418 | 7458 | ||
| 7419 | printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n", | 7459 | pr_info("%s: hauppauge eeprom: model=%d\n", |
| 7420 | dev->name, tv.model); | 7460 | dev->name, tv.model); |
| 7421 | } | 7461 | } |
| 7422 | 7462 | ||
| @@ -7427,7 +7467,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 7427 | /* Always print gpio, often manufacturers encode tuner type and other info. */ | 7467 | /* Always print gpio, often manufacturers encode tuner type and other info. */ |
| 7428 | saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0); | 7468 | saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0); |
| 7429 | dev->gpio_value = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2); | 7469 | dev->gpio_value = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2); |
| 7430 | printk(KERN_INFO "%s: board init: gpio is %x\n", dev->name, dev->gpio_value); | 7470 | pr_info("%s: board init: gpio is %x\n", dev->name, dev->gpio_value); |
| 7431 | 7471 | ||
| 7432 | switch (dev->board) { | 7472 | switch (dev->board) { |
| 7433 | case SAA7134_BOARD_FLYVIDEO2000: | 7473 | case SAA7134_BOARD_FLYVIDEO2000: |
| @@ -7448,8 +7488,9 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 7448 | case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: | 7488 | case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: |
| 7449 | case SAA7134_BOARD_KWORLD_XPERT: | 7489 | case SAA7134_BOARD_KWORLD_XPERT: |
| 7450 | case SAA7134_BOARD_AVERMEDIA_STUDIO_305: | 7490 | case SAA7134_BOARD_AVERMEDIA_STUDIO_305: |
| 7451 | case SAA7134_BOARD_AVERMEDIA_STUDIO_505: | ||
| 7452 | case SAA7134_BOARD_AVERMEDIA_305: | 7491 | case SAA7134_BOARD_AVERMEDIA_305: |
| 7492 | case SAA7134_BOARD_AVERMEDIA_STUDIO_505: | ||
| 7493 | case SAA7134_BOARD_AVERMEDIA_505: | ||
| 7453 | case SAA7134_BOARD_AVERMEDIA_STUDIO_307: | 7494 | case SAA7134_BOARD_AVERMEDIA_STUDIO_307: |
| 7454 | case SAA7134_BOARD_AVERMEDIA_307: | 7495 | case SAA7134_BOARD_AVERMEDIA_307: |
| 7455 | case SAA7134_BOARD_AVERMEDIA_STUDIO_507: | 7496 | case SAA7134_BOARD_AVERMEDIA_STUDIO_507: |
| @@ -7512,10 +7553,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 7512 | dev->has_remote = SAA7134_REMOTE_GPIO; | 7553 | dev->has_remote = SAA7134_REMOTE_GPIO; |
| 7513 | break; | 7554 | break; |
| 7514 | case SAA7134_BOARD_MD5044: | 7555 | case SAA7134_BOARD_MD5044: |
| 7515 | printk("%s: seems there are two different versions of the MD5044\n" | 7556 | pr_warn("%s: seems there are two different versions of the MD5044\n" |
| 7516 | "%s: (with the same ID) out there. If sound doesn't work for\n" | 7557 | "%s: (with the same ID) out there. If sound doesn't work for\n" |
| 7517 | "%s: you try the audio_clock_override=0x200000 insmod option.\n", | 7558 | "%s: you try the audio_clock_override=0x200000 insmod option.\n", |
| 7518 | dev->name,dev->name,dev->name); | 7559 | dev->name, dev->name, dev->name); |
| 7519 | break; | 7560 | break; |
| 7520 | case SAA7134_BOARD_CINERGY400_CARDBUS: | 7561 | case SAA7134_BOARD_CINERGY400_CARDBUS: |
| 7521 | /* power-up tuner chip */ | 7562 | /* power-up tuner chip */ |
| @@ -7640,10 +7681,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 7640 | dev->has_remote = SAA7134_REMOTE_I2C; | 7681 | dev->has_remote = SAA7134_REMOTE_I2C; |
| 7641 | break; | 7682 | break; |
| 7642 | case SAA7134_BOARD_AVERMEDIA_A169_B: | 7683 | case SAA7134_BOARD_AVERMEDIA_A169_B: |
| 7643 | printk("%s: %s: dual saa713x broadcast decoders\n" | 7684 | pr_warn("%s: %s: dual saa713x broadcast decoders\n" |
| 7644 | "%s: Sorry, none of the inputs to this chip are supported yet.\n" | 7685 | "%s: Sorry, none of the inputs to this chip are supported yet.\n" |
| 7645 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", | 7686 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", |
| 7646 | dev->name,card(dev).name,dev->name,dev->name); | 7687 | dev->name, card(dev).name, dev->name, dev->name); |
| 7647 | break; | 7688 | break; |
| 7648 | case SAA7134_BOARD_AVERMEDIA_M102: | 7689 | case SAA7134_BOARD_AVERMEDIA_M102: |
| 7649 | /* enable tuner */ | 7690 | /* enable tuner */ |
| @@ -7789,7 +7830,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7789 | if (board == dev->board) | 7830 | if (board == dev->board) |
| 7790 | break; | 7831 | break; |
| 7791 | dev->board = board; | 7832 | dev->board = board; |
| 7792 | printk("%s: board type fixup: %s\n", dev->name, | 7833 | pr_warn("%s: board type fixup: %s\n", dev->name, |
| 7793 | saa7134_boards[dev->board].name); | 7834 | saa7134_boards[dev->board].name); |
| 7794 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; | 7835 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; |
| 7795 | 7836 | ||
| @@ -7797,10 +7838,11 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7797 | case SAA7134_BOARD_MD7134: | 7838 | case SAA7134_BOARD_MD7134: |
| 7798 | { | 7839 | { |
| 7799 | u8 subaddr; | 7840 | u8 subaddr; |
| 7800 | u8 data[3]; | 7841 | u8 data[3], data1[] = { 0x09, 0x9f, 0x86, 0x11}; |
| 7801 | int ret, tuner_t; | 7842 | int ret, tuner_t; |
| 7802 | struct i2c_msg msg[] = {{.addr=0x50, .flags=0, .buf=&subaddr, .len = 1}, | 7843 | struct i2c_msg msg[] = {{.addr = 0x50, .flags = 0, .buf = &subaddr, .len = 1}, |
| 7803 | {.addr=0x50, .flags=I2C_M_RD, .buf=data, .len = 3}}; | 7844 | {.addr = 0x50, .flags = I2C_M_RD, .buf = data, .len = 3}}, |
| 7845 | msg1 = {.addr = 0x61, .flags = 0, .buf = data1, .len = sizeof(data1)}; | ||
| 7804 | 7846 | ||
| 7805 | subaddr= 0x14; | 7847 | subaddr= 0x14; |
| 7806 | tuner_t = 0; | 7848 | tuner_t = 0; |
| @@ -7810,7 +7852,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7810 | */ | 7852 | */ |
| 7811 | ret = i2c_transfer(&dev->i2c_adap, msg, 2); | 7853 | ret = i2c_transfer(&dev->i2c_adap, msg, 2); |
| 7812 | if (ret != 2) { | 7854 | if (ret != 2) { |
| 7813 | printk(KERN_ERR "EEPROM read failure\n"); | 7855 | pr_err("EEPROM read failure\n"); |
| 7814 | } else if ((data[0] != 0) && (data[0] != 0xff)) { | 7856 | } else if ((data[0] != 0) && (data[0] != 0xff)) { |
| 7815 | /* old config structure */ | 7857 | /* old config structure */ |
| 7816 | subaddr = data[0] + 2; | 7858 | subaddr = data[0] + 2; |
| @@ -7825,7 +7867,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7825 | dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; | 7867 | dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; |
| 7826 | break; | 7868 | break; |
| 7827 | default: | 7869 | default: |
| 7828 | printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); | 7870 | pr_err("%s Can't determine tuner type %x from EEPROM\n", |
| 7871 | dev->name, tuner_t); | ||
| 7829 | } | 7872 | } |
| 7830 | } else if ((data[1] != 0) && (data[1] != 0xff)) { | 7873 | } else if ((data[1] != 0) && (data[1] != 0xff)) { |
| 7831 | /* new config structure */ | 7874 | /* new config structure */ |
| @@ -7842,16 +7885,28 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7842 | break; | 7885 | break; |
| 7843 | case 0x001d: | 7886 | case 0x001d: |
| 7844 | dev->tuner_type = TUNER_PHILIPS_FMD1216ME_MK3; | 7887 | dev->tuner_type = TUNER_PHILIPS_FMD1216ME_MK3; |
| 7845 | printk(KERN_INFO "%s Board has DVB-T\n", dev->name); | 7888 | pr_info("%s Board has DVB-T\n", |
| 7889 | dev->name); | ||
| 7846 | break; | 7890 | break; |
| 7847 | default: | 7891 | default: |
| 7848 | printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); | 7892 | pr_err("%s Can't determine tuner type %x from EEPROM\n", |
| 7893 | dev->name, tuner_t); | ||
| 7849 | } | 7894 | } |
| 7850 | } else { | 7895 | } else { |
| 7851 | printk(KERN_ERR "%s unexpected config structure\n", dev->name); | 7896 | pr_err("%s unexpected config structure\n", dev->name); |
| 7852 | } | 7897 | } |
| 7853 | 7898 | ||
| 7854 | printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type); | 7899 | pr_info("%s Tuner type is %d\n", dev->name, dev->tuner_type); |
| 7900 | |||
| 7901 | /* The tuner TUNER_PHILIPS_FMD1216ME_MK3 after hardware */ | ||
| 7902 | /* start has disabled IF and enabled DVB-T. When saa7134 */ | ||
| 7903 | /* scan I2C devices it will not detect IF tda9887 and can`t*/ | ||
| 7904 | /* watch TV without software reboot. To solve this problem */ | ||
| 7905 | /* switch the tuner to analog TV mode manually. */ | ||
| 7906 | if (dev->tuner_type == TUNER_PHILIPS_FMD1216ME_MK3) { | ||
| 7907 | if (i2c_transfer(&dev->i2c_adap, &msg1, 1) != 1) | ||
| 7908 | printk(KERN_WARNING "%s: Unable to enable IF of the tuner.\n", dev->name); | ||
| 7909 | } | ||
| 7855 | break; | 7910 | break; |
| 7856 | } | 7911 | } |
| 7857 | case SAA7134_BOARD_PHILIPS_EUROPA: | 7912 | case SAA7134_BOARD_PHILIPS_EUROPA: |
| @@ -7859,7 +7914,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7859 | /* Reconfigure board as Snake reference design */ | 7914 | /* Reconfigure board as Snake reference design */ |
| 7860 | dev->board = SAA7134_BOARD_PHILIPS_SNAKE; | 7915 | dev->board = SAA7134_BOARD_PHILIPS_SNAKE; |
| 7861 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; | 7916 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; |
| 7862 | printk(KERN_INFO "%s: Reconfigured board as %s\n", | 7917 | pr_info("%s: Reconfigured board as %s\n", |
| 7863 | dev->name, saa7134_boards[dev->board].name); | 7918 | dev->name, saa7134_boards[dev->board].name); |
| 7864 | break; | 7919 | break; |
| 7865 | } | 7920 | } |
| @@ -7887,7 +7942,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7887 | struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)}; | 7942 | struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)}; |
| 7888 | if (dev->autodetected && (dev->eedata[0x49] == 0x50)) { | 7943 | if (dev->autodetected && (dev->eedata[0x49] == 0x50)) { |
| 7889 | dev->board = SAA7134_BOARD_PHILIPS_TIGER_S; | 7944 | dev->board = SAA7134_BOARD_PHILIPS_TIGER_S; |
| 7890 | printk(KERN_INFO "%s: Reconfigured board as %s\n", | 7945 | pr_info("%s: Reconfigured board as %s\n", |
| 7891 | dev->name, saa7134_boards[dev->board].name); | 7946 | dev->name, saa7134_boards[dev->board].name); |
| 7892 | } | 7947 | } |
| 7893 | if (dev->board == SAA7134_BOARD_PHILIPS_TIGER_S) { | 7948 | if (dev->board == SAA7134_BOARD_PHILIPS_TIGER_S) { |
| @@ -7903,13 +7958,14 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7903 | case SAA7134_BOARD_ASUSTeK_TVFM7135: | 7958 | case SAA7134_BOARD_ASUSTeK_TVFM7135: |
| 7904 | /* The card below is detected as card=53, but is different */ | 7959 | /* The card below is detected as card=53, but is different */ |
| 7905 | if (dev->autodetected && (dev->eedata[0x27] == 0x03)) { | 7960 | if (dev->autodetected && (dev->eedata[0x27] == 0x03)) { |
| 7906 | dev->board = SAA7134_BOARD_ASUSTeK_P7131_ANALOG; | 7961 | dev->board = SAA7134_BOARD_ASUSTeK_P7131_ANALOG; |
| 7907 | printk(KERN_INFO "%s: P7131 analog only, using " | 7962 | pr_info("%s: P7131 analog only, using entry of %s\n", |
| 7908 | "entry of %s\n", | 7963 | dev->name, saa7134_boards[dev->board].name); |
| 7909 | dev->name, saa7134_boards[dev->board].name); | ||
| 7910 | 7964 | ||
| 7911 | /* IR init has already happened for other cards, so | 7965 | /* |
| 7912 | * we have to catch up. */ | 7966 | * IR init has already happened for other cards, so |
| 7967 | * we have to catch up. | ||
| 7968 | */ | ||
| 7913 | dev->has_remote = SAA7134_REMOTE_GPIO; | 7969 | dev->has_remote = SAA7134_REMOTE_GPIO; |
| 7914 | saa7134_input_init1(dev); | 7970 | saa7134_input_init1(dev); |
| 7915 | } | 7971 | } |
| @@ -7972,12 +8028,12 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 7972 | msg.addr = 0x0b; | 8028 | msg.addr = 0x0b; |
| 7973 | msg.len = 1; | 8029 | msg.len = 1; |
| 7974 | if (1 != i2c_transfer(&dev->i2c_adap, &msg, 1)) { | 8030 | if (1 != i2c_transfer(&dev->i2c_adap, &msg, 1)) { |
| 7975 | printk(KERN_WARNING "%s: send wake up byte to pic16C505" | 8031 | pr_warn("%s: send wake up byte to pic16C505" |
| 7976 | "(IR chip) failed\n", dev->name); | 8032 | "(IR chip) failed\n", dev->name); |
| 7977 | } else { | 8033 | } else { |
| 7978 | msg.flags = I2C_M_RD; | 8034 | msg.flags = I2C_M_RD; |
| 7979 | rc = i2c_transfer(&dev->i2c_adap, &msg, 1); | 8035 | rc = i2c_transfer(&dev->i2c_adap, &msg, 1); |
| 7980 | printk(KERN_INFO "%s: probe IR chip @ i2c 0x%02x: %s\n", | 8036 | pr_info("%s: probe IR chip @ i2c 0x%02x: %s\n", |
| 7981 | dev->name, msg.addr, | 8037 | dev->name, msg.addr, |
| 7982 | (1 == rc) ? "yes" : "no"); | 8038 | (1 == rc) ? "yes" : "no"); |
| 7983 | if (rc == 1) | 8039 | if (rc == 1) |
| @@ -8018,10 +8074,10 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 8018 | dev->board = SAA7134_BOARD_VIDEOMATE_DVBT_200A; | 8074 | dev->board = SAA7134_BOARD_VIDEOMATE_DVBT_200A; |
| 8019 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; | 8075 | dev->tuner_type = saa7134_boards[dev->board].tuner_type; |
| 8020 | dev->tda9887_conf = saa7134_boards[dev->board].tda9887_conf; | 8076 | dev->tda9887_conf = saa7134_boards[dev->board].tda9887_conf; |
| 8021 | printk(KERN_INFO "%s: Reconfigured board as %s\n", | 8077 | pr_info("%s: Reconfigured board as %s\n", |
| 8022 | dev->name, saa7134_boards[dev->board].name); | 8078 | dev->name, saa7134_boards[dev->board].name); |
| 8023 | } else { | 8079 | } else { |
| 8024 | printk(KERN_WARNING "%s: Unexpected tuner type info: %x in eeprom\n", | 8080 | pr_warn("%s: Unexpected tuner type info: %x in eeprom\n", |
| 8025 | dev->name, dev->eedata[0x41]); | 8081 | dev->name, dev->eedata[0x41]); |
| 8026 | break; | 8082 | break; |
| 8027 | } | 8083 | } |
| @@ -8043,9 +8099,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 8043 | msg.buf = &buffer[i][0]; | 8099 | msg.buf = &buffer[i][0]; |
| 8044 | msg.len = ARRAY_SIZE(buffer[0]); | 8100 | msg.len = ARRAY_SIZE(buffer[0]); |
| 8045 | if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) | 8101 | if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) |
| 8046 | printk(KERN_WARNING | 8102 | pr_warn("%s: Unable to enable tuner(%i).\n", |
| 8047 | "%s: Unable to enable tuner(%i).\n", | 8103 | dev->name, i); |
| 8048 | dev->name, i); | ||
| 8049 | } | 8104 | } |
| 8050 | break; | 8105 | break; |
| 8051 | } | 8106 | } |
| @@ -8061,9 +8116,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
| 8061 | /* watch TV without software reboot. For solve this problem */ | 8116 | /* watch TV without software reboot. For solve this problem */ |
| 8062 | /* switch the tuner to analog TV mode manually. */ | 8117 | /* switch the tuner to analog TV mode manually. */ |
| 8063 | if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) | 8118 | if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) |
| 8064 | printk(KERN_WARNING | 8119 | pr_warn("%s: Unable to enable IF of the tuner.\n", |
| 8065 | "%s: Unable to enable IF of the tuner.\n", | 8120 | dev->name); |
| 8066 | dev->name); | ||
| 8067 | break; | 8121 | break; |
| 8068 | } | 8122 | } |
| 8069 | case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG: | 8123 | case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG: |
