浏览代码

media: cx23885: change 887/888 default to 888

Proper cx2388x chip type is detected in cx25840 probe, the clock
rate is untouched however in probe. The cx25840 only checks for
non default clock values for 888 and provides custom settings for
25MHz 888. This change ensures that cx23888 chips with default 50MHz
crystals will not get configured as if they have 25MHz crystals. A
cx23887 board will continue to be configured for 25MHz crystal as
there is no custom clock support included for it.

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Brad Love 7 年之前
父节点
当前提交
5da1a68227
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/media/pci/cx23885/cx23885-core.c

+ 3 - 3
drivers/media/pci/cx23885/cx23885-core.c

@@ -839,10 +839,10 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 
 
 	/* Configure the internal memory */
 	/* Configure the internal memory */
 	if (dev->pci->device == 0x8880) {
 	if (dev->pci->device == 0x8880) {
-		/* Could be 887 or 888, assume a default */
-		dev->bridge = CX23885_BRIDGE_887;
+		/* Could be 887 or 888, assume an 888 default */
+		dev->bridge = CX23885_BRIDGE_888;
 		/* Apply a sensible clock frequency for the PCIe bridge */
 		/* Apply a sensible clock frequency for the PCIe bridge */
-		dev->clk_freq = 25000000;
+		dev->clk_freq = 50000000;
 		dev->sram_channels = cx23887_sram_channels;
 		dev->sram_channels = cx23887_sram_channels;
 	} else
 	} else
 	if (dev->pci->device == 0x8852) {
 	if (dev->pci->device == 0x8852) {