evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Fix qsee_ipc_irq_bridge IRQ clear mask for msmcobalt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-13 23:13:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit dfcec04e27
2 changed files with 6 additions and 6 deletions
arch/arm/boot/dts/qcom
msmcobalt.dtsi
drivers/soc/qcom
qsee_ipc_irq_bridge.c

2
arch/arm/boot/dts/qcom/msmcobalt.dtsi
View file

@ -2807,7 +2807,7 @@
qcom,qsee-ipc-irq-spss {
qcom,rx-irq-clr = <0x1d08008 0x4>;
qcom,rx-irq-clr-mask = <0x2>;
qcom,rx-irq-clr-mask = <0x1>;
qcom,dev-name = "qsee_ipc_irq_spss";
interrupts = <0 349 4>;
label = "spss";

10
drivers/soc/qcom/qsee_ipc_irq_bridge.c
View file

@ -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);