projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] ite-cir: 8709 needs to use pnp resource 2
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
media
/
rc
/
ite-cir.c
diff --git
a/drivers/media/rc/ite-cir.c
b/drivers/media/rc/ite-cir.c
index e716b931cf7e69d52228dc258ae644bde14f09a3..ecd3d028076852b3ee8da36794bbac1c58a59157 100644
(file)
--- a/
drivers/media/rc/ite-cir.c
+++ b/
drivers/media/rc/ite-cir.c
@@
-1347,6
+1347,7
@@
static const struct ite_dev_params ite_dev_descs[] = {
{ /* 0: ITE8704 */
.model = "ITE8704 CIR transceiver",
.io_region_size = IT87_IOREG_LENGTH,
{ /* 0: ITE8704 */
.model = "ITE8704 CIR transceiver",
.io_region_size = IT87_IOREG_LENGTH,
+ .io_rsrc_no = 0,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
@@
-1371,6
+1372,7
@@
static const struct ite_dev_params ite_dev_descs[] = {
{ /* 1: ITE8713 */
.model = "ITE8713 CIR transceiver",
.io_region_size = IT87_IOREG_LENGTH,
{ /* 1: ITE8713 */
.model = "ITE8713 CIR transceiver",
.io_region_size = IT87_IOREG_LENGTH,
+ .io_rsrc_no = 0,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
@@
-1395,6
+1397,7
@@
static const struct ite_dev_params ite_dev_descs[] = {
{ /* 2: ITE8708 */
.model = "ITE8708 CIR transceiver",
.io_region_size = IT8708_IOREG_LENGTH,
{ /* 2: ITE8708 */
.model = "ITE8708 CIR transceiver",
.io_region_size = IT8708_IOREG_LENGTH,
+ .io_rsrc_no = 0,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
@@
-1420,6
+1423,7
@@
static const struct ite_dev_params ite_dev_descs[] = {
{ /* 3: ITE8709 */
.model = "ITE8709 CIR transceiver",
.io_region_size = IT8709_IOREG_LENGTH,
{ /* 3: ITE8709 */
.model = "ITE8709 CIR transceiver",
.io_region_size = IT8709_IOREG_LENGTH,
+ .io_rsrc_no = 2,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
.hw_tx_capable = true,
.sample_period = (u32) (1000000000ULL / 115200),
.tx_carrier_freq = 38000,
@@
-1461,6
+1465,7
@@
static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
struct rc_dev *rdev = NULL;
int ret = -ENOMEM;
int model_no;
struct rc_dev *rdev = NULL;
int ret = -ENOMEM;
int model_no;
+ int io_rsrc_no;
ite_dbg("%s called", __func__);
ite_dbg("%s called", __func__);
@@
-1490,10
+1495,11
@@
static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
/* get the description for the device */
dev_desc = &ite_dev_descs[model_no];
/* get the description for the device */
dev_desc = &ite_dev_descs[model_no];
+ io_rsrc_no = dev_desc->io_rsrc_no;
/* validate pnp resources */
/* validate pnp resources */
- if (!pnp_port_valid(pdev,
0
) ||
- pnp_port_len(pdev,
0
) != dev_desc->io_region_size) {
+ if (!pnp_port_valid(pdev,
io_rsrc_no
) ||
+ pnp_port_len(pdev,
io_rsrc_no
) != dev_desc->io_region_size) {
dev_err(&pdev->dev, "IR PNP Port not valid!\n");
goto failure;
}
dev_err(&pdev->dev, "IR PNP Port not valid!\n");
goto failure;
}
@@
-1504,7
+1510,7
@@
static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
}
/* store resource values */
}
/* store resource values */
- itdev->cir_addr = pnp_port_start(pdev,
0
);
+ itdev->cir_addr = pnp_port_start(pdev,
io_rsrc_no
);
itdev->cir_irq = pnp_irq(pdev, 0);
/* initialize spinlocks */
itdev->cir_irq = pnp_irq(pdev, 0);
/* initialize spinlocks */