summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-10 08:24:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:50 -0300
commit147e110bb69a5eaee83bab133d7f7cc4ee050808 (patch)
tree0be0f35588712e984ba3d5859690c8eb516e365b /drivers
parentd6a054057781044712bfb0114d2d62d37781ffe9 (diff)
[media] drxk: Fix the antenna switch logic
Terratec H5 doesn't require to switch mode, but generates an error due to this logic. Also, GPIO's are board-dependent. So, add it at the board config struct. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/frontends/drxk.h21
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.c21
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.h9
3 files changed, 33 insertions, 18 deletions
diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb/frontends/drxk.h
index 9c99f31369ce..67589b607c4e 100644
--- a/drivers/media/dvb/frontends/drxk.h
+++ b/drivers/media/dvb/frontends/drxk.h
@@ -4,10 +4,25 @@
#include <linux/types.h>
#include <linux/i2c.h>
+/**
+ * struct drxk_config - Configure the initial parameters for DRX-K
+ *
+ * adr: I2C Address of the DRX-K
+ * single_master: Device is on the single master mode
+ * no_i2c_bridge: Don't switch the I2C bridge to talk with tuner
+ * antenna_uses_gpio: Use GPIO to control the antenna
+ * antenna_dvbc: GPIO for changing antenna to DVB-C
+ * antenna_dvbt: GPIO for changing antenna to DVB-T
+ * microcode_name: Name of the firmware file with the microcode
+ */
struct drxk_config {
- u8 adr;
- u32 single_master : 1;
- u32 no_i2c_bridge : 1;
+ u8 adr;
+ bool single_master;
+ bool no_i2c_bridge;
+
+ bool antenna_uses_gpio;
+ u16 antenna_dvbc, antenna_dvbt;
+
const char *microcode_name;
};
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 1d29ed23154f..91f3296917fa 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -618,6 +618,10 @@ error:
static int init_state(struct drxk_state *state)
{
+ /*
+ * FIXME: most (all?) of the values bellow should be moved into
+ * struct drxk_config, as they are probably board-specific
+ */
u32 ulVSBIfAgcMode = DRXK_AGC_CTRL_AUTO;
u32 ulVSBIfAgcOutputLevel = 0;
u32 ulVSBIfAgcMinLevel = 0;
@@ -672,10 +676,6 @@ static int init_state(struct drxk_state *state)
u32 ulRfMirror = 1;
u32 ulPowerDown = 0;
- u32 ulAntennaDVBT = 1;
- u32 ulAntennaDVBC = 0;
- u32 ulAntennaSwitchDVBTDVBC = 0;
-
dprintk(1, "\n");
state->m_hasLNA = false;
@@ -858,11 +858,6 @@ static int init_state(struct drxk_state *state)
state->m_GPIOCfg = (ulGPIOCfg);
state->m_GPIO = (ulGPIO == 0 ? 0 : 1);
- state->m_AntennaDVBT = (ulAntennaDVBT == 0 ? 0 : 1);
- state->m_AntennaDVBC = (ulAntennaDVBC == 0 ? 0 : 1);
- state->m_AntennaSwitchDVBTDVBC =
- (ulAntennaSwitchDVBTDVBC == 0 ? 0 : 1);
-
state->m_bPowerDown = false;
state->m_currentPowerMode = DRX_POWER_DOWN;
@@ -5819,9 +5814,10 @@ error:
static int SwitchAntennaToQAM(struct drxk_state *state)
{
- int status = -EINVAL;
+ int status = 0;
dprintk(1, "\n");
+
if (state->m_AntennaSwitchDVBTDVBC != 0) {
if (state->m_GPIO != state->m_AntennaDVBC) {
state->m_GPIO = state->m_AntennaDVBC;
@@ -5835,7 +5831,7 @@ static int SwitchAntennaToQAM(struct drxk_state *state)
static int SwitchAntennaToDVBT(struct drxk_state *state)
{
- int status = -EINVAL;
+ int status = 0;
dprintk(1, "\n");
if (state->m_AntennaSwitchDVBTDVBC != 0) {
@@ -6344,6 +6340,9 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
state->single_master = config->single_master;
state->microcode_name = config->microcode_name;
state->no_i2c_bridge = config->no_i2c_bridge;
+ state->m_AntennaSwitchDVBTDVBC = config->antenna_uses_gpio;
+ state->m_AntennaDVBC = config->antenna_dvbc;
+ state->m_AntennaDVBT = config->antenna_dvbt;
mutex_init(&state->mutex);
mutex_init(&state->ctlock);
diff --git a/drivers/media/dvb/frontends/drxk_hard.h b/drivers/media/dvb/frontends/drxk_hard.h
index b042755188c4..8b29dc89f58b 100644
--- a/drivers/media/dvb/frontends/drxk_hard.h
+++ b/drivers/media/dvb/frontends/drxk_hard.h
@@ -321,16 +321,17 @@ struct drxk_state {
u8 m_deviceSpin;
u32 m_iqmRcRate;
- u16 m_AntennaDVBC;
- u16 m_AntennaDVBT;
- u16 m_AntennaSwitchDVBTDVBC;
-
enum DRXPowerMode m_currentPowerMode;
/* Configurable parameters at the driver */
+ bool m_AntennaSwitchDVBTDVBC;
+ u16 m_AntennaDVBC;
+ u16 m_AntennaDVBT;
+
u32 single_master : 1; /* Use single master i2c mode */
u32 no_i2c_bridge : 1; /* Tuner is not on port 1, don't use I2C bridge */
+
const char *microcode_name;
};