Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b96144 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list 



Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent add20636

drivers/media/dvb/mantis/Kconfig

+21 −1
Original line number Diff line number Diff line 
config MANTIS_CORE

	tristate "Mantis/Hopper PCI bridge based devices"

	depends on PCI && I2C



	help

	  Support for PCI cards based on the Mantis and Hopper PCi bridge.



	  Say Y if you own such a device and want to use it.



config DVB_MANTIS

	tristate "MANTIS based cards"

	depends on DVB_CORE && PCI && I2C

	depends on MANTIS_CORE && DVB_CORE && PCI && I2C

	select DVB_MB86A16

	select DVB_CU1216

	select DVB_ZL10353
@@ -11,3 +20,14 @@ config DVB_MANTIS 
	  Say Y when you have a Mantis based DVB card and want to use it.



	  If unsure say N.



config DVB_HOPPER

	tristate "HOPPER based cards"

	depends on MANTIS_CORE && DVB_CORE && PCI && I2C

	select DVB_ZL10353

	select DVB_PLL

	help

	  Support for PCI cards based on the Hopper  PCI bridge.

	  Say Y when you have a Hopper based DVB card and want to use it.



	  If unsure say N

drivers/media/dvb/mantis/Makefile

+24 −18
Original line number Diff line number Diff line 
mantis-objs = 	mantis_core.o	\

mantis_core-objs :=	mantis_ioc.o	\

			mantis_uart.o	\

			mantis_dma.o	\

			mantis_pci.o	\
@@ -7,15 +7,21 @@ mantis-objs = mantis_core.o \ 
			mantis_evm.o	\

			mantis_hif.o	\

			mantis_ca.o	\

		mantis_pcmcia.o	\

			mantis_pcmcia.o



mantis-objs	:=	mantis_cards.o	\

			mantis_vp1033.o	\

			mantis_vp1034.o	\

			mantis_vp1041.o	\

			mantis_vp2033.o	\

			mantis_vp2040.o	\

		mantis_vp3028.o	\

			mantis_vp3030.o



hopper-objs	:=	hopper_cards.o	\

			hopper_vp3028.o



obj-$(CONFIG_MANTIS_CORE)	+= mantis_core.o

obj-$(CONFIG_DVB_MANTIS)	+= mantis.o

obj-$(CONFIG_DVB_HOPPER)	+= hopper.o



EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

drivers/media/dvb/mantis/hopper_cards.c

0 → 100644
+260 −0
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <asm/irq.h>

#include <linux/interrupt.h>



#include "dmxdev.h"

#include "dvbdev.h"

#include "dvb_demux.h"

#include "dvb_frontend.h"

#include "dvb_net.h"



#include "mantis_common.h"

#include "hopper_vp3028.h"

#include "mantis_dma.h"

#include "mantis_dvb.h"

#include "mantis_uart.h"

#include "mantis_ioc.h"

#include "mantis_pci.h"

#include "mantis_i2c.h"

#include "mantis_reg.h"



static unsigned int verbose;

module_param(verbose, int, 0644);

MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");



#define DRIVER_NAME	"Hopper"



static char *label[10] = {

	"DMA",

	"IRQ-0",

	"IRQ-1",

	"OCERR",

	"PABRT",

	"RIPRR",

	"PPERR",

	"FTRGT",

	"RISCI",

	"RACK"

};



static int devs;



static irqreturn_t hopper_irq_handler(int irq, void *dev_id)

{

	u32 stat = 0, mask = 0, lstat = 0, mstat = 0;

	u32 rst_stat = 0, rst_mask = 0;



	struct mantis_pci *mantis;

	struct mantis_ca *ca;



	mantis = (struct mantis_pci *) dev_id;

	if (unlikely(mantis == NULL)) {

		dprintk(MANTIS_ERROR, 1, "Mantis == NULL");

		return IRQ_NONE;

	}

	ca = mantis->mantis_ca;



	stat = mmread(MANTIS_INT_STAT);

	mask = mmread(MANTIS_INT_MASK);

	mstat = lstat = stat & ~MANTIS_INT_RISCSTAT;

	if (!(stat & mask))

		return IRQ_NONE;



	rst_mask  = MANTIS_GPIF_WRACK  |

		    MANTIS_GPIF_OTHERR |

		    MANTIS_SBUF_WSTO   |

		    MANTIS_GPIF_EXTIRQ;



	rst_stat  = mmread(MANTIS_GPIF_STATUS);

	rst_stat &= rst_mask;

	mmwrite(rst_stat, MANTIS_GPIF_STATUS);



	mantis->mantis_int_stat = stat;

	mantis->mantis_int_mask = mask;

	dprintk(MANTIS_DEBUG, 0, "\n-- Stat=<%02x> Mask=<%02x> --", stat, mask);

	if (stat & MANTIS_INT_RISCEN) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[0]);

	}

	if (stat & MANTIS_INT_IRQ0) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[1]);

		mantis->gpif_status = rst_stat;

		wake_up(&ca->hif_write_wq);

		schedule_work(&ca->hif_evm_work);

	}

	if (stat & MANTIS_INT_IRQ1) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]);

		schedule_work(&mantis->uart_work);

	}

	if (stat & MANTIS_INT_OCERR) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[3]);

	}

	if (stat & MANTIS_INT_PABORT) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[4]);

	}

	if (stat & MANTIS_INT_RIPERR) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[5]);

	}

	if (stat & MANTIS_INT_PPERR) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[6]);

	}

	if (stat & MANTIS_INT_FTRGT) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[7]);

	}

	if (stat & MANTIS_INT_RISCI) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[8]);

		mantis->finished_block = (stat & MANTIS_INT_RISCSTAT) >> 28;

		tasklet_schedule(&mantis->tasklet);

	}

	if (stat & MANTIS_INT_I2CDONE) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[9]);

		wake_up(&mantis->i2c_wq);

	}

	mmwrite(stat, MANTIS_INT_STAT);

	stat &= ~(MANTIS_INT_RISCEN   | MANTIS_INT_I2CDONE |

		  MANTIS_INT_I2CRACK  | MANTIS_INT_PCMCIA7 |

		  MANTIS_INT_PCMCIA6  | MANTIS_INT_PCMCIA5 |

		  MANTIS_INT_PCMCIA4  | MANTIS_INT_PCMCIA3 |

		  MANTIS_INT_PCMCIA2  | MANTIS_INT_PCMCIA1 |

		  MANTIS_INT_PCMCIA0  | MANTIS_INT_IRQ1	   |

		  MANTIS_INT_IRQ0     | MANTIS_INT_OCERR   |

		  MANTIS_INT_PABORT   | MANTIS_INT_RIPERR  |

		  MANTIS_INT_PPERR    | MANTIS_INT_FTRGT   |

		  MANTIS_INT_RISCI);



	if (stat)

		dprintk(MANTIS_DEBUG, 0, "<Unknown> Stat=<%02x> Mask=<%02x>", stat, mask);



	dprintk(MANTIS_DEBUG, 0, "\n");

	return IRQ_HANDLED;

}



static int __devinit hopper_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)

{

	struct mantis_pci *mantis;

	struct mantis_hwconfig *config;

	int err = 0;



	mantis = kzalloc(sizeof (struct mantis_pci), GFP_KERNEL);

	if (mantis == NULL) {

		printk(KERN_ERR "%s ERROR: Out of memory\n", __func__);

		err = -ENOMEM;

		goto fail0;

	}



	mantis->num		= devs;

	mantis->verbose		= verbose;

	mantis->pdev		= pdev;

	config			= (struct mantis_hwconfig *) pci_id->driver_data;

	config->irq_handler	= &hopper_irq_handler;

	mantis->hwconfig	= config;



	err = mantis_pci_init(mantis);

	if (err) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI initialization failed <%d>", err);

		goto fail1;

	}



	err = mantis_stream_control(mantis, STREAM_TO_HIF);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis stream control failed <%d>", err);

		goto fail1;

	}



	err = mantis_i2c_init(mantis);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C initialization failed <%d>", err);

		goto fail2;

	}



	err = mantis_get_mac(mantis);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis MAC address read failed <%d>", err);

		goto fail2;

	}



	err = mantis_dma_init(mantis);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA initialization failed <%d>", err);

		goto fail3;

	}



	err = mantis_dvb_init(mantis);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB initialization failed <%d>", err);

		goto fail4;

	}

	devs++;



	return err;



fail5:

	dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err);

	mantis_dvb_exit(mantis);



fail4:

	dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err);

	mantis_dma_exit(mantis);



fail3:

	dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C exit! <%d>", err);

	mantis_i2c_exit(mantis);



fail2:

	dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI exit! <%d>", err);

	mantis_pci_exit(mantis);



fail1:

	dprintk(MANTIS_ERROR, 1, "ERROR: Mantis free! <%d>", err);

	kfree(mantis);



fail0:

	return err;

}



static void __devexit hopper_pci_remove(struct pci_dev *pdev)

{

	struct mantis_pci *mantis = pci_get_drvdata(pdev);



	if (mantis) {

//		mantis_uart_exit(mantis);

		mantis_dvb_exit(mantis);

		mantis_dma_exit(mantis);

		mantis_i2c_exit(mantis);

		mantis_pci_exit(mantis);

		kfree(mantis);

	}

	return;



}



static struct pci_device_id hopper_pci_table[] = {

	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3028_DVB_T, &vp3028_config),

	{ }

};



static struct pci_driver hopper_pci_driver = {

	.name		= DRIVER_NAME,

	.id_table	= hopper_pci_table,

	.probe		= hopper_pci_probe,

	.remove		= hopper_pci_remove,

};



static int __devinit hopper_init(void)

{

	return pci_register_driver(&hopper_pci_driver);

}



static void __devexit hopper_exit(void)

{

	return pci_unregister_driver(&hopper_pci_driver);

}



module_init(hopper_init);

module_exit(hopper_exit);



MODULE_DESCRIPTION("HOPPER driver");

MODULE_AUTHOR("Manu Abraham");

MODULE_LICENSE("GPL");

drivers/media/dvb/mantis/hopper_vp3028.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

	Mantis VP-3028 driver



	Copyright (C) 2005, 2006 Manu Abraham (abraham.manu@gmail.com)



	This program is free software; you can redistribute it and/or modify

	it under the terms of the GNU General Public License as published by

	the Free Software Foundation; either version 2 of the License, or

	(at your option) any later version.



	This program is distributed in the hope that it will be useful,

	but WITHOUT ANY WARRANTY; without even the implied warranty of

	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

	GNU General Public License for more details.



	You should have received a copy of the GNU General Public License

	along with this program; if not, write to the Free Software

	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



#include <asm/irq.h>

#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/interrupt.h>



#include "dmxdev.h"

#include "dvbdev.h"

#include "dvb_demux.h"

#include "dvb_frontend.h"

#include "dvb_net.h"



#include "zl10353.h"

#include "mantis_common.h"

#include "mantis_ioc.h"

#include "mantis_dvb.h"

#include "hopper_vp3028.h"



struct zl10353_config hopper_vp3028_config = {

	.demod_address	= 0x0f,

};



#define MANTIS_MODEL_NAME	"VP-3028"

#define MANTIS_DEV_TYPE		"DVB-T"



static int vp3028_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)

{

	struct i2c_adapter *adapter	= &mantis->adapter;

	int err = 0;



	err = mantis_frontend_power(mantis, POWER_ON);

	mantis_frontend_soft_reset(mantis);



	dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");

	fe = zl10353_attach(&hopper_vp3028_config, adapter);



	if (!fe)

		return -1;



	dprintk(MANTIS_ERROR, 1, "Done!");



	return 0;

}



struct mantis_hwconfig vp3028_config = {

	.model_name	= MANTIS_MODEL_NAME,

	.dev_type	= MANTIS_DEV_TYPE,

	.ts_size	= MANTIS_TS_188,



	.baud_rate	= MANTIS_BAUD_9600,

	.parity		= MANTIS_PARITY_NONE,

	.bytes		= 0,



	.frontend_init	= vp3028_frontend_init,

	.power		= GPIF_A00,

	.reset		= GPIF_A03,

};

drivers/media/dvb/mantis/hopper_vp3028.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef __MANTIS_VP3028_H

#define __MANTIS_VP3028_H



#include "mantis_common.h"



#define MANTIS_VP_3028_DVB_T	0x0028



extern struct mantis_hwconfig vp3028_config;



#endif /* __MANTIS_VP3028_H */