diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 23:13:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-13 23:13:16 -0700 |
| commit | dfcec04e2742f2d5bc1895300c556b4069e9147d (patch) | |
| tree | 4ff8d4090c8f8bdc622713b2da41db5aab0a78c1 /drivers/soc | |
| parent | ac949b0d879cf84ceb4456288d69e596dabeb361 (diff) | |
| parent | 1480ae09b7008614e059b631598eab890a08fa21 (diff) | |
Merge "ARM: dts: msm: Fix qsee_ipc_irq_bridge IRQ clear mask for msmcobalt"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/qsee_ipc_irq_bridge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qcom/qsee_ipc_irq_bridge.c b/drivers/soc/qcom/qsee_ipc_irq_bridge.c index d3a2212f07c4..ab43bbb7e86a 100644 --- a/drivers/soc/qcom/qsee_ipc_irq_bridge.c +++ b/drivers/soc/qcom/qsee_ipc_irq_bridge.c @@ -374,6 +374,9 @@ static int qiib_parse_node(struct device_node *node, struct qiib_dev *devp) } QIIB_DBG("%s: %s = %d\n", __func__, key, devp->irq_line); + irqtype = irqd_get_trigger_type(irq_get_irq_data(devp->irq_line)); + QIIB_DBG("%s: irqtype = %d\n", __func__, irqtype); + key = "label"; subsys_name = of_get_property(node, key, NULL); if (!subsys_name) { @@ -382,8 +385,8 @@ static int qiib_parse_node(struct device_node *node, struct qiib_dev *devp) } QIIB_DBG("%s: %s = %s\n", __func__, key, subsys_name); - if ((irqtype & IRQF_TRIGGER_HIGH) && !strcmp(devp->ssr_name, "mpss")) { - key = "qcom,irq-mask"; + if (irqtype & IRQF_TRIGGER_HIGH) { + key = "qcom,rx-irq-clr-mask"; ret = of_property_read_u32(node, key, &devp->irq_mask); if (ret) { QIIB_ERR("%s: missing key: %s\n", __func__, key); @@ -422,9 +425,6 @@ static int qiib_parse_node(struct device_node *node, struct qiib_dev *devp) goto ssr_reg_fail; } - irqtype = irqd_get_trigger_type(irq_get_irq_data(devp->irq_line)); - QIIB_DBG("%s: irqtype = %d\n", __func__, irqtype); - ret = request_irq(devp->irq_line, qiib_irq_handler, irqtype | IRQF_NO_SUSPEND, devp->dev_name, devp); |