diff options
| author | Antti Palosaari <crope@iki.fi> | 2012-05-17 17:26:50 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 09:22:42 -0400 |
| commit | 140534432e8a7edee5814d139dd59c20607479e3 (patch) | |
| tree | e65b5b553955177d038cccdb5f24ae06d77b2eca | |
| parent | b144c98ca0962ee3cbdbbeafe77a1b300be0cb4f (diff) | |
[media] drxk: fix GPIOs
UIO-2 and UIO-3 were broken.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/frontends/drxk_hard.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/drxk_map.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index 8d99ac1598ae..60b868faeacf 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c | |||
| @@ -5835,7 +5835,7 @@ static int WriteGPIO(struct drxk_state *state) | |||
| 5835 | } | 5835 | } |
| 5836 | if (state->UIO_mask & 0x0002) { /* UIO-2 */ | 5836 | if (state->UIO_mask & 0x0002) { /* UIO-2 */ |
| 5837 | /* write to io pad configuration register - output mode */ | 5837 | /* write to io pad configuration register - output mode */ |
| 5838 | status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg); | 5838 | status = write16(state, SIO_PDR_SMA_RX_CFG__A, state->m_GPIOCfg); |
| 5839 | if (status < 0) | 5839 | if (status < 0) |
| 5840 | goto error; | 5840 | goto error; |
| 5841 | 5841 | ||
| @@ -5854,7 +5854,7 @@ static int WriteGPIO(struct drxk_state *state) | |||
| 5854 | } | 5854 | } |
| 5855 | if (state->UIO_mask & 0x0004) { /* UIO-3 */ | 5855 | if (state->UIO_mask & 0x0004) { /* UIO-3 */ |
| 5856 | /* write to io pad configuration register - output mode */ | 5856 | /* write to io pad configuration register - output mode */ |
| 5857 | status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg); | 5857 | status = write16(state, SIO_PDR_GPIO_CFG__A, state->m_GPIOCfg); |
| 5858 | if (status < 0) | 5858 | if (status < 0) |
| 5859 | goto error; | 5859 | goto error; |
| 5860 | 5860 | ||
diff --git a/drivers/media/dvb/frontends/drxk_map.h b/drivers/media/dvb/frontends/drxk_map.h index 9b11a8328869..23e16c12f234 100644 --- a/drivers/media/dvb/frontends/drxk_map.h +++ b/drivers/media/dvb/frontends/drxk_map.h | |||
| @@ -432,6 +432,7 @@ | |||
| 432 | #define SIO_PDR_UIO_OUT_LO__A 0x7F0016 | 432 | #define SIO_PDR_UIO_OUT_LO__A 0x7F0016 |
| 433 | #define SIO_PDR_OHW_CFG__A 0x7F001F | 433 | #define SIO_PDR_OHW_CFG__A 0x7F001F |
| 434 | #define SIO_PDR_OHW_CFG_FREF_SEL__M 0x3 | 434 | #define SIO_PDR_OHW_CFG_FREF_SEL__M 0x3 |
| 435 | #define SIO_PDR_GPIO_CFG__A 0x7F0021 | ||
| 435 | #define SIO_PDR_MSTRT_CFG__A 0x7F0025 | 436 | #define SIO_PDR_MSTRT_CFG__A 0x7F0025 |
| 436 | #define SIO_PDR_MERR_CFG__A 0x7F0026 | 437 | #define SIO_PDR_MERR_CFG__A 0x7F0026 |
| 437 | #define SIO_PDR_MCLK_CFG__A 0x7F0028 | 438 | #define SIO_PDR_MCLK_CFG__A 0x7F0028 |
| @@ -446,4 +447,5 @@ | |||
| 446 | #define SIO_PDR_MD5_CFG__A 0x7F0030 | 447 | #define SIO_PDR_MD5_CFG__A 0x7F0030 |
| 447 | #define SIO_PDR_MD6_CFG__A 0x7F0031 | 448 | #define SIO_PDR_MD6_CFG__A 0x7F0031 |
| 448 | #define SIO_PDR_MD7_CFG__A 0x7F0032 | 449 | #define SIO_PDR_MD7_CFG__A 0x7F0032 |
| 450 | #define SIO_PDR_SMA_RX_CFG__A 0x7F0037 | ||
| 449 | #define SIO_PDR_SMA_TX_CFG__A 0x7F0038 | 451 | #define SIO_PDR_SMA_TX_CFG__A 0x7F0038 |